From 3163fec4985ebc87ea859087cdedacad749096d9 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期五, 28 二月 2025 19:15:39 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 1afdc5a..ea5d173 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"
@@ -239,6 +239,7 @@
MaterialType = (int)InventoryMaterialType.绌烘墭,
Materialweight = 0,
Wlstatus = (int)InventoryMaterialStatus.绌烘墭,
+ Mgeneratetime = DateTime.Now,
};
_stockService.StockInfoService.Repository.AddData(dt_Stock);
}
@@ -263,9 +264,9 @@
{
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)
+ if (dt_Inbound.Startingcolumn != 0 || dt_Inbound.Terminationcolumn != 0)
{
- newLocation = _basicService.LocationInfoService.GetLocation2(newSourceAddress.RoadwayNo, Locationtype, dt_Inbound.Startingcolumn, dt_Inbound.Startingcolumn);
+ newLocation = _basicService.LocationInfoService.GetLocation2(newSourceAddress.RoadwayNo, Locationtype, dt_Inbound.Startingcolumn, dt_Inbound.Terminationcolumn);
}
else
{
@@ -422,7 +423,8 @@
if(dt_Inbound != null)
{
- Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
+ string PalletCodetarget = string.Join("*", targetCodes.Take(3));
+ Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode.Contains(PalletCodetarget));
if (dt_Inbound.OrderType == (int)InventoryMaterialType.鍘熸潗鏂�) //0涓哄師鏉愭枡缂栫爜
{
List<Dt_LocationInfo> locationInfos = _basicService.LocationInfoService.Repository.QueryData(x => x.RoadwayNo == "2" && x.LocationStatus == (int)LocationStatusEnum.Free && x.Depth == 1 && x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationType == (int)LocationTypeEnum.MaterialsCube);
@@ -439,6 +441,7 @@
MaterialType = (int)InventoryMaterialType.鍘熸潗鏂�,
Materialweight = decimal.Parse(targetCodes[3]),
Wlstatus = (int)InventoryMaterialStatus.寰呮,
+ Mgeneratetime=DateTime.Now,
};
_unitOfWorkManage.BeginTran();
_stockService.StockInfoService.Repository.AddData(dt_Stock);
@@ -507,6 +510,7 @@
MaterialType = (int)InventoryMaterialType.鎴愬搧,
Materialweight = decimal.Parse(targetCodes[3]),
Wlstatus = (int)InventoryMaterialStatus.寰呮,
+ Mgeneratetime = DateTime.Now,
};
_unitOfWorkManage.BeginTran();
_stockService.StockInfoService.Repository.AddData(dt_Stock);
@@ -560,7 +564,7 @@
}
catch (Exception ex)
{
- return content=WebResponseContent.Instance.Error($"绯荤粺宸烽亾鍏ュ簱鎺ュ彛瑙ｆ瀽閿欒锛氶敊璇細{ex.Message}");
+ return content=WebResponseContent.Instance.Error($"鎵樼洏鏉＄爜閿欒锛屽鑷寸郴缁熼敊璇細{ex.Message}");
throw;
}
}
--
Gitblit v1.9.3