From f49fa4b5027cfdc27b429985d023e8002abcca2e Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期三, 05 十一月 2025 23:54:12 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs | 106 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 89 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 bad0925..ed18293 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"
@@ -245,6 +245,17 @@
_stockService.StockInfoService.Repository.AddData(dt_Stock);
}
}
+ /*else if(generate.SourceAddress == "R01-002-042-001-01")
+ {
+ WebResponseContent webResponse= Queryinventory(generate);
+ if (!webResponse.Status)
+ {
+ return content = WebResponseContent.Instance.Error($"缁勭洏澶辫触锛歿webResponse.Message}");
+ }
+ }*/
+
+
+
Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode && x.StockStatus== (int)StockStatusEmun.缁勭洏鏆傚瓨);
if (dt_StockInfo != null)
{
@@ -261,30 +272,76 @@
Locationtype = 10;
}
- 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.Terminationcolumn != 0)
- {
- newLocation = _basicService.LocationInfoService.GetLocation2(newSourceAddress.RoadwayNo, Locationtype, dt_Inbound.Startingcolumn, dt_Inbound.Terminationcolumn);
+
- WriteLog.GetLog("搴撲綅鑾峰彇鏃ュ織锛孏etLocation").Write($"鍘熸潗鏂欏叆搴撹幏鍙栧簱浣嶏紝浼犲叆鍊�,RoadwayNo:{newSourceAddress.RoadwayNo},绫诲瀷锛歿Locationtype}锛屽尯闂翠负锛歿dt_Inbound.Startingcolumn}涓巤dt_Inbound.Terminationcolumn}=============鑾峰彇鍒扮殑搴撲綅涓猴細{newLocation.LocationCode}", $"搴撲綅鑾峰彇鏃ュ織锛孏etLocation2");
+
+ int maxRetries = 20;
+ int retryCount = 0;
+ bool needRetry;
+
+ do
+ {
+ needRetry = false; // 榛樿涓嶉渶瑕侀噸璇�
+ retryCount++;
+
+
+ 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.Terminationcolumn != 0)
+ {
+ newLocation = _basicService.LocationInfoService.GetLocation2(newSourceAddress.RoadwayNo, Locationtype, dt_Inbound.Startingcolumn, dt_Inbound.Terminationcolumn);
+ }
+ else
+ {
+ newLocation = _basicService.LocationInfoService.GetLocation(newSourceAddress.RoadwayNo, Locationtype);
+ }
+
}
else
{
newLocation = _basicService.LocationInfoService.GetLocation(newSourceAddress.RoadwayNo, Locationtype);
- WriteLog.GetLog("搴撲綅鑾峰彇鏃ュ織锛孏etLocation").Write($"鍘熸潗鏂欏叆搴撹幏鍙栧簱浣嶏紝浼犲叆鍊�,RoadwayNo:{newSourceAddress.RoadwayNo},绫诲瀷锛歿Locationtype}锛�=============鑾峰彇鍒扮殑搴撲綅涓猴細{newLocation.LocationCode}", $"搴撲綅鑾峰彇鏃ュ織锛孏etLocation,鎴愬搧鎺ュ彛閲岄潰");
+
}
-
- }
- else
+
+
+ if (newLocation == null)
+ {
+ return WebResponseContent.Instance.Error("鏃犳硶鑾峰彇搴撲綅");
+ }
+
+ // 2. 妫�鏌ュ簱瀛�
+ if (_stockService.StockInfoService.Repository.QueryFirst(x => x.LocationCode == newLocation.LocationCode) !=null)
+ {
+ needRetry = true;
+ continue; // 鐩存帴杩涘叆涓嬩竴娆″惊鐜紙閲嶈瘯锛�
+ }
+
+ // 3. 妫�鏌ヤ换鍔�
+ if (BaseDal.QueryFirst(x => x.TargetAddress == newLocation.LocationCode) != null)
+ {
+ needRetry = true;
+ continue;
+ }
+
+ // 4. 妫�鏌ュ巻鍙蹭换鍔�
+ if (_taskHtyService.CrueeTaskHty(newLocation.LocationCode))
+ {
+ needRetry = true;
+ continue;
+ }
+
+ } while (needRetry && retryCount < maxRetries);
+
+ // 妫�鏌ユ槸鍚﹁秴杩囨渶澶ч噸璇曟鏁�
+ if (retryCount >= maxRetries)
{
- newLocation = _basicService.LocationInfoService.GetLocation(newSourceAddress.RoadwayNo, Locationtype);
- WriteLog.GetLog("搴撲綅鑾峰彇鏃ュ織锛孏etLocation").Write($"鍘熸潗鏂欏叆搴撹幏鍙栧簱浣嶏紝浼犲叆鍊�,RoadwayNo:{newSourceAddress.RoadwayNo},绫诲瀷锛歿Locationtype}锛�=============鑾峰彇鍒扮殑搴撲綅涓猴細{newLocation.LocationCode}", $"搴撲綅鑾峰彇鏃ュ織锛孏etLocation");
+ return WebResponseContent.Instance.Error($"鏃犳硶鎵惧埌鍙敤搴撲綅锛堝凡灏濊瘯 {retryCount} 娆★級");
}
-
+
+
//string[] Pallet = PalletCode.Split("-");
if (newLocation != null && newSourceAddress != null)
{
@@ -311,8 +368,13 @@
{
newLocation.LocationStatus = newSourceAddress.LocationType == (int)LocationTypeEnum.EmptyOut ? LocationStatusEnum.PalletLock.ObjToInt() : LocationStatusEnum.Lock.ObjToInt();
}
- BaseDal.AddData(dt_Task);
+ else
+ {
+ return content = WebResponseContent.Instance.Error($"璇ュ簱浣峽newSourceAddress.LocationCode}鐨勮揣浣嶇姸鎬佸紓甯革紝涓嶅彲閫�");
+ }
_basicService.LocationInfoService.UpdateData(newLocation);
+ BaseDal.AddData(dt_Task);
+
_unitOfWorkManage.CommitTran();
@@ -335,6 +397,7 @@
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
return content = WebResponseContent.Instance.Error($"鐢熸垚鍏ュ簱浠诲姟鍑洪敊锛屽嚭閿欎俊鎭�:{ex.Message}");
throw;
}
@@ -551,7 +614,16 @@
{
if (dt_StockInfo.StockStatus == (int)StockStatusEmun.缁勭洏鏆傚瓨)
{
- return content = WebResponseContent.Instance.OK(data: 1);
+ List<Dt_Task> dt_Tasks= BaseDal.QueryData(x => x.PalletCode.Contains(PalletCodetarget));
+ if (dt_Tasks.Count > 0)
+ {
+ return content = WebResponseContent.Instance.Error($"搴撳瓨宸叉湁璇ユ潯鐮侊紝鏉＄爜淇℃伅锛歿generate.PalletCode}");
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.OK(data: 1);
+ }
+
}
else
{
--
Gitblit v1.9.3