From 19e5b7583a2aa1968c674b4b35f618cc6c2e29ef Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期一, 09 十二月 2024 14:16:30 +0800
Subject: [PATCH] 新增历史信息，页面排序，生产时间
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs | 230 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 131 insertions(+), 99 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 23338e8..229f8f7 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,11 +238,13 @@
CreateDate = DateTime.Now,
MaterialType = (int)InventoryMaterialType.绌烘墭,
Materialweight = 0,
+ Wlstatus = (int)InventoryMaterialStatus.绌烘墭,
+ Mgeneratetime = DateTime.Now,
};
_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;
@@ -252,11 +254,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)
{
@@ -398,60 +421,51 @@
{
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涓哄師鏉愭枡缂栫爜
+ if(dt_Inbound != null)
{
- 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_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();
- 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.缁勭洏鏆傚瓨)
- {
+ 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.寰呮,
+ Mgeneratetime=DateTime.Now,
+ };
+ _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);
@@ -463,66 +477,84 @@
}
else
{
- return content = WebResponseContent.Instance.Error($"搴撳瓨宸叉湁璇ユ潯鐮侊紝鏉＄爜淇℃伅锛歿generate.PalletCode}");
- }
-
- }
-
-
+ 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]),
- };
- _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
+ else if (dt_Inbound.OrderType == (int)InventoryMaterialType.鎴愬搧)
{
- if (dt_StockInfo.StockStatus == (int)StockStatusEmun.缁勭洏鏆傚瓨)
+ 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.寰呮,
+ Mgeneratetime = DateTime.Now,
+ };
+ _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.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($"鏈壘鍒版潯鐮佽В鏋愶紝鏉＄爜淇℃伅锛歿generate.PalletCode}");
}
}
else
{
- return content = WebResponseContent.Instance.Error($"鏈壘鍒版潯鐮佽В鏋愶紝鏉＄爜淇℃伅锛歿generate.PalletCode}");
+ return content = WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟锛屾潯鐮佷俊鎭細{generate.PalletCode}");
}
+
}
else
{
@@ -689,7 +721,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.EmptyCube && x.EnableStatus == (int)EnableStatusEnum.Normal);
if (locationinfoData.Count < 20)
{
return content = WebResponseContent.Instance.OK(data: 1);
--
Gitblit v1.9.3