From 648f4270f4f56c5ca284dbcfa650de05e46a7052 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期三, 16 七月 2025 17:20:59 +0800
Subject: [PATCH] 11111

---
 HH.WCS.Mobox3.NongFuLinZhi/Program.cs                                     |    2 
 /dev/null                                                                 |    0 
 HH.WCS.Mobox3.NongFuLinZhi/core/Monitor.cs                                |    5 
 .gitignore                                                                |    3 
 HH.WCS.Mobox3.NongFuLinZhi/wms/WCSHelper.cs                               |    7 +
 HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs                         |   58 +++++--------
 HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/v17/DocumentLayout.json |  111 ++++++++++++++++++++++++---
 7 files changed, 133 insertions(+), 53 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3556fdf..2902f5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -186,3 +186,6 @@
 FakesAssemblies/
 /HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/FileContentIndex/2e22cad6-d84f-4a27-8fd8-c544ce0375e7.vsidx
 /HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/FileContentIndex/c75d4ab3-ca3a-4d8e-ae92-c4dae90cd7d8.vsidx
+/HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/FileContentIndex/731226a4-d6f9-4f1d-aafd-f1fd46c0d468.vsidx
+/HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/FileContentIndex/84e1ac29-6f81-4f45-9cdf-cbea30cc0011.vsidx
+/HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/FileContentIndex/8df12e28-334c-46b4-b937-b31a72338452.vsidx
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/FileContentIndex/84e1ac29-6f81-4f45-9cdf-cbea30cc0011.vsidx b/HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/FileContentIndex/84e1ac29-6f81-4f45-9cdf-cbea30cc0011.vsidx
deleted file mode 100644
index bc0ec51..0000000
--- a/HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/FileContentIndex/84e1ac29-6f81-4f45-9cdf-cbea30cc0011.vsidx
+++ /dev/null
Binary files differ
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/v17/DocumentLayout.json b/HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/v17/DocumentLayout.json
index 5b2e5a3..60b350a 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/v17/DocumentLayout.json
+++ b/HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/v17/DocumentLayout.json
@@ -3,8 +3,28 @@
   "WorkspaceRootPath": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\",
   "Documents": [
     {
-      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\wcs\\hh.wcs.mobox3\\hh.wcs.mobox3.nongfulinzhi\\api\\debugcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:api\\debugcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\wcs\\hh.wcs.mobox3\\hh.wcs.mobox3.nongfulinzhi\\core\\monitor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:core\\monitor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\wcs\\hh.wcs.mobox3\\hh.wcs.mobox3.nongfulinzhi\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\wcs\\hh.wcs.mobox3\\hh.wcs.mobox3.nongfulinzhi\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\wcs\\hh.wcs.mobox3\\hh.wcs.mobox3.nongfulinzhi\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\wcs\\hh.wcs.mobox3\\hh.wcs.mobox3.nongfulinzhi\\core\\wcscore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:core\\wcscore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\wcs\\hh.wcs.mobox3\\hh.wcs.mobox3.nongfulinzhi\\wms\\wcshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:wms\\wcshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     }
   ],
   "DocumentGroupContainers": [
@@ -14,8 +34,73 @@
       "DocumentGroups": [
         {
           "DockedWidth": 200,
-          "SelectedChildIndex": 7,
+          "SelectedChildIndex": 0,
           "Children": [
+            {
+              "$type": "Document",
+              "DocumentIndex": 0,
+              "Title": "Monitor.cs",
+              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\core\\Monitor.cs",
+              "RelativeDocumentMoniker": "core\\Monitor.cs",
+              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\core\\Monitor.cs",
+              "RelativeToolTip": "core\\Monitor.cs",
+              "ViewState": "AgIAABsBAAAAAAAAAAAMwDcBAAAZAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2025-07-16T01:23:47.452Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 2,
+              "Title": "TaskProcess.cs",
+              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\process\\TaskProcess.cs",
+              "RelativeDocumentMoniker": "process\\TaskProcess.cs",
+              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\process\\TaskProcess.cs",
+              "RelativeToolTip": "process\\TaskProcess.cs",
+              "ViewState": "AgIAAAMFAAAAAAAAAAD4vxkFAABqAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2025-07-16T01:13:36.938Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 4,
+              "Title": "WCSCore.cs",
+              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\core\\WCSCore.cs",
+              "RelativeDocumentMoniker": "core\\WCSCore.cs",
+              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\core\\WCSCore.cs",
+              "RelativeToolTip": "core\\WCSCore.cs",
+              "ViewState": "AgIAADcAAAAAAAAAAAAnwFoAAAAuAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2025-07-16T01:13:14.237Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 5,
+              "Title": "WCSHelper.cs",
+              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\wms\\WCSHelper.cs",
+              "RelativeDocumentMoniker": "wms\\WCSHelper.cs",
+              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\wms\\WCSHelper.cs",
+              "RelativeToolTip": "wms\\WCSHelper.cs",
+              "ViewState": "AgIAAJAAAAAAAAAAAAD4v5QAAAARAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2025-07-16T01:12:47.622Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 1,
+              "Title": "Program.cs",
+              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\Program.cs",
+              "RelativeDocumentMoniker": "Program.cs",
+              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\Program.cs",
+              "RelativeToolTip": "Program.cs",
+              "ViewState": "AgIAAE0AAAAAAAAAAAAiwGcAAAAyAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2025-07-16T01:12:19.238Z",
+              "EditorCaption": ""
+            },
             {
               "$type": "Bookmark",
               "Name": "ST:0:0:{eefa5220-e298-11d0-8f78-00a0c9110057}"
@@ -41,20 +126,16 @@
               "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
             },
             {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
-            },
-            {
               "$type": "Document",
-              "DocumentIndex": 0,
-              "Title": "DebugController.cs",
-              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\api\\DebugController.cs",
-              "RelativeDocumentMoniker": "api\\DebugController.cs",
-              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\api\\DebugController.cs",
-              "RelativeToolTip": "api\\DebugController.cs",
-              "ViewState": "AgIAADwAAAAAAAAAAAAqwEYAAAAjAAAAAAAAAA==",
+              "DocumentIndex": 3,
+              "Title": "AgvController.cs",
+              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\api\\AgvController.cs",
+              "RelativeDocumentMoniker": "api\\AgvController.cs",
+              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\api\\AgvController.cs",
+              "RelativeToolTip": "api\\AgvController.cs",
+              "ViewState": "AgIAAAAAAAAAAAAAAADwvxMAAAAZAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-07-14T00:35:46.956Z",
+              "WhenOpened": "2025-07-16T00:55:29.909Z",
               "EditorCaption": ""
             }
           ]
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/Program.cs b/HH.WCS.Mobox3.NongFuLinZhi/Program.cs
index 0d2da28..ab750fc 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/Program.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/Program.cs
@@ -100,7 +100,7 @@
                 tasks.Add(GetTask(Monitor.BottleBlankTransportation)); //鎺ラ┏浣嶅叆搴�                 tasks.Add(GetTask(Monitor.PPFDFullIn)); //鐡跺澂缈绘枟鏈洪潪鍗充骇婊℃鍖鸿ˉ婊℃墭
                 tasks.Add(GetTask(Monitor.PGFDFullIn)); //鐡剁洊缈绘枟鏈洪潪鍗充骇婊℃鍖鸿ˉ婊℃墭
-                tasks.Add(GetTask(Monitor.PGFDFullInJC)); //鐡剁洊缈绘枟鏈哄嵆浜ф弧妗嗗尯琛ユ弧鎵�绌烘墭鍖哄煙琛ョ┖鎵�+                tasks.Add(GetTask(Monitor.PPFDFullInJC)); //鐡跺澂缈绘枟鏈哄嵆浜ф弧妗嗗尯琛ユ弧鎵�绌烘墭鍖哄煙琛ョ┖鎵�                 tasks.Add(GetTask(Monitor.PPFDFullInEmpty)); //鐡跺澂娉ㄥ鏈洪潪鍗充骇绌烘鍖鸿ˉ绌烘墭
                 tasks.Add(GetTask(Monitor.PGXBZZY)); //鐡剁洊灏忓寘瑁呯洊杞繍
 
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/core/Monitor.cs b/HH.WCS.Mobox3.NongFuLinZhi/core/Monitor.cs
index db1ab3f..82ae89b 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/core/Monitor.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/core/Monitor.cs
@@ -371,15 +371,16 @@
 
         }
 
-        internal static void PGFDFullInJC()
+        internal static void PPFDFullInJC()
         {
             var db = new SqlHelper<object>().GetInstance();
-            var workInfo = db.Queryable<LinZhiBCPWorkOrder>().Where(a => a.S_PLineNo == "鍐滃か鏋楄姖-鐡跺澂鏈� && a.S_UsingNow == "Y" && a.S_WorkState == "鎵ц涓�).First();
+            var workInfo = db.Queryable<LinZhiBCPWorkOrder>().Where(a => a.S_PLineNo.Contains("鐡跺澂缈绘枟鏈�) && a.S_UsingNow == "Y" && a.S_WorkState == "鎵ц涓�).First();
             if(workInfo != null)
             {
                 var areaInfo = Settings.areaInfos.Where(a => a.areaName == "鐡跺澂鍗充骇婊℃" && a.enable == 1).FirstOrDefault();
                 if(areaInfo != null)
                 {
+                    //濡傛灉搴撳尯鏄┖鐨勶紝骞朵笖娌℃湁鏈夐攣鐨勫氨琛ュ厖绌烘墭
                     var locInfo = db.Queryable<Location>().Where(a => a.S_AREA_CODE == areaInfo.areaCode && a.N_CURRENT_NUM == 0 && a.S_LOCK_STATE == "鏃�).First();
                     if (locInfo != null)
                     {
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs b/HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs
index 4f5c61f..28101f5 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs
@@ -1477,7 +1477,7 @@
                                         LogHelper.Info($"鍑哄簱绠楁硶04:褰撳墠璐т綅缁戝畾鐨勬墭鐩樼爜涓猴細{cntrInfo.S_CNTR_CODE}");
                                         string endItemCode = "";
                                         var itemInfo = db.Queryable<CntrItemRel>().Where(b => b.S_CNTR_CODE == cntrInfo.S_CNTR_CODE).First();
-                                        if (itemInfo != null && itemInfo.S_ITEM_CODE == itemCode)
+                                        if (itemInfo != null)
                                         {
                                             endItemCode = itemInfo.S_ITEM_CODE;
                                         }
@@ -1946,24 +1946,7 @@
                     {
                         var cir = new LocCntrRel { S_LOC_CODE = loc, S_CNTR_CODE = cntrCode, S_SRC = deviceName };
                         if (db.Insertable<LocCntrRel>(cir).ExecuteCommand() > 0) LogHelper.Info($"璐т綅瀹瑰櫒琛ㄧ粦瀹氭垚鍔燂紝璐т綅鍙凤細{loc}锛屾墭鐩樺彿锛歿cntrCode}");
-                        var Con = db.Queryable<Container>().Where(a => a.S_CODE == cntrCode).First();
-                        if(Con == null)
-                        {
-                            int detallCount = 0;
-                            if (!string.IsNullOrEmpty(itemCode))
-                            {
-                                detallCount = 1;
-                            }
-                            if(db.Insertable<Container>(new Container
-                            {
-                                S_CODE = cntrCode,
-                                N_TYPE = 1,
-                                N_DETAIL_COUNT = detallCount
-                            }).ExecuteCommand() > 0)
-                            {
-                                LogHelper.Info($"瀹瑰櫒琛ㄧ粦瀹氭垚鍔燂紝鎵樼洏鍙凤細{cntrCode}");
-                            }
-                        }
+                        
                         if (!string.IsNullOrEmpty(itemCode))
                         {
                             BindCntrItem(cntrCode, itemCode, batchNo, itemlayer, itemName);
@@ -1990,6 +1973,26 @@
             try
             {
                 db.BeginTran();
+
+                var Con = db.Queryable<Container>().Where(a => a.S_CODE == trayCode).First();
+                if (Con == null)
+                {
+                    int detallCount = 1;
+                    if (db.Insertable<Container>(new Container
+                    {
+                        S_CODE = trayCode,
+                        N_TYPE = 1,
+                        N_DETAIL_COUNT = detallCount
+                    }).ExecuteCommand() > 0)
+                    {
+                        LogHelper.Info($"瀹瑰櫒琛ㄧ粦瀹氭垚鍔燂紝鎵樼洏鍙凤細{trayCode}");
+                    }
+                }
+                else
+                {
+                    Con.N_DETAIL_COUNT = 1;
+                    db.Updateable(Con).UpdateColumns(a => new { a.N_DETAIL_COUNT }).ExecuteCommand();
+                }
                 //db.Updateable(cntr).UpdateColumns(it => new { it.S_DEST }).ExecuteCommand();
                 //1.灏嗗師鏈夊鍣ㄧ墿鏂欎俊鎭垹闄�                 //db.Deleteable<CntrItemRel>().Where(it => it.S_CNTR_CODE == cntr.S_CNTR_CODE.Trim()).ExecuteCommand();
@@ -2548,23 +2551,8 @@
             var op = WMSHelper.GetWmsTask(TN_Task.S_OP_CODE);
             if (op != null)
             {
-                if (op.N_B_STATE == 0)
-                {
                     //绛夊緟鐩存帴淇敼鐘舵�涓哄彇娑�-                    op.N_B_STATE = 3;
-                }
-                else if (op.N_B_STATE == 1)
-                {
-                    if (WCSHelper.CheckActionRecordExist(TN_Task.S_CODE, 4))
-                    {
-                        op.N_B_STATE = 2;
-                    }
-                    else
-                    {
-                        op.N_B_STATE = 3;
-                    }
-                }
-                
+                op.N_B_STATE = 2;
                 WMSHelper.UpdateTaskState(op);
             }
             NDCApi.CancelOrder(TN_Task.S_CODE.Trim());
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/wms/WCSHelper.cs b/HH.WCS.Mobox3.NongFuLinZhi/wms/WCSHelper.cs
index 6b83aef..66f58d6 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/wms/WCSHelper.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/wms/WCSHelper.cs
@@ -153,6 +153,13 @@
                 task.N_B_STATE = 5;
                 task.S_B_STATE = WCSTask.GetStateStr(task.N_B_STATE);
                 db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE }).ExecuteCommand();
+
+                var op = WMSHelper.GetWmsTask(task.S_OP_CODE);
+                if (op != null)
+                {
+                    op.N_B_STATE = 2;
+                    WMSHelper.UpdateTaskState(op);
+                }
             }
         }
         internal static bool CreateTask(WCSTask TN_Task) {

--
Gitblit v1.9.1