From 6eb9d76c2d89239b5161951346ef5cc5d0c9ebd1 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期三, 23 七月 2025 17:21:19 +0800
Subject: [PATCH] 1

---
 HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs b/HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs
index 2f27575..6f567e6 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs
@@ -723,7 +723,11 @@
                             {
                                 LogHelper.Info($"getFDSXArea:鏌ヨ鍒扮墿鏂欑紪鐮侊細{itemInfo.S_ITEM_CODE}");
                                 LogHelper.Info($"getFDSXArea:鏌ヨ鍒扮墿鏂欐壒娆★細{itemInfo.S_BATCH_NO}");
-                                if (workInfo.S_PLineNo.Contains("鐡跺澂")) workInfo.S_ITEM_TYPE = "";
+                                if (workInfo.S_PLineNo.Contains("鐡跺澂"))
+                                {
+                                    workInfo.S_ITEM_TYPE = "";
+                                    itemInfo.S_BATCH_NO = "";
+                                }
                                 if (itemInfo.S_ITEM_CODE + itemInfo.S_BATCH_NO == workInfo.S_ItemCode + workInfo.S_ITEM_TYPE)
                                 {
                                     result = a;
@@ -886,17 +890,18 @@
                         else
                         {
                             string cntrCode = Guid.NewGuid().ToString("N");
+                            string batch = workInfo.S_UsingNow == "Y" ? "鍗充骇" : "闈炲嵆浜�;
                             var cntrInfo = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == deviceBit).First();
                             if(cntrInfo == null)
                             {
                                 LogHelper.Info($"{type}娉ㄥ鏈轰笂鏈粦瀹氭墭鐩�鑷姩缁戝畾鎵樼洏");
 
-                                TaskProcess.BindLocCntr(deviceBit, cntrCode, workInfo.S_ItemCode, "","","",workInfo.S_ItemName);
+                                TaskProcess.BindLocCntr(deviceBit, cntrCode, workInfo.S_ItemCode, batch, "","",workInfo.S_ItemName);
                             }
                             else
                             {
                                 cntrCode = cntrInfo.S_CNTR_CODE;
-                                TaskProcess.BindCntrItem(cntrCode, workInfo.S_ItemCode, "", "",workInfo.S_ItemName);
+                                TaskProcess.BindCntrItem(cntrCode, workInfo.S_ItemCode, batch, "",workInfo.S_ItemName);
                             }
                             //鍒涘缓浣滀笟
                             WMSHelper.CreateOpTask(deviceBit, "", "鍏ュ簱", taskType, cntrCode,"","",workInfo.S_WorkNo);

--
Gitblit v1.9.1