From d58196721475e968769d708d9c14f60dd8d5671f Mon Sep 17 00:00:00 2001
From: HuBingJie <3146306518@qq.com>
Date: 星期四, 13 十一月 2025 22:20:14 +0800
Subject: [PATCH] 1

---
 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs"
index fccbc82..6a611d9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs"
@@ -156,13 +156,23 @@
                         Dt_LocationInfo location = null;
                         if (palletInfo.locationCode == null || palletInfo.locationCode == "")
                         {
-                            location = _basicService.LocationInfoService.GetLocationInfo();//鑾峰彇鍒版柊搴撲綅
+                            if (inboundTask.NodeCode == "1001" || inboundTask.NodeCode == "3001"|| inboundTask.NodeCode == "4001"|| inboundTask.NodeCode == "5001" || inboundTask.NodeCode == "1005")
+                            {
+                                location = _basicService.LocationInfoService.GetLocationInfoSC("SC01");//鑾峰彇鍒版柊搴撲綅
+                            }else if (inboundTask.NodeCode == "2011")
+                            {
+                                location = _locationInfoRepository.QueryFirst(x => x.LocationStatus == (int)LocationStatusEnum.Free && x.EnableStatus == (int)EnableStatusEnum.Normal && x.Column > 1 && x.Layer > 6);
+                            }
+                            else
+                            {
+                                location = _basicService.LocationInfoService.GetLocationInfoSC("SC02");//鑾峰彇鍒版柊搴撲綅
+                            }
                         }
                         else
                         {
                             location = _locationInfoRepository.QueryFirst(x => x.LocationCode == palletInfo.locationCode);
                         }
-                        if (location == null) return MESresponse($"鏈壘鍒拌揣浣嶄俊鎭�,鏉$爜锛歿palletInfo.palletCode}", false);
+                        if (location == null) return MESresponse($"鏈壘鍒拌揣浣嶄俊鎭�,鏉$爜锛歿palletInfo.palletCode}", false,0);
                         if (location.LocationStatus != (int)LocationStatusEnum.Free) return MESresponse($"鎵樼洏鏉$爜锛歿palletInfo.palletCode}锛屾煡鎵惧埌鐨勮揣浣嶏細{location.LocationCode},涓嶄负绌鸿揣浣嶏紒", false);
 
                         Dt_StockInfo dt_ = Stockdata.Where(x => x.PalletCode == palletInfo.palletCode).FirstOrDefault();
@@ -177,7 +187,7 @@
                                 StockStatus = (int)StockStatusEmun.缁勭洏鏆傚瓨,
                                 Creater = "WMS",
                                 CreateDate = DateTime.Now,
-                                MESsubPalletCode = palletInfo.palletCode,
+                                MESsubPalletCode = palletInfo.subPalletCode,
                             };
                             Adddtstockt.Add(dt_Stock);
                         }

--
Gitblit v1.9.3