From a3dfe45b801f14a574caf27effaed58f1dc3a763 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期二, 19 十一月 2024 23:42:39 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs | 254 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 252 insertions(+), 2 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 0707b08..cf2e57e 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"
@@ -224,7 +224,7 @@
else
{
- if ((generate.SourceAddress == "R01-003-041-011-01" || generate.SourceAddress == "R02-003-027-011-01" || generate.SourceAddress == "R02-003-043-011-01"))
+ if ((generate.SourceAddress == "R01-003-041-011-01" || generate.SourceAddress == "R01-002-043-001-01" || generate.SourceAddress == "R02-003-043-011-01"))
{
Dt_StockInfo dt_StockInfo2 = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
if(dt_StockInfo2 == null)
@@ -307,7 +307,7 @@
/// 鏌ヨ1宸烽亾搴撳瓨锛屾槸鍚﹁繍琛岃繘琛屽叆搴� //甯﹀悗缁噸鏂版嫾鎺�
/// </summary>
/// <returns></returns>
- public WebResponseContent Queryinventory(GenerateInv generate)
+ public WebResponseContent Queryinventory3(GenerateInv generate)
{
try
{
@@ -373,5 +373,255 @@
throw;
}
}
+
+ /// <summary>
+ /// 瑙ｆ瀽搴撳瓨
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent Queryinventory2(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)
+ {
+ Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.UpperOrderNo == targetCodes[0]);
+ if (dt_Inbound.OrderType == (int)OrderTypeEmun.鍘熸潗鏂�) //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(2, 8); //瑙ｆ瀽鐗╂枡鎵规鎵捐鎯�
+ Dt_InboundOrder dt_Int = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.UpperOrderNo == part2);
+
+ Dt_StockInfoDetail dt_StockInfoDetail = new()
+ {
+ StockId = dt_StockInfo2.Id,
+ MaterielCode = dt_Inbound.UpperOrderNo, //鐗╂枡鍙�
+ MaterielName = dt_Inbound.OrderName, //鐗╂枡鍚嶇О
+ OrderNo = dt_Inbound.OrderNo, //鐗╂枡璇︽儏
+ BatchNo = targetCodes[1], //鐗╂枡鎵规
+ BatchNoName = dt_Int.OrderNo,
+ 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();
+ 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);
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.OK(data: 3);
+ }
+
+ }
+ else if (dt_Inbound.OrderType == (int)OrderTypeEmun.鎴愬搧鏂�)
+ {
+ 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.UpperOrderNo, //鐗╂枡鍙�
+ MaterielName = dt_Inbound.OrderName, //鐗╂枡鍚嶇О
+ OrderNo = dt_Inbound.OrderNo, //鐗╂枡璇︽儏
+ BatchNo = targetCodes[1], //鐗╂枡鎵规
+ 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}");
+ }
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.Error($"瑙ｆ瀽鐨勬墭鐩樻潯鐮侀暱搴︿笉瓒�4,鏉＄爜淇℃伅锛歿generate.PalletCode}");
+ }
+
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.Error($"宸叉湁搴撳瓨锛屽叆搴撳け璐ワ細{generate.PalletCode}");
+ }
+ }
+ catch (Exception ex)
+ {
+ return content=WebResponseContent.Instance.Error($"绯荤粺宸烽亾鍏ュ簱鎺ュ彛瑙ｆ瀽閿欒锛氶敊璇細{ex.Message}");
+ throw;
+ }
+ }
+
+ public WebResponseContent Queryinventory(GenerateInv generate)
+ {
+ try
+ {
+ WebResponseContent content = new WebResponseContent();
+ string result = generate.PalletCode.Substring(0, 2);
+ if (result == "B-")
+ {
+ Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
+ 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 = 0,
+ };
+ _unitOfWorkManage.BeginTran();
+ _stockService.StockInfoService.Repository.AddData(dt_Stock);
+
+ string part2 = generate.PalletCode.Substring(2, 8);
+
+ string part3 = generate.PalletCode.Split('#')[1];
+ Dt_StockInfo dt_StockInfo2 = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
+ Dt_StockInfoDetail dt_StockInfoDetail = new()
+ {
+ StockId = dt_StockInfo2.Id,
+ MaterielCode = dt_StockInfo2.PalletCode, //鐗╂枡缂栧彿
+ MaterielName = dt_StockInfo2.PalletCode, //鏉愯川
+ OrderNo = dt_StockInfo2.PalletCode, //鍗曟嵁锛堟墭鐩樻潯鐮侊級
+ BatchNo = dt_StockInfo2.PalletCode, //鎵规鍙�
+ SerialNumber = dt_StockInfo2.PalletCode, //搴忓垪鍙�
+ StockQuantity = 1, //搴忓垪鍙�
+ 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
+ {
+ if(dt_StockInfo.StockStatus== (int)StockStatusEmun.缁勭洏鏆傚瓨)
+ {
+ return content = WebResponseContent.Instance.OK(data:1);
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.Error();
+ }
+ }
+ }
+ else
+ {
+ Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.UpperOrderNo == result);
+ Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
+ if (dt_Inbound != null)
+ {
+ 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 = 0,
+ };
+ _unitOfWorkManage.BeginTran();
+ _stockService.StockInfoService.Repository.AddData(dt_Stock);
+
+ string part2 = generate.PalletCode.Substring(2, 8);
+
+ string part3 = generate.PalletCode.Split('#')[1];
+ Dt_StockInfo dt_StockInfo2 = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
+ Dt_StockInfoDetail dt_StockInfoDetail = new()
+ {
+ StockId = dt_StockInfo2.Id,
+ MaterielCode = result, //鐗╂枡缂栧彿
+ MaterielName = dt_Inbound.OrderNo, //鏉愯川
+ OrderNo = generate.PalletCode, //鍗曟嵁锛堟墭鐩樻潯鐮侊級
+ BatchNo = part2, //鎵规鍙�
+ SerialNumber = part3, //搴忓垪鍙�
+ StockQuantity = 1, //搴忓垪鍙�
+ OutboundQuantity = 1, //搴忓垪鍙�
+ Status = (int)StockStatusEmun.缁勭洏鏆傚瓨,
+ Creater = "WMS",
+ CreateDate = DateTime.Now,
+ };
+ _stockService.StockInfoDetailService.AddData(dt_StockInfoDetail);
+
+ _unitOfWorkManage.CommitTran();
+ return content = WebResponseContent.Instance.OK(data: 3);
+ }
+ else
+ {
+ if (dt_StockInfo.StockStatus == (int)StockStatusEmun.缁勭洏鏆傚瓨)
+ {
+ return content = WebResponseContent.Instance.OK(data: 3);
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.Error();
+ }
+ }
+
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.Error("鏈壘鍒拌绫诲瀷鐨勮В鏋�");
+ }
+
+ }
+ }
+ catch (Exception ex)
+ {
+
+ throw;
+ }
+ }
}
}
--
Gitblit v1.9.3