From e2a5657e3a0b8615bcd78a3149e5ba9ce5579bb8 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期一, 02 十二月 2024 16:25:35 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs | 210 +++++++++++++++++++++++++++++++---------------------
1 files changed, 126 insertions(+), 84 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 2a931fa..ec8fa5a 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"
@@ -238,6 +238,7 @@
CreateDate = DateTime.Now,
MaterialType = (int)InventoryMaterialType.绌烘墭,
Materialweight = 0,
+ Wlstatus = (int)InventoryMaterialStatus.绌烘墭,
};
_stockService.StockInfoService.Repository.AddData(dt_Stock);
}
@@ -276,6 +277,7 @@
Creater = "WMS",
Depth = newLocation.Depth,
CreateDate = DateTime.Now,
+ MaterialType= dt_StockInfo.MaterialType
};
_unitOfWorkManage.BeginTran();
if (newLocation.LocationStatus == LocationStatusEnum.Free.ObjToInt())
@@ -386,98 +388,138 @@
/// 瑙ｆ瀽搴撳瓨
/// </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]);
+
+ if(dt_Inbound != null)
{
- 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_StockInfo dt_Stock = new()
- {
- PalletCode = generate.PalletCode,
- IsFull = true,
- StockStatus = (int)StockStatusEmun.缁勭洏鏆傚瓨,
- Creater = "WMS",
- CreateDate = DateTime.Now,
- MaterialType = (int)InventoryMaterialType.鍘熸潗鏂�,
- Materialweight = decimal.Parse(targetCodes[3]),
- };
- _unitOfWorkManage.BeginTran();
- _stockService.StockInfoService.Repository.AddData(dt_Stock);
- Dt_StockInfo dt_StockInfo2 = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
- string part2 = targetCodes[1].Substring(0, 2); //瑙ｆ瀽鐗╂枡鎵规鎵捐鎯�
- Dt_InboundOrder dt_Int = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.UpperOrderNo == part2);
+ 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);
- Dt_StockInfoDetail dt_StockInfoDetail = new()
+ if (dt_StockInfo == null)
{
- StockId = dt_StockInfo2.Id,
- MaterielCode = dt_Inbound.OrderName, //鐗╂枡鍙�
- MaterielName = dt_Inbound.UpperOrderNo, //鐗╂枡鍚嶇О
- OrderNo = dt_Inbound.OrderNo, //鐗╂枡璇︽儏
- BatchNo = targetCodes[1].ToString(), //鐗╂枡鎵规
- SerialNumber = targetCodes[2].ToString(), //鍖呭彿
- BatchNoName = dt_Int.OrderNo,
- StockQuantity = decimal.Parse(targetCodes[3].ToString()), //閲嶉噺
- OutboundQuantity = 1, //搴忓垪鍙�
- 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)
+ Dt_StockInfo dt_Stock = new()
+ {
+ PalletCode = generate.PalletCode,
+ IsFull = true,
+ StockStatus = (int)StockStatusEmun.缁勭洏鏆傚瓨,
+ Creater = "WMS",
+ CreateDate = DateTime.Now,
+ MaterialType = (int)InventoryMaterialType.鍘熸潗鏂�,
+ Materialweight = decimal.Parse(targetCodes[3]),
+ Wlstatus = (int)InventoryMaterialStatus.寰呮,
+ };
+ _unitOfWorkManage.BeginTran();
+ _stockService.StockInfoService.Repository.AddData(dt_Stock);
+ Dt_StockInfo dt_StockInfo2 = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
+ string part2 = targetCodes[1].Substring(0, 2); //瑙ｆ瀽鐗╂枡鎵规鎵捐鎯�
+ Dt_InboundOrder dt_Int = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.UpperOrderNo == part2);
+
+ Dt_StockInfoDetail dt_StockInfoDetail = new()
+ {
+ StockId = dt_StockInfo2.Id,
+ MaterielCode = dt_Inbound.OrderName, //鐗╂枡鍙�
+ MaterielName = dt_Inbound.UpperOrderNo, //鐗╂枡鍚嶇О
+ OrderNo = dt_Inbound.OrderNo, //鐗╂枡璇︽儏
+ BatchNo = targetCodes[1].ToString(), //鐗╂枡鎵规
+ SerialNumber = targetCodes[2].ToString(), //鍖呭彿
+ BatchNoName = dt_Int.OrderNo,
+ StockQuantity = decimal.Parse(targetCodes[3].ToString()), //閲嶉噺
+ OutboundQuantity = 1, //搴忓垪鍙�
+ Status = (int)StockStatusEmun.缁勭洏鏆傚瓨,
+ Creater = "WMS",
+ CreateDate = DateTime.Now,
+
+ };
+ _stockService.StockInfoDetailService.AddData(dt_StockInfoDetail);
+ _unitOfWorkManage.CommitTran();
+ if (locationInfos.Count < 50)
+ {
+ return content = WebResponseContent.Instance.OK(data: 1);
+ }
+ else
+ {
+ 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.鎴愬搧)
+ {
+ if (dt_StockInfo == null)
+ {
+ Dt_StockInfo dt_Stock = new()
+ {
+ PalletCode = generate.PalletCode,
+ IsFull = true,
+ StockStatus = (int)StockStatusEmun.缁勭洏鏆傚瓨,
+ Creater = "WMS",
+ CreateDate = DateTime.Now,
+ MaterialType = (int)InventoryMaterialType.鎴愬搧,
+ Materialweight = decimal.Parse(targetCodes[3]),
+ Wlstatus = (int)InventoryMaterialStatus.寰呮,
+ };
+ _unitOfWorkManage.BeginTran();
+ _stockService.StockInfoService.Repository.AddData(dt_Stock);
+ Dt_StockInfo dt_StockInfo2 = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
+ Dt_StockInfoDetail dt_StockInfoDetail = new()
+ {
+ StockId = dt_StockInfo2.Id,
+ MaterielCode = dt_Inbound.OrderName, //鐗╂枡鍙�
+ MaterielName = dt_Inbound.UpperOrderNo, //鐗╂枡鍚嶇О
+ OrderNo = dt_Inbound.OrderNo, //鐗╂枡璇︽儏
+ BatchNo = targetCodes[1].ToString(), //鐗╂枡鎵规
+ BatchNoName = "",
+ SerialNumber = targetCodes[2], //鍖呭彿
+ StockQuantity = decimal.Parse(targetCodes[3]), //閲嶉噺
+ OutboundQuantity = 1, //搴忓垪鍙�
+ Status = (int)StockStatusEmun.缁勭洏鏆傚瓨,
+ Creater = "WMS",
+ CreateDate = DateTime.Now,
+ };
+ _stockService.StockInfoDetailService.AddData(dt_StockInfoDetail);
+ _unitOfWorkManage.CommitTran();
return content = WebResponseContent.Instance.OK(data: 1);
}
else
{
- return content = WebResponseContent.Instance.OK(data: 3);
+ if (dt_StockInfo.StockStatus == (int)StockStatusEmun.缁勭洏鏆傚瓨)
+ {
+ return content = WebResponseContent.Instance.OK(data: 1);
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.Error($"搴撳瓨宸叉湁璇ユ潯鐮侊紝鏉＄爜淇℃伅锛歿generate.PalletCode}");
+ }
}
-
- }
- else if (dt_Inbound.OrderType == (int)InventoryMaterialType.鎴愬搧)
- {
- Dt_StockInfo dt_Stock = new()
- {
- PalletCode = generate.PalletCode,
- IsFull = true,
- StockStatus = (int)StockStatusEmun.缁勭洏鏆傚瓨,
- Creater = "WMS",
- CreateDate = DateTime.Now,
- MaterialType = (int)InventoryMaterialType.鎴愬搧,
- Materialweight = decimal.Parse(targetCodes[3]),
- };
- _unitOfWorkManage.BeginTran();
- _stockService.StockInfoService.Repository.AddData(dt_Stock);
- Dt_StockInfo dt_StockInfo2 = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
- Dt_StockInfoDetail dt_StockInfoDetail = new()
- {
- StockId = dt_StockInfo2.Id,
- MaterielCode = dt_Inbound.OrderName, //鐗╂枡鍙�
- MaterielName = dt_Inbound.UpperOrderNo, //鐗╂枡鍚嶇О
- OrderNo = dt_Inbound.OrderNo, //鐗╂枡璇︽儏
- BatchNo = targetCodes[1].ToString(), //鐗╂枡鎵规
- BatchNoName = "",
- SerialNumber = targetCodes[2], //鍖呭彿
- StockQuantity = decimal.Parse(targetCodes[3]), //閲嶉噺
- OutboundQuantity = 1, //搴忓垪鍙�
- Status = (int)StockStatusEmun.缁勭洏鏆傚瓨,
- Creater = "WMS",
- CreateDate = DateTime.Now,
- };
- _stockService.StockInfoDetailService.AddData(dt_StockInfoDetail);
- _unitOfWorkManage.CommitTran();
- return content = WebResponseContent.Instance.OK(data: 1);
}
else
{
@@ -486,13 +528,13 @@
}
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 +544,7 @@
}
}
- public WebResponseContent Queryinventory(GenerateInv generate)
+ public WebResponseContent Queryinventory2(GenerateInv generate)
{
try
{
@@ -526,9 +568,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()
{
@@ -557,7 +599,7 @@
}
else
{
- return content = WebResponseContent.Instance.Error();
+ return content = WebResponseContent.Instance.Error($"搴撳瓨宸叉湁璇ユ潯鐮侊紝鏉＄爜淇℃伅锛歿generate.PalletCode}");
}
}
}
@@ -632,7 +674,7 @@
}
else
{
- return content = WebResponseContent.Instance.Error();
+ return content = WebResponseContent.Instance.Error($"搴撳瓨宸叉湁璇ユ潯鐮侊紝鏉＄爜淇℃伅锛歿generate.PalletCode}");
}
}
@@ -655,7 +697,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.EmptyCube);
+ && x.LocationType == (int)LocationTypeEnum.MaterialsCube && x.EnableStatus == (int)EnableStatusEnum.Normal);
if (locationinfoData.Count < 20)
{
return content = WebResponseContent.Instance.OK(data: 1);
--
Gitblit v1.9.3