From 504404beedd006d029bb44fe2290aba649795229 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期日, 01 十二月 2024 19:53:39 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs | 68 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 17 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 c800b4c..23338e8 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"
@@ -276,6 +276,7 @@
Creater = "WMS",
Depth = newLocation.Depth,
CreateDate = DateTime.Now,
+ MaterialType= dt_StockInfo.MaterialType
};
_unitOfWorkManage.BeginTran();
if (newLocation.LocationStatus == LocationStatusEnum.Free.ObjToInt())
@@ -386,20 +387,23 @@
/// 瑙ｆ瀽搴撳瓨
/// </summary>
/// <returns></returns>
- public WebResponseContent Queryinventory2(GenerateInv generate)
+ public WebResponseContent Queryinventory(GenerateInv generate)
{
WebResponseContent content = new WebResponseContent();
try
{
- Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
- if(dt_StockInfo == null)
+
+ string[] targetCodes = generate.PalletCode.Split("*");
+ if (targetCodes.Length == 4)
{
-
- string[] targetCodes = generate.PalletCode.Split("*");
- if(targetCodes.Length == 4)
+ Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.OrderName == targetCodes[0]);
+
+ Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
+ if (dt_Inbound.OrderType == (int)InventoryMaterialType.鍘熸潗鏂�) //0涓哄師鏉愭枡缂栫爜
{
- Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.OrderName == targetCodes[0]);
- 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);
+
+ if (dt_StockInfo == null)
{
Dt_StockInfo dt_Stock = new()
{
@@ -431,10 +435,10 @@
Status = (int)StockStatusEmun.缁勭洏鏆傚瓨,
Creater = "WMS",
CreateDate = DateTime.Now,
+
};
_stockService.StockInfoDetailService.AddData(dt_StockInfoDetail);
_unitOfWorkManage.CommitTran();
- List<Dt_LocationInfo> locationInfos = _basicService.LocationInfoService.Repository.QueryData(x => x.RoadwayNo == "2" && x.LocationStatus== (int)LocationStatusEnum.Free && x.Depth==1);
if (locationInfos.Count < 50)
{
return content = WebResponseContent.Instance.OK(data: 1);
@@ -443,9 +447,33 @@
{
return content = WebResponseContent.Instance.OK(data: 3);
}
+ }
+ else
+ {
+ if (dt_StockInfo.StockStatus == (int)StockStatusEmun.缁勭洏鏆傚瓨)
+ {
+ if (locationInfos.Count < 50)
+ {
+ return content = WebResponseContent.Instance.OK(data: 1);
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.OK(data: 3);
+ }
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.Error($"搴撳瓨宸叉湁璇ユ潯鐮侊紝鏉＄爜淇℃伅锛歿generate.PalletCode}");
+ }
}
- else if (dt_Inbound.OrderType == (int)InventoryMaterialType.鎴愬搧)
+
+
+
+ }
+ else if (dt_Inbound.OrderType == (int)InventoryMaterialType.鎴愬搧)
+ {
+ if(dt_StockInfo==null)
{
Dt_StockInfo dt_Stock = new()
{
@@ -481,18 +509,24 @@
}
else
{
- return content = WebResponseContent.Instance.Error($"鏈壘鍒版潯鐮佽В鏋愶紝鏉＄爜淇℃伅锛歿generate.PalletCode}");
+ if (dt_StockInfo.StockStatus == (int)StockStatusEmun.缁勭洏鏆傚瓨)
+ {
+ return content = WebResponseContent.Instance.OK(data: 1);
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.Error($"搴撳瓨宸叉湁璇ユ潯鐮侊紝鏉＄爜淇℃伅锛歿generate.PalletCode}");
+ }
}
}
else
{
- return content = WebResponseContent.Instance.Error($"瑙ｆ瀽鐨勬墭鐩樻潯鐮侀暱搴︿笉瓒�4,鏉＄爜淇℃伅锛歿generate.PalletCode}");
+ return content = WebResponseContent.Instance.Error($"鏈壘鍒版潯鐮佽В鏋愶紝鏉＄爜淇℃伅锛歿generate.PalletCode}");
}
-
}
else
{
- return content = WebResponseContent.Instance.Error($"宸叉湁搴撳瓨锛屽叆搴撳け璐ワ細{generate.PalletCode}");
+ return content = WebResponseContent.Instance.Error($"瑙ｆ瀽鐨勬墭鐩樻潯鐮侀暱搴︿笉瓒�4,鏉＄爜淇℃伅锛歿generate.PalletCode}");
}
}
catch (Exception ex)
@@ -502,7 +536,7 @@
}
}
- public WebResponseContent Queryinventory(GenerateInv generate)
+ public WebResponseContent Queryinventory2(GenerateInv generate)
{
try
{
@@ -526,9 +560,9 @@
_unitOfWorkManage.BeginTran();
_stockService.StockInfoService.Repository.AddData(dt_Stock);
- string part2 = generate.PalletCode.Substring(2, 8);
+ //string part2 = generate.PalletCode.Substring(2, 8);
- string part3 = generate.PalletCode.Split('#')[1];
+ //string part3 = generate.PalletCode.Split('#')[1];
Dt_StockInfo dt_StockInfo2 = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
Dt_StockInfoDetail dt_StockInfoDetail = new()
{
--
Gitblit v1.9.3