杨张扬
2025-06-12 52adedb218549cde2bdc60c3b338e360e72d94a6
双钱-修改库存记录BUG
4个文件已修改
44 ■■■■ 已修改文件
api/ApiHelper.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
core/Monitor.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
core/WCSCore.cs 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
process/TaskProcess.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/ApiHelper.cs
@@ -248,7 +248,13 @@
                    LocationHelper.LockLoc(endLoc.S_CODE, 1);//终点入库锁
                    LogHelper.Info($"生成{typeName}任务成功,容器号{locCnt.S_CNTR_CODE},起点{startLoc.S_CODE},终点{endLoc.S_CODE}");
                    db.Updateable<TN_CG_Detail>().UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).ExecuteCommand();
                    if( db.Updateable<TN_CG_Detail>(cG_Detail).UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).ExecuteCommand() <= 0)
                    {
                        result.resultCode = 5;
                        result.resultMsg = $"更新容器{locCnt.S_CNTR_CODE}的货品明细失败";
                        LogHelper.Info(result.resultMsg);
                        return result;
                    }
                    Task task99 = Task.Run(() =>
                    {
core/Monitor.cs
@@ -566,13 +566,6 @@
                    db.Updateable<TN_InventoryM>(targetInM).UpdateColumns(it => new { it.EXPIRATION_DAY }).ExecuteCommand();
                }
                var targetInM_De = db.Queryable<TN_InventoryM>().LeftJoin<TN_Task>((o, i) => o.RFID == i.S_CNTR_CODE).
                  Where((o, i) => i.N_B_STATE == 4 || i.S_B_STATE == "错误").ToList();//错误的任务删除对应的库存信息
                if (targetInM_De.Count>0)
                {
                    db.Deleteable<TN_InventoryM>(targetInM_De).ExecuteCommand();
                }
                //  同步 TN_DayProDetail
                var curDay = System.DateTime.Now.Date;
                var targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DOWNLINETIME >= curDay && a.DOWNLINETIME <= curDay.AddDays(1)).ToList();
core/WCSCore.cs
@@ -1,5 +1,6 @@
using HH.WCS.Mobox3.DoubleCoin.device;
using HH.WCS.Mobox3.DoubleCoin.dispatch;
using HH.WCS.Mobox3.DoubleCoin.models;
using HH.WCS.Mobox3.DoubleCoin.process;
using HH.WCS.Mobox3.DoubleCoin.util;
using HH.WCS.Mobox3.DoubleCoin.wms;
@@ -161,11 +162,11 @@
                                case 7:
                                    Task task10 = Task.Run(() =>
                                    {
                                        if (TN_Task.S_TYPE == "满托下线入库")
                                        if (TN_Task.S_TYPE == "满托下线入库" || TN_Task.S_TYPE == "PDA满托下线入库")
                                        {
                                            TaskProcess.OperateStatus(TN_Task, 7);//异常处理
                                        }
                                        else if(TN_Task.S_TYPE == "满托出库上线")
                                        else
                                        {
                                            WCSHelper.Fail(TN_Task);//任务状态改成错误
                                            LocationHelper.UnLockLoc(TN_Task.S_END_LOC);
@@ -173,7 +174,15 @@
                                            {
                                                LocationHelper.UnLockLoc(TN_Task.S_START_LOC);
                                            }
                                            var db = new SqlHelper<object>().GetInstance();
                                            var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == TN_Task.S_CNTR_CODE);
                                            if (cginfo != null)
                                            {
                                                SpecHelper.DeleteInventoryM(cginfo.S_ID);
                                            }
                                        }
                                    });
                                    break;
@@ -181,7 +190,7 @@
                                    
                                    Task task11 = Task.Run(() =>
                                    {
                                        if (TN_Task.S_TYPE == "满托下线入库")
                                        if (TN_Task.S_TYPE == "满托下线入库" || TN_Task.S_TYPE == "PDA满托下线入库")
                                        {
                                            var res = NDCApi.CancelOrder(TN_Task.S_CODE);
                                            if (res != null && (res.err_code ==50002 || res.err_code == 0))
@@ -204,6 +213,13 @@
                                                {
                                                    LocationHelper.UnLockLoc(TN_Task.S_START_LOC);
                                                }
                                                var db = new SqlHelper<object>().GetInstance();
                                                var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == TN_Task.S_CNTR_CODE);
                                                if (cginfo != null)
                                                {
                                                    SpecHelper.DeleteInventoryM(cginfo.S_ID);
                                                }
                                            }
                                            else
                                            {
process/TaskProcess.cs
@@ -54,6 +54,13 @@
                //起点解锁
                LocationHelper.ErrorLocCntReset(new ErrorLocCntResetInfo() { locID = mst.S_START_LOC,reqCode =1});
                WCSHelper.Fail(mst);//任务状态改成错误
                var db = new SqlHelper<object>().GetInstance();
                var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == mst.S_CNTR_CODE);
                if (cginfo!= null)
                {
                    SpecHelper.DeleteInventoryM(cginfo.S_ID);
                }
            }
            LocationHelper.UnLockLoc(mst.S_END_LOC);
        }