From c1eac732fc3ef407d51b76d288f311d2fa43e618 Mon Sep 17 00:00:00 2001
From: xby-y <2251528873@qq.com>
Date: 星期一, 12 一月 2026 15:18:41 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 6a611d9..1934b1a 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,16 +156,16 @@
Dt_LocationInfo location = null;
if (palletInfo.locationCode == null || palletInfo.locationCode == "")
{
- if (inboundTask.NodeCode == "1001" || inboundTask.NodeCode == "3001"|| inboundTask.NodeCode == "4001"|| inboundTask.NodeCode == "5001" || inboundTask.NodeCode == "1005")
+ if (inboundTask.NodeCode == "1001" || inboundTask.NodeCode == "1005" || 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);
+ location = _locationInfoRepository.QueryFirst(x => x.LocationStatus == (int)LocationStatusEnum.Free && x.EnableStatus == (int)EnableStatusEnum.Normal);
}
else
{
- location = _basicService.LocationInfoService.GetLocationInfoSC("SC02");//鑾峰彇鍒版柊搴撲綅
+ location = _basicService.LocationInfoService.GetLocationInfoSC2("SC02");//鑾峰彇鍒版柊搴撲綅
}
}
else
@@ -175,6 +175,8 @@
if (location == null) return MESresponse($"鏈壘鍒拌揣浣嶄俊鎭�,鏉＄爜锛歿palletInfo.palletCode}", false,0);
if (location.LocationStatus != (int)LocationStatusEnum.Free) return MESresponse($"鎵樼洏鏉＄爜锛歿palletInfo.palletCode}锛屾煡鎵惧埌鐨勮揣浣嶏細{location.LocationCode},涓嶄负绌鸿揣浣嶏紒", false);
+ Dt_Task dt_task = BaseDal.QueryFirst(x=>x.PalletCode == palletInfo.palletCode);
+ if (dt_task != null) { return MESresponse($"姝ゆ墭鐩樻潯鐮佸凡鏈変换鍔�,鏉＄爜锛歿palletInfo.palletCode}", false, 0); };
Dt_StockInfo dt_ = Stockdata.Where(x => x.PalletCode == palletInfo.palletCode).FirstOrDefault();
if (dt_ == null)
{
@@ -195,7 +197,7 @@
{
if(dt_.StockStatus == (int)StockStatusEmun.宸插叆搴�)
{
- return MESresponse($"璇ュ簱瀛樻潯鐮佸凡鍏ュ簱锛屼笉鍙噸澶嶅叆搴�,鏉＄爜锛歿palletInfo.palletCode}", false);
+ return MESresponse($"璇ュ簱瀛樻潯鐮佸凡鍏ュ簱锛屼笉鍙噸澶嶅叆搴�,鏉＄爜锛歿palletInfo.palletCode}", false,0);
}
}
--
Gitblit v1.9.3