优化轮询ERP信息流程、添加AGV接口报文打印、执行中任务强制取消的功能
3个文件已添加
12个文件已修改
3个文件已删除
416 ■■■■ 已修改文件
.vs/HH.WCS.Mobox3.AnGang/FileContentIndex/1b7f29d3-94a7-4eab-a19b-3b99fefb9d52.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HH.WCS.Mobox3.AnGang/FileContentIndex/2c811ea3-de97-45a8-bcd7-7c88a2af5604.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HH.WCS.Mobox3.AnGang/FileContentIndex/31c8165b-2f2b-45b9-85b4-57a0470f4da9.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HH.WCS.Mobox3.AnGang/FileContentIndex/34ca764b-7d34-4fbf-b885-47b92ae831ee.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HH.WCS.Mobox3.AnGang/FileContentIndex/ccea7477-49f1-46b2-a1d0-45ffab1fc2c9.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HH.WCS.Mobox3.AnGang/FileContentIndex/db48a26a-6552-4d65-a5d9-3721c951a7fd.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
api/AgvController.cs 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/ApiHelper.cs 280 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/ApiModel.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/ErpController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/MoboxController.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
core/Monitor.cs 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
core/WCSCore.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
device/SnapDevice.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
device/SnapManager.cs 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dispatch/GZRobot.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
models/TN_Loc_Container.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
wms/LocationHelper.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HH.WCS.Mobox3.AnGang/FileContentIndex/1b7f29d3-94a7-4eab-a19b-3b99fefb9d52.vsidx
Binary files differ
.vs/HH.WCS.Mobox3.AnGang/FileContentIndex/2c811ea3-de97-45a8-bcd7-7c88a2af5604.vsidx
Binary files differ
.vs/HH.WCS.Mobox3.AnGang/FileContentIndex/31c8165b-2f2b-45b9-85b4-57a0470f4da9.vsidx
Binary files differ
.vs/HH.WCS.Mobox3.AnGang/FileContentIndex/34ca764b-7d34-4fbf-b885-47b92ae831ee.vsidx
Binary files differ
.vs/HH.WCS.Mobox3.AnGang/FileContentIndex/ccea7477-49f1-46b2-a1d0-45ffab1fc2c9.vsidx
Binary files differ
.vs/HH.WCS.Mobox3.AnGang/FileContentIndex/db48a26a-6552-4d65-a5d9-3721c951a7fd.vsidx
Binary files differ
api/AgvController.cs
@@ -11,6 +11,8 @@
using HH.WCS.Mobox3.AnGang.util;
using static HH.WCS.Mobox3.AnGang.api.ApiModel;
using System.Text;
using System.Web;
namespace HH.WCS.Mobox3.AnGang.api
{
@@ -28,6 +30,7 @@
        [Route("orderStatusReport")]
        public GzResult orderStatusReport(orderStatusReportParme model) {
            //LogHelper.Info("RCS国自AGV任务状态回报:" + JsonConvert.SerializeObject(model), "HosttoagvTask");
            LogRequestHeaders();
            return GZRobot.orderStatusReport(model);
        }
        
@@ -41,5 +44,34 @@
        public gzResult SafetyInteraction(SafetyInteractionInfo model) {
            return WCSCore.SafetyInteraction(model);
        }
        private void LogRequestHeaders() {
            var request = HttpContext.Current.Request;
            var logMessage = new StringBuilder();
            logMessage.AppendLine("=== 请求头信息 ===");
            logMessage.AppendLine($"请求URL: {request.Url}");
            logMessage.AppendLine($"HTTP方法: {request.HttpMethod}");
            foreach (string headerName in request.Headers) {
                logMessage.AppendLine($"{headerName}: {request.Headers[headerName]}");
            }
            LogHelper.Info(logMessage.ToString());
        }
        private void LogResponseHeaders() {
            var response = HttpContext.Current.Response;
            var logMessage = new StringBuilder();
            logMessage.AppendLine("=== 响应头信息 ===");
            logMessage.AppendLine($"状态码: {response.StatusCode}");
            foreach (string headerName in response.Headers) {
                logMessage.AppendLine($"{headerName}: {response.Headers[headerName]}");
            }
            LogHelper.Info(logMessage.ToString());
        }
    }
}
api/ApiHelper.cs
@@ -11,6 +11,8 @@
using Newtonsoft.Json;
using Swashbuckle.Swagger;
using static HH.WCS.Mobox3.AnGang.api.ApiModel;
using static HH.WCS.Mobox3.AnGang.api.OtherModel;
@@ -40,16 +42,16 @@
                    return BuildSimpleResult(1, $"起点位置{model.StartLoc}不存在或不满足要求:(1)没有锁状态 (2)属于取放货区");
                }
                var locCntrRelOld = db.Queryable<TN_Loc_Container>()
                    .Where(c => c.S_LOC_CODE == model.StartLoc).First();
                //var locCntrRelOld = db.Queryable<TN_Loc_Container>()
                //    .Where(c => c.S_LOC_CODE == model.StartLoc).First();
                // 产品入库:假定用户不会将新入库物料,放到已有物料的收发货区入库
                // 新产品入库时,如果存在旧的货位绑定数据(出库遗留项目)直接删除
                TN_CG_Detail cgDetailOld = null;
                if (locCntrRelOld != null) {
                    cgDetailOld = db.Queryable<TN_CG_Detail>()
                        .Where(d => d.S_CNTR_CODE == locCntrRelOld.S_CNTR_CODE).First();
                }
                //// 产品入库:假定用户不会将新入库物料,放到已有物料的收发货区入库
                //// 新产品入库时,如果存在旧的货位绑定数据(出库遗留项目)直接删除
                //TN_CG_Detail cgDetailOld = null;
                //if (locCntrRelOld != null) {
                //    cgDetailOld = db.Queryable<TN_CG_Detail>()
                //        .Where(d => d.S_CNTR_CODE == locCntrRelOld.S_CNTR_CODE).First();
                //}
                // 容器 ID 和 物料 ID 未指定,由系统直接生成
                //var cntId = Guid.NewGuid().ToString("D");
@@ -89,20 +91,20 @@
                // 无论是否选择终点货架,都等到称重之后再计算终点货位
                using (var tran = db.Ado.UseTran()) {
                    if (locCntrRelOld != null) {
                        if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            return BuildSimpleResult(500,
                                $"删除货位容器关系表失败:货位{locCntrRelOld.S_LOC_CODE},容器{locCntrRelOld.S_CNTR_CODE}");
                        }
                    }
                    if (cgDetailOld != null) {
                        if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            return BuildSimpleResult(500,
                                $"删除旧容器货品明细表失败:容器{cgDetailOld.S_CNTR_CODE},物料{cgDetailOld.S_ITEM_CODE}");
                        }
                    }
                    //if (locCntrRelOld != null) {
                    //    if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
                    //        tran.RollbackTran();
                    //        return BuildSimpleResult(500,
                    //            $"删除货位容器关系表失败:货位{locCntrRelOld.S_LOC_CODE},容器{locCntrRelOld.S_CNTR_CODE}");
                    //    }
                    //}
                    //if (cgDetailOld != null) {
                    //    if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
                    //        tran.RollbackTran();
                    //        return BuildSimpleResult(500,
                    //            $"删除旧容器货品明细表失败:容器{cgDetailOld.S_CNTR_CODE},物料{cgDetailOld.S_ITEM_CODE}");
                    //    }
                    //}
                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
@@ -118,6 +120,132 @@
                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
                        it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(500,
                            $"更新起点货位锁状态失败:起点货位{startLoc.S_CODE}");
                    }
                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(500,
                            $"生成任务 {taskName} 失败:容器号 {cntId} ,起点 {startLoc.S_CODE} ,终点货架 {endLocCode} ,终点货位未指定");
                    }
                    tran.CommitTran();
                    return BuildSimpleResult(0,
                        $"生成任务 {taskName} 成功:容器号 {cntId} ,起点 {startLoc.S_CODE} ,终点货架 {endLocCode} ,终点货位未指定");
                }
            }
            catch (Exception ex) {
                return BuildSimpleResult(1, $"发生了异常:{ex.Message}");
            }
        }
        public static SimpleResult InboundData(InboundDataInfo model) {
            var taskName = TaskName.产品入库;
            var db = new SqlHelper<object>().GetInstance();
            var startAreas = Settings.Areas[AreaIndex.Q取货区];
            try {
                // 起点位置必须:为空、无锁、启用、属于收发区域
                var startLoc = db.Queryable<TN_Location>()
                    .Where(a => a.S_CODE == model.StartLoc)
                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y")
                    .Where(a => a.N_CURRENT_NUM == 0)
                    .Where(a => startAreas.Contains(a.S_AREA_CODE))
                    .First();
                if (startLoc == null) {
                    return BuildSimpleResult(1, $"起点位置{model.StartLoc}不存在或不满足要求:(1)没有锁状态 (2)属于取放货区");
                }
                //var locCntrRelOld = db.Queryable<TN_Loc_Container>()
                //    .Where(c => c.S_LOC_CODE == model.StartLoc).First();
                //// 产品入库:假定用户不会将新入库物料,放到已有物料的收发货区入库
                //// 新产品入库时,如果存在旧的货位绑定数据(出库遗留项目)直接删除
                //TN_CG_Detail cgDetailOld = null;
                //if (locCntrRelOld != null) {
                //    cgDetailOld = db.Queryable<TN_CG_Detail>()
                //        .Where(d => d.S_CNTR_CODE == locCntrRelOld.S_CNTR_CODE).First();
                //}
                // 容器 ID 和 物料 ID 未指定,由系统直接生成
                //var cntId = Guid.NewGuid().ToString("D");
                //var CgId = Guid.NewGuid().ToString("D");
                var cntId = GenerateNo("容器号", "CN");
                //var cgId = GenerateNo("物料号", "CG");
                var cgId = string.IsNullOrEmpty(model.ItemCode) ? GenerateNo("物料号", "CG") : model.ItemCode ;
                // 首次入库:绑定信息,先将起点位置与容器绑定,容器与物料绑定
                var locCntrRel = new TN_Loc_Container() {
                    S_LOC_CODE = startLoc.S_CODE,
                    S_CNTR_CODE = cntId,
                    N_LOCK_STATE = string.IsNullOrEmpty(model.ItemCode) ? 0 : 1,
                };
                var cgDetail = new TN_CG_Detail() {
                    S_ITEM_CODE = cgId,
                    S_CNTR_CODE = cntId,
                    //S_ITEM_NAME = model.ItemName,
                };
                startLoc.N_CURRENT_NUM = 1;
                var endLocCode = "0"; // 假的默认终点地址
                // 指定货位排号(不能为空、空字符串或空格)
                if (model.Row != null && model.Row.Trim() != "") {
                    endLocCode = model.Row; // 用排号字符串当做假地址
                    if (!int.TryParse(model.Row.Trim(), out int row)) {
                        return BuildSimpleResult(2, $"{model.Row} 不合法:无法转成整数类型");
                    }
                    // 货架排号只能是 0 - 8(111-118)
                    if (row <= 110 || row > 118) {
                        return BuildSimpleResult(2, $"货架号 {model.Row} 必须是111-118之间的整数");
                    }
                }
                var task = WCSHelper.BuildInboundTask(startLoc, endLocCode, cntId);
                LocationHelper.LockLoc(ref startLoc, 2); // 起点出库锁
                // 无论是否选择终点货架,都等到称重之后再计算终点货位
                using (var tran = db.Ado.UseTran()) {
                    //if (locCntrRelOld != null) {
                    //    if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
                    //        tran.RollbackTran();
                    //        return BuildSimpleResult(500,
                    //            $"删除货位容器关系表失败:货位{locCntrRelOld.S_LOC_CODE},容器{locCntrRelOld.S_CNTR_CODE}");
                    //    }
                    //}
                    //if (cgDetailOld != null) {
                    //    if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
                    //        tran.RollbackTran();
                    //        return BuildSimpleResult(500,
                    //            $"删除旧容器货品明细表失败:容器{cgDetailOld.S_CNTR_CODE},物料{cgDetailOld.S_ITEM_CODE}");
                    //    }
                    //}
                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(500,
                            $"插入货位容器关系表失败:货位{locCntrRel.S_LOC_CODE},容器{locCntrRel.S_CNTR_CODE}");
                    }
                    if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(500,
                            $"插入容器货品明细表失败:容器{cgDetail.S_CNTR_CODE},物料{cgDetail.S_ITEM_CODE}");
                    }
                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
                        it.N_LOCK_STATE,
                        it.S_LOCK_STATE,
                        it.S_LOCK_OP,
                        it.T_MODIFY,
                        it.N_CURRENT_NUM
                    }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(500,
                            $"更新起点货位锁状态失败:起点货位{startLoc.S_CODE}");
@@ -352,7 +480,6 @@
                    LogHelper.Info($"国自AGV接受终点信息失败", "HosttoagvTask");
                }
                using (var tran = db.Ado.UseTran()) {
                    if (db.Updateable<TN_Task>(task).UpdateColumns(a => a.S_END_LOC).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
@@ -396,13 +523,17 @@
                    .First();
                if (startLoc == null) {
                    return BuildSimpleResult(2, $"起点位置 {model.startLoc} 不存在或不具备取货要求");
                    return BuildSimpleResult(2, $"起点位置 {model.startLoc} 不存在或不具备取货要求!");
                }
                var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == model.startLoc);
                if (locCntrRel == null) {
                    return BuildSimpleResult(3, $"起点位置 {model.startLoc} 没有绑定容器,无可出库的物料");
                    return BuildSimpleResult(3, $"起点位置 {model.startLoc} 没有绑定容器,无可出库的物料!");
                }
                if (locCntrRel.N_LOCK_STATE == 0) {
                    return BuildSimpleResult(5, $"起点位置'{model.startLoc}'的货位,货位容器关系上锁,物料信息尚未传递,无法出库!");
                }
                var endLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.endLoc && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y" && endAreas.Contains(a.S_AREA_CODE));
@@ -597,9 +728,9 @@
                }
                else {
                    return BuildSimpleResult(3, $"只有任务号状态为 等待 或 已推送 的任务才能取消");
                    //return BuildSimpleResult(3, $"只有任务号状态为 等待 或 已推送 的任务才能取消");
                    // return CancelTaskIfForced(model, task); // 备用函数,如果甲方要求任务执行中也取消,再调用
                    return CancelTaskIfForced(model, task); // 备用函数,如果甲方要求任务执行中也取消,再调用
                }
            }
@@ -608,18 +739,91 @@
            }
        }
        public static SimpleResult CancelTaskIfForced(CancleTaskInfo model, TN_Task task) {
            return BuildSimpleResult(3, $"只有任务号状态为 等待 或 已推送 的任务才能取消");
        }
        public static SimpleResult CancelTaskIfForced(CancelTaskInfo model, TN_Task task) {
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
            try {
                var startloc = db.Queryable<TN_Location>().First(a => a.S_CODE == task.S_START_LOC);
                var endloc = db.Queryable<TN_Location>().First(a => a.S_CODE == task.S_END_LOC);
                //var locCnt = db.Queryable<TN_Loc_Container>().First(a => a.S_CNTR_CODE == task.S_CNTR_CODE);
                //var cg = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == task.S_CNTR_CODE);
                if (startloc != null) {
                    startloc.N_LOCK_STATE = 0;
                    startloc.S_LOCK_STATE = "无";
                    //starloc.N_CURRENT_NUM = 0;
                    startloc.T_MODIFY = System.DateTime.Now;
                }
                if (endloc != null) {
                    endloc.N_LOCK_STATE = 0;
                    endloc.S_LOCK_STATE = "无";
                    //endloc.N_CURRENT_NUM = 0;
                    endloc.T_MODIFY = System.DateTime.Now;
                }
                if (task.N_B_STATE == 1) {
                    if (!int.TryParse(task.S_EQ_TASK_CODE, out var code)) {
                        LogHelper.Info($"当前任务{task.S_CODE}没有找到对应的国自AGV orderId!");
                    }
                    else {
                        var res = GZRobot.CancelGZOrder(code);
                        if (!res) {
                            LogHelper.Info($"国自AGV取消任务失败!", "HosttoagvTask");
                        }
                        else {
                            LogHelper.Info($"国自AGV取消任务成功!", "HosttoagvTask");
                        }
                    }
                }
                task.N_B_STATE = 4;
                task.S_B_STATE = "取消";
                // 前面锁状态的部分不需要修改:无论有没有恢复,都强制恢复,最终结果都是无锁状态
                // 已执行:需要添加的逻辑:针对解锁/绑定的货位容器表(好像不需要关心,先不做任何操作)
                using (var tran = db.Ado.UseTran()) {
                    if (db.Updateable<TN_Location>(startloc).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"任务{task.S_CODE}取消失败:修改起点货位锁状态失败";
                        return BuildSimpleResult(500, info);
                    }
                    if (endloc != null) {
                        if (db.Updateable<TN_Location>(endloc).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"任务{task.S_CODE}取消失败:修改终点货位锁状态失败";
                            return BuildSimpleResult(500, info);
                        }
                    }
                    if (db.Updateable<TN_Task>(task).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"任务{task.S_CODE}取消失败";
                        return BuildSimpleResult(500, info);
                    }
                    tran.CommitTran();
                    info = $"任务{task.S_CODE}取消成功";
                    return BuildSimpleResult(0, info);
                }
            }
            catch (Exception) {
                throw; // 外部catch
            }
            //return BuildSimpleResult(3, $"只有任务号状态为 等待 或 已推送 的任务才能取消");
        }
        public static ErpResult InboundDataSync(InboundDataSyncInfo model) {
            //return BuildErpResult(1, "测试");
            var db = new SqlHelper<object>().GetInstance();
            try {
                if (model.stockTransactions.Count == 0) {
                if (model.stockTransactions == null && model.stockTransactions.Count == 0) {
                    return BuildErpResult(400, "不能传入空的数据列表");
                }
@@ -631,7 +835,7 @@
                foreach (var transaction in model.stockTransactions) {
                    var recordOld = db.Queryable<TN_Inbound_DataRecord>()
                        .Where(r => r.S_LOCATION_CODE == transaction.locationCode).First();
                        .Where(r => r.S_LOCATION_CODE == "HJQ-" + transaction.locationCode.Trim()).First();
                    if (recordOld != null) {
                        deleteRecordOldList.Add(recordOld);
                        //errList.Add(recordOld);
@@ -640,7 +844,7 @@
                    // 写入记录表
                    var record = new TN_Inbound_DataRecord {
                        S_LOCATION_CODE = transaction.locationCode,
                        S_LOCATION_CODE = "HJQ-" + transaction.locationCode.Trim(),
                        S_STOCK_TRANS = transaction.stockTransactionId,
                        S_ITEM_CODE = transaction.itemCode,
                        S_ITEM_NAME = transaction.itemName,
@@ -718,7 +922,7 @@
            var db = new SqlHelper<object>().GetInstance();
            try {
                if (model.materialIssues.Count == 0) {
                if (model.materialIssues == null || model.materialIssues.Count == 0) {
                    return BuildErpResult(400, "不能传入空的数据列表");
                }
@@ -729,7 +933,7 @@
                var deleteRecordOldList = new List<TN_Outbound_DataRecord>();
                foreach (var issue in model.materialIssues) {
                    var recordOld = db.Queryable<TN_Outbound_DataRecord>()
                        .Where(r => r.S_LOCATION_CODE == issue.locationCode).First();
                        .Where(r => r.S_LOCATION_CODE == "HJQ-" + issue.locationCode.Trim()).First();
                    if (recordOld != null) {
                        deleteRecordOldList.Add(recordOld);
                        //errList.Add(recordOld);
@@ -738,7 +942,7 @@
                    // 写入记录表
                    var record = new TN_Outbound_DataRecord {
                        S_LOCATION_CODE = issue.locationCode,
                        S_LOCATION_CODE = "HJQ-" + issue.locationCode.Trim(),
                        S_ORDER_NO = issue.withdrawalOrderNo,
                        S_ITEM_CODE = issue.itemCode,
                        S_ITEM_NAME = issue.itemName,
api/ApiModel.cs
@@ -158,6 +158,23 @@
            public string Row { get; set; }
        }
        public class InboundDataInfo {
            /// <summary>
            /// 起点货位
            /// </summary>
            [JsonProperty("StartLoc")]
            public string StartLoc { get; set; }
            /// <summary>
            /// 终点货架(可选)
            /// </summary>
            [JsonProperty("Nrow")]
            public string Row { get; set; }
            public string ItemCode { get; set; }
            //public string ItemName { get; set; }
        }
        public class SelectLocationInfo {
            /// <summary>
            /// AGV小车号:NOTE 后期可能省略,因为只有一辆车
api/ErpController.cs
@@ -50,7 +50,7 @@
            //if (!checkRes.isSuccess) {
            //    return CreateErrorResponse(checkRes.code, checkRes.message);
            //}
            var res = ApiHelper.OutboundDataSync(model);
            return CreateSuccessResponse(res);
        }
api/MoboxController.cs
@@ -26,6 +26,18 @@
        }
        /// <summary>
        /// 货品入库-手动添加数据
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("InboundData")]
        public SimpleResult InboundData(InboundDataInfo model) {
            LogHelper.Info("触发API:产品入库-手动添加数据" + JsonConvert.SerializeObject(model), "API");
            return ApiHelper.InboundData(model);
        }
        /// <summary>
        /// PDA选择终点货位
        /// </summary>
        /// <param name="model"></param>
core/Monitor.cs
@@ -20,7 +20,11 @@
            var db = new SqlHelper<object>().GetInstance();
            try {
                var inboundDataList = db.Queryable<TN_Inbound_DataRecord>().ToList();
                LogHelper.Info($"轮询:入库信息同步:当前没有待同步的ERP物料信息");
                if (inboundDataList.Count == 0 ) {
                    LogHelper.Info($"轮询:入库信息同步:当前没有待同步的ERP物料信息");
                    return;
                }
                var needDeleteDataList = new List<TN_Inbound_DataRecord>();
                var needUpdateLocCntrRelList = new List<TN_Loc_Container>();
@@ -42,6 +46,10 @@
                        needUpdateCgDetailList.Add(cgDetail);
                        needDeleteDataList.Add(inboundData);
                    }
                }
                if (needDeleteDataList.Count == 0) {
                    LogHelper.Info($"轮询:入库信息同步:待更新的ERP物料信息,暂无物料可以覆盖,目前待更新数量:{inboundDataList.Count}");
                }
                using (var tran = db.Ado.UseTran()) {
@@ -81,6 +89,7 @@
                if (outboundDataList.Count== 0 ) {
                    LogHelper.Info($"轮询:出库信息同步:当前没有待同步的ERP物料信息");
                    return;
                }
                var needDeleteDataList = new List<TN_Outbound_DataRecord>();
@@ -103,6 +112,10 @@
                        needUpdateCgDetailList.Add(cgDetail);
                        needDeleteDataList.Add(outboundData);
                    }
                }
                if (needDeleteDataList.Count == 0) {
                    LogHelper.Info($"轮询:出库信息同步:待更新的ERP物料信息,暂无物料可以覆盖,目前待更新数量:{outboundDataList.Count}");
                }
                using (var tran = db.Ado.UseTran()) {
@@ -130,7 +143,6 @@
            }
            catch (Exception ex) {
                LogHelper.Info($"发生了异常:{ex.Message}");
            }
        }
core/WCSCore.cs
@@ -126,13 +126,13 @@
                    return;
                }
                //if (db.Updateable<TN_Loc_Container>()
                //    .SetColumns(d => d.S_IMG_URL == filepath)
                //    .Where(d => d.S_CNTR_CODE == model.S_CNTR_CODE).ExecuteCommand() <= 0) {
                if (db.Updateable<TN_Loc_Container>()
                    .SetColumns(d => d.S_IMG_URL == filepath)
                    .Where(d => d.S_CNTR_CODE == model.S_CNTR_CODE).ExecuteCommand() <= 0) {
                //    LogHelper.Info($"图片URL '{filepath}' 写入数据库失败");
                //    return;
                //}
                    LogHelper.Info($"图片URL '{filepath}' 写入数据库失败");
                    return;
                }
            }
            catch (Exception ex) {
                LogHelper.Info($"发生了错误:{ex.Message}");
device/SnapDevice.cs
@@ -161,5 +161,19 @@
                Process.Start(filePath);
            }
        }
        public string GetCapturePictureLocalPath() {
            string path = AppDomain.CurrentDomain.BaseDirectory + "image";
            if (!Directory.Exists(path)) {
                Directory.CreateDirectory(path);
            }
            DateTime now = DateTime.Now;
            string filePath = path + "\\" + string.Format("{0}-{1}-{2}-{3}-{4}-{5}", now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second) + ".jpg";
            bool ret = NETClient.CapturePicture(_PlayID, filePath, EM_NET_CAPTURE_FORMATS.JPEG);
            if (!ret) {
                return "";
            }
            return filePath;
        }
    }
}
device/SnapManager.cs
@@ -1,8 +1,11 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using NetSDKCS;
namespace HH.WCS.Mobox3.AnGang.device {
    public class SnapManager {
@@ -23,6 +26,21 @@
            string fileName = string.Format("{0}{1}{2}{3}{4}{5}", now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second) + ".jpg";
            string filePath = path + "\\" + fileName;
            //// 获取当前时间
            //DateTime now = DateTime.Now;
            //// 构建文件名:yyyy-MM-dd-HHmmss.jpg
            //string fileName = $"{now:yyyy-MM-dd-HHmmss}.jpg";
            //// 构建文件夹路径:path\yyyy\MM\dd
            //string directoryPath = Path.Combine(path, now.Year.ToString(), now.Month.ToString("00"), now.Day.ToString("00"));
            //// 如果目录不存在则创建
            //Directory.CreateDirectory(directoryPath);
            //// 完整的文件路径
            //string filePath = Path.Combine(directoryPath, fileName);
            if (_snapDevice.SnapPictureToFileOK(ref filePath)) {
                return filePath;
            }
@@ -30,5 +48,9 @@
                return string.Empty;
            }
        }
        public static string GetCapturePictureLocal() {
            return _snapDevice.GetCapturePictureLocalPath();
        }
    }
}
dispatch/GZRobot.cs
@@ -125,7 +125,7 @@
        /// </summary>
        /// <returns></returns>
        public static GzResult orderStatusReport(orderStatusReportParme model) {
            LogHelper.Info("RCS国自AGV任务状态回报:" + JsonConvert.SerializeObject(model), "HosttoagvTask");
            LogHelper.Info("orderStatusReport:RCS国自AGV任务状态回报:" + JsonConvert.SerializeObject(model), "HosttoagvTask");
            GzResult result = new GzResult();
            AgvTaskState agv = new AgvTaskState();
models/TN_Loc_Container.cs
@@ -25,6 +25,6 @@
        /// <summary>
        /// 图片链接
        /// </summary>
        //public string S_IMG_URL { get; set; } = "";
        public string S_IMG_URL { get; set; } = "";
    }
}
wms/LocationHelper.cs
@@ -518,11 +518,6 @@
        public string cntID { get; set; }//容器ID
    }
    public class CancleTaskInfo
    {
        public string taskNO { get; set; }//任务号
    }
    public class PDAFullInAreaInfo
    {
        public string StartLoc { get; set; }//起点