From 96a77e69b0577c50adfaacd5fd8b89009242d3bd Mon Sep 17 00:00:00 2001
From: Admin <Admin@ADMIN>
Date: 星期日, 07 十二月 2025 18:25:00 +0800
Subject: [PATCH] 更新
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 160 insertions(+), 20 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..2280285 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;
}
@@ -422,6 +485,7 @@
WebResponseContent content = new WebResponseContent();
try
{
+
string[] targetCodes = generate.PalletCode.Split("*");
if (targetCodes.Length == 5)
@@ -433,6 +497,16 @@
{
return content = WebResponseContent.Instance.Error($"绗簲浣嶇墿鏂欑姸鎬佺紪鐮佽В鏋愰敊璇細{generate.PalletCode}");
}
+
+ int xzrktype = 1;
+ if(dt_Inbound.OrderType == (int)InventoryMaterialType.鎴愬搧)
+ {
+ xzrktype = 2;
+ }
+
+ WebResponseContent webResponsePD = QueryinveCount(xzrktype);
+ if (!webResponsePD.Status) { return webResponsePD; }
+
if (dt_Inbound != null)
{
@@ -551,7 +625,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
{
@@ -735,15 +818,72 @@
{
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.EnableStatus == (int)EnableStatusEnum.Normal);
- if (locationinfoData.Count < 20)
+ && x.LocationType == (int)LocationTypeEnum.EmptyCube && x.EnableStatus == (int)EnableStatusEnum.Normal && x.Layer > 10);
+ if (locationinfoData.Count <= 15)
{
- return content = WebResponseContent.Instance.OK(data: 1);
+ List<Dt_LocationInfo> locationinfoDataSC1 = _basicService.LocationInfoService.Repository.QueryData(x => x.RoadwayNo == "1" && x.LocationStatus == LocationStatusEnum.Free.ObjToInt()
+ && x.LocationType == (int)LocationTypeEnum.EmptyCube && x.EnableStatus == (int)EnableStatusEnum.Normal && x.Layer > 9);
+ if (locationinfoDataSC1.Count >= 15)
+ {
+ return content = WebResponseContent.Instance.OK(data: 1);
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.Error("1宸烽亾绌烘墭鍏ュ簱澶辫触锛氾細鍏ュ簱澶辫触锛屽綋鍓嶄笉鍙叆搴擄紝娴呰揣浣嶅皬浜�15锛屼笉鍙啀杩涜鍏ュ簱");
+ }
+
}
else
{
return content = WebResponseContent.Instance.OK(data: 3);
}
}
+
+ public WebResponseContent QueryinveCount(int wltype)
+ {
+ WebResponseContent content = new WebResponseContent();
+ if (wltype == 1)
+ {
+
+ List<Dt_LocationInfo> locationinfoData = _basicService.LocationInfoService.Repository.QueryData(x => x.RoadwayNo == "2" && x.LocationStatus == LocationStatusEnum.Free.ObjToInt()
+ && x.LocationType == (int)LocationTypeEnum.MaterialsCube && x.EnableStatus == (int)EnableStatusEnum.Normal && x.Layer <= 10);
+ if (locationinfoData.Count <= 20)
+ {
+ List<Dt_LocationInfo> locationinfoDataSC1 = _basicService.LocationInfoService.Repository.QueryData(x => x.RoadwayNo == "1" && x.LocationStatus == LocationStatusEnum.Free.ObjToInt()
+ && x.EnableStatus == (int)EnableStatusEnum.Normal && x.Layer <= 9);
+ if (locationinfoDataSC1.Count >= 20)
+ {
+ return content = WebResponseContent.Instance.OK(data: 1);
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.Error("1宸烽亾锛氾細鍏ュ簱澶辫触锛屽綋鍓嶄笉鍙叆搴擄紝娴呰揣浣嶅皬浜�20锛屼笉鍙啀杩涜鍏ュ簱");
+ }
+
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.OK(data: 3);
+ }
+
+ }
+ else
+ {
+ List<Dt_LocationInfo> locationinfoDataSC1 = _basicService.LocationInfoService.Repository.QueryData(x => x.RoadwayNo == "1" && x.LocationStatus == LocationStatusEnum.Free.ObjToInt()
+ && x.EnableStatus == (int)EnableStatusEnum.Normal && x.Layer <= 9);
+ if (locationinfoDataSC1.Count >= 20)
+ {
+ return content = WebResponseContent.Instance.OK(data: 1);
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.Error("1宸烽亾锛氾細鍏ュ簱澶辫触锛屽綋鍓嶄笉鍙叆搴擄紝娴呰揣浣嶅皬浜�20锛屼笉鍙啀杩涜鍏ュ簱");
+ }
+
+
+ }
+
+
+ }
}
}
--
Gitblit v1.9.3