From 5ea48455463691678b806badbee198699a878b5a Mon Sep 17 00:00:00 2001
From: HuBingJie <3146306518@qq.com>
Date: 星期四, 25 十二月 2025 18:38:58 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs | 21 +++++++++++++++++----
1 files changed, 17 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 267c874..5c31e0b 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"
@@ -102,7 +102,8 @@
WarehouseId = warehouse.WarehouseId,
//PalletType = GetPalletType(warehouse, palletCode),//GetPalletType(warehouse, palletCode)
Creater = "WCS",
- CreateDate = DateTime.Now
+ CreateDate = DateTime.Now,
+ Depth = locationInfo.Depth,
};
_unitOfWorkManage.BeginTran();
@@ -155,15 +156,27 @@
Dt_LocationInfo location = null;
if (palletInfo.locationCode == null || palletInfo.locationCode == "")
{
- location = _basicService.LocationInfoService.GetLocationInfo();//鑾峰彇鍒版柊搴撲綅
+ 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);
+ }
+ else
+ {
+ location = _basicService.LocationInfoService.GetLocationInfoSC2("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_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)
{
@@ -176,7 +189,7 @@
StockStatus = (int)StockStatusEmun.缁勭洏鏆傚瓨,
Creater = "WMS",
CreateDate = DateTime.Now,
- MESsubPalletCode = palletInfo.palletCode,
+ MESsubPalletCode = palletInfo.subPalletCode,
};
Adddtstockt.Add(dt_Stock);
}
--
Gitblit v1.9.3