From 77b654d928c34d32462e212a4ec212f7cc48b50f Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期三, 16 七月 2025 17:35:49 +0800
Subject: [PATCH] 库存信息添加起点货位信息

---
 wms/WCSHelper.cs |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/wms/WCSHelper.cs b/wms/WCSHelper.cs
index 8ce42cb..7b3bd94 100644
--- a/wms/WCSHelper.cs
+++ b/wms/WCSHelper.cs
@@ -187,15 +187,11 @@
             var db = new SqlHelper<TN_Task>().GetInstance();
             if (task != null)
             {
-                if (task.N_B_STATE == 1)
-                {
-                    task.N_B_STATE = 2;
-                    task.S_B_STATE = TN_Task.GetStateStr(task.N_B_STATE);
-                    task.T_START_TIME = System.DateTime.Now;
-                    task.S_EQ_NO = forklift_no;
-                    db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE, it.T_START_TIME, it.S_EQ_NO }).ExecuteCommand();
-                }
-
+                task.N_B_STATE = 2;
+                task.S_B_STATE = TN_Task.GetStateStr(task.N_B_STATE);
+                task.T_START_TIME = System.DateTime.Now;
+                task.S_EQ_NO = forklift_no;
+                db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE, it.T_START_TIME, it.S_EQ_NO }).ExecuteCommand();
             }
         }
         internal static void End(TN_Task task) {
@@ -244,7 +240,7 @@
             {
                 LogHelper.Info($"鍙栨秷浠诲姟: {tN_Task.S_CODE} 缁堢偣鏄弧鎵樼紦瀛樺簱鍖� {tN_Task.S_END_AREA}");
 
-                TaskProcess.OperateStatus(tN_Task, 7);//寮傚父澶勭悊
+                TaskProcess.CacheBitCancelUpdate(tN_Task);//寮傚父澶勭悊
             }
             else if (tN_Task.S_START_AREA == HJ || tN_Task.S_TYPE.Contains("婊℃墭鍑哄簱涓婄嚎"))//璧风偣鏄弧鎵樼紦瀛樺簱鍖�             {
@@ -259,7 +255,11 @@
                 else
                 {
                     WCSHelper.End(tN_Task);//浠诲姟鐘舵�鏀规垚缁撴潫
-                    LocationHelper.BindingLoc(tN_Task.S_END_LOC, tN_Task.S_CNTR_CODE.Split(',').ToList());// 缁戝畾缁堢偣瀹瑰櫒璐т綅
+
+                    if (tN_Task.S_END_AREA != Settings.Areas[2])//鍘荤嚎杈圭殑涓嶇粦瀹氱粓鐐�+                    {
+                        LocationHelper.BindingLoc(tN_Task.S_END_LOC, tN_Task.S_CNTR_CODE.Split(',').ToList());// 缁戝畾缁堢偣瀹瑰櫒璐т綅
+                    }
 
                     LogHelper.Info($"鍙栨秷浠诲姟: {tN_Task.S_CODE} 鍙栬揣瀹屾垚锛屼换鍔$姸鎬佹敼鎴愮粨鏉燂紝缁戝畾缁堢偣瀹瑰櫒璐т綅");
                 }

--
Gitblit v1.9.1