From e0d89637030791ce1e7dd46ca5fdec9979977960 Mon Sep 17 00:00:00 2001
From: 杨前锦 <1010338399@qq.com>
Date: 星期三, 11 六月 2025 17:28:41 +0800
Subject: [PATCH] 印尼佳通-硫化流程出入库流程开发

---
 HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/core/WCSCore.cs |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/core/WCSCore.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/core/WCSCore.cs
index 2bbdc23..90f2243 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/core/WCSCore.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/core/WCSCore.cs
@@ -62,6 +62,7 @@
                                         break;
                                     case 4:
                                         WCSHelper.UpdateStatus(cst, "鍙栬揣瀹屾垚");
+                                        LocationHelper.UnLockLoc(cst.S_START_LOC);
                                         TaskProcess.OperateStatus(cst, 4);
                                         break;
                                     case 5:
@@ -69,6 +70,7 @@
                                         break;
                                     case 6:
                                         WCSHelper.UpdateStatus(cst, "鍗歌揣瀹屾垚");
+                                        LocationHelper.UnLockLoc(cst.S_END_LOC);
                                         TaskProcess.OperateStatus(cst, 6);
                                         break;
                                     #endregion
@@ -84,11 +86,13 @@
                             else if (model.State == 1012)
                             {
                                 LogHelper.Info("寮�杩涜RFID鎵弿", "AGV");
+                                ContainerHelper.UpdateCntrState(cst.S_CNTR_CODE, 1);
+                                WMSHelper.addRfidAnomalyRecord(cst.S_CNTR_CODE, 2, cst.S_START_LOC, null);
                                 // 鏌ヨ鎵弿鐨凴FID
                                 // 鍙戦� 00 04 71 02鍒版壂鐮佸櫒 锛屾帴鍙楄繑鍥炴暟鎹苟瑙f瀽
-                                byte[] bytes = new byte[] {00,04,71,02};
-                                var plc = Settings.deviceInfos.Where(a => a.deviceNo == model.ForkliftNo && a.enable == 1).FirstOrDefault();
-                                TcpServer.TcpServerSend(plc.address, bytes);
+                                /*  byte[] bytes = new byte[] { 00, 04, 71, 02 };
+                                  var plc = Settings.carDeviceInfos.Where(a => a.deviceNo == model.ForkliftNo && a.enable == 1).FirstOrDefault();
+                                  TcpServer.TcpServerSend(plc.address, bytes);*/
                             }
                             else if (model.State == 1002)
                             {
@@ -116,7 +120,7 @@
                                         param = $"{model.No};{cst.S_START_LOC};{cst.S_END_LOC};4;512;0;1"
                                     };
                                     NDCApi.ChangeOrderParam(paramModel);
-                                    LogHelper.Info($"鑾峰彇AGV缁堢偣锛歿agvEndLoc}", "AGV");
+                                    LogHelper.Info($"鍙樻洿AGV缁堢偣锛歿agvEndLoc}", "AGV");
                                 }
                                 else
                                 {
@@ -150,7 +154,11 @@
 
                                 // 妫�祴鏄惁鏄鐮佷綅锛岄潪璇荤爜浣嶏紝鍙互婵�椿棰勫垱寤轰换鍔�                                 var transfe = WMSHelper.GetTransfeRelevance(cst.S_END_LOC);  // 鎺ラ┏浣嶅睘鎬�-                                if ((transfe == null || transfe.N_READ_LOC == 0))
+                                if (transfe != null && transfe.N_READ_LOC == 1) 
+                                {
+                                    WCSHelper.ActivatePreCreateTask(mst.S_CODE);
+                                }
+                                else if ( transfe.N_READ_LOC == 0)
                                 {
                                     if (cst.S_TYPE.Contains("銆愬紓甯搞�"))
                                     {
@@ -176,9 +184,7 @@
                                     // 濡傛灉浣滀笟鍚嶇О涓烘垚鍨嬫満鍙枡鍑哄簱浠诲姟锛屽垯瑙﹀彂浣欐枡/绌烘墭鎼繍浠诲姟
                                     string locCode = WMSHelper.getReturnMaterialLocCode(mst.S_END_LOC);
                                     ApiHelper.returnMaterialOrEmptyTray(locCode);
-                                }
-
-                                
+                                }   
                             }
                         }
                         else

--
Gitblit v1.9.1