From 05c2e8aadb518a6323ff9fe23051fdbd56097221 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期日, 08 十二月 2024 19:46:43 +0800
Subject: [PATCH] 文本日志查看
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs"
index ec8fa5a..1afdc5a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs"
@@ -243,7 +243,7 @@
_stockService.StockInfoService.Repository.AddData(dt_Stock);
}
}
- Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
+ Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode && x.StockStatus== (int)StockStatusEmun.缁勭洏鏆傚瓨);
if (dt_StockInfo != null)
{
Dt_LocationInfo newLocation;
@@ -253,11 +253,32 @@
if(dt_StockInfo.MaterialType== (int)InventoryMaterialType.鎴愬搧 || (generate.SourceAddress == "R01-003-041-001-01" && dt_StockInfo.MaterialType == (int)InventoryMaterialType.鍘熸潗鏂�))
{
Locationtype = 11;
+
}else if(dt_StockInfo.MaterialType == (int)InventoryMaterialType.鍘熸潗鏂�)
{
Locationtype = 10;
}
- newLocation = _basicService.LocationInfoService.GetLocation(newSourceAddress.RoadwayNo, Locationtype);
+
+ if (dt_StockInfo.MaterialType == (int)InventoryMaterialType.鎴愬搧)
+ {
+ string[] targetCodes = dt_StockInfo.PalletCode.Split("*");
+ Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.OrderName == targetCodes[0]);
+ if (dt_Inbound.Startingcolumn != 0 || dt_Inbound.Startingcolumn != 0)
+ {
+ newLocation = _basicService.LocationInfoService.GetLocation2(newSourceAddress.RoadwayNo, Locationtype, dt_Inbound.Startingcolumn, dt_Inbound.Startingcolumn);
+ }
+ else
+ {
+ newLocation = _basicService.LocationInfoService.GetLocation(newSourceAddress.RoadwayNo, Locationtype);
+ }
+
+ }
+ else
+ {
+ newLocation = _basicService.LocationInfoService.GetLocation(newSourceAddress.RoadwayNo, Locationtype);
+ }
+
+
//string[] Pallet = PalletCode.Split("-");
if (newLocation != null && newSourceAddress != null)
{
@@ -697,7 +718,7 @@
{
WebResponseContent content = new WebResponseContent();
List<Dt_LocationInfo> locationinfoData = _basicService.LocationInfoService.Repository.QueryData(x => x.RoadwayNo=="2" && x.LocationStatus == LocationStatusEnum.Free.ObjToInt()
- && x.LocationType == (int)LocationTypeEnum.MaterialsCube && x.EnableStatus == (int)EnableStatusEnum.Normal);
+ && x.LocationType == (int)LocationTypeEnum.EmptyCube && x.EnableStatus == (int)EnableStatusEnum.Normal);
if (locationinfoData.Count < 20)
{
return content = WebResponseContent.Instance.OK(data: 1);
--
Gitblit v1.9.3