From 91443c26b77da527c0dfc4d6c3e45e349e581ecf Mon Sep 17 00:00:00 2001
From: 杨前锦 <1010338399@qq.com>
Date: 星期四, 15 五月 2025 17:23:06 +0800
Subject: [PATCH] 印尼佳通人工出入库问题修复

---
 HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/api/ApiHelper.cs |   27 +++++----------------------
 1 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/api/ApiHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/api/ApiHelper.cs
index bc50dfc..cb0e21e 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/api/ApiHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/api/ApiHelper.cs
@@ -506,7 +506,7 @@
             ReturnResult result = new ReturnResult();
             try
             {
-                Location startLoc = WMSHelper.GetoutStockStartLoc(model.itemCode , model.endLoc);
+                Location startLoc = WMSHelper.GetoutStockStartLoc(model.itemCode,model.trayCode , model.endLoc);
                 Location endLoc = LocationHelper.GetLoc(model.endLoc);
 
                 if (startLoc != null)
@@ -777,27 +777,9 @@
             ReturnResult result = new ReturnResult();
             try
             {
-                Location startLoc = LocationHelper.GetLoc(Settings.baseTrayInBufferLoc);
+                Location startLoc = WMSHelper.GetEmptyTrayStartLoc(0, 1);
                 Location endLoc = LocationHelper.GetLoc(loc);
                 var agvJBLoc = Settings.getAgvJBLoc(loc);
-
-                if (startLoc != null && startLoc.N_CURRENT_NUM == 1 && agvJBLoc.type == 1)
-                {
-                   var locCntrRels = LocationHelper.GetLocCntrRel(startLoc.S_CODE);
-                    if (locCntrRels.Count > 0) 
-                    {
-                        var container = ContainerHelper.GetCntr(locCntrRels[0].S_CNTR_CODE);
-                        if (container.N_TYPE != 0) 
-                        {
-                            startLoc = null;
-                        }
-                    }
-                }
-               
-                if(startLoc == null || startLoc.N_CURRENT_NUM != 1) 
-                {
-                    startLoc = WMSHelper.GetEmptyTrayStartLoc(0);
-                }
 
                 if (startLoc != null)
                 {
@@ -885,7 +867,7 @@
                 var mst = WMSHelper.GetWmsTask(wmsTaskNo);
                 if (mst != null && mst.N_B_STATE < 2) 
                 {
-                    Location startLoc = WMSHelper.GetEmptyTrayStartLoc(0);
+                    Location startLoc = WMSHelper.GetEmptyTrayStartLoc(0,0);
                     Location endLoc = LocationHelper.GetLoc(loc);
 
                     if (startLoc != null)
@@ -1004,7 +986,7 @@
                                 if(mst.N_B_STATE != 2)
                                 {
                                     // 鍒涘缓涓嬩釜浠诲姟
-                                    if (cst.S_TYPE.Contains("鍑哄簱") && !cst.S_TYPE.Contains("姣嶆嫋")) 
+                                    if (cst.S_TYPE.Contains("鍑哄簱") && !cst.S_TYPE.Contains("姣嶆嫋") && !cst.S_TYPE.Contains("浜哄伐")) 
                                     {
                                         WCSCore.createLastTask(cst.S_END_LOC, mst, 2);
                                     }
@@ -1290,6 +1272,7 @@
         public class CreateOutOrderModel
         {
             public string taskNo { get; set; } // 浠诲姟鍙�+            public string trayCode { get; set; } // 浠诲姟鍙�             public string itemCode { get; set; } // 鐗╂枡缂栫爜
             public string endLoc { get; set; } // 缁堢偣璐т綅
             public int priority { get; set; } = 0; // 浼樺厛绾�榛樿0

--
Gitblit v1.9.1