From 7b3b60e8e01a1cf2fb97af695639b18210a160c0 Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期日, 20 七月 2025 14:39:16 +0800
Subject: [PATCH] 去线边的,取消任务收到4后直接删除物料容器

---
 process/TaskProcess.cs |   19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index bfcdf52..749ed00 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -51,26 +51,21 @@
                 CacheBitUpdate(mst, false);
                 WCSHelper.End(mst);//浠诲姟鐘舵�鏀规垚缁撴潫
             }
-            else 
+            else   // 娌℃湁寮�鍗歌揣
             {
-                // 娌℃湁寮�鍗歌揣
+              
                 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)
-                {
-                    db.Deleteable<TN_InventoryM>().Where(it => it.S_ID == cginfo.S_ID || it.RFID == mst.S_CNTR_CODE).ExecuteCommand();
-                }
-                else
-                {
-                    db.Deleteable<TN_InventoryM>().Where(it => it.RFID == mst.S_CNTR_CODE).ExecuteCommand();
-                }
+                db.Deleteable<TN_CG_Detail>().Where(it => it.S_CNTR_CODE == mst.S_CNTR_CODE).ExecuteCommand();
+                db.Deleteable<TN_InventoryM>().Where(it => it.RFID == mst.S_CNTR_CODE).ExecuteCommand();
+                db.Deleteable<TN_Loc_Container>().Where(it => it.S_CNTR_CODE == mst.S_CNTR_CODE).ExecuteCommand();
+                db.Deleteable<TN_Container>().Where(it => it.S_CODE == mst.S_CNTR_CODE).ExecuteCommand();
                 //蹇呴』鍒犳帀
-                LocationHelper.ErrorLocCntReset(new ErrorLocCntResetInfo() { locID = mst.S_START_LOC, reqCode = 1 });
             }
             if (!WCSHelper.CheckActionRecordExist(mst.S_CODE, 4))
             {
                 LocationHelper.UnLockLoc(mst.S_START_LOC);//瑙i攣璧风偣
+                LocationHelper.ErrorLocCntReset(new ErrorLocCntResetInfo() { locID = mst.S_START_LOC, reqCode = 1 });
             }
            
             LocationHelper.UnLockLoc(mst.S_END_LOC);//瑙i攣缁堢偣

--
Gitblit v1.9.1