From 1d8897348d578648421b024d0dc5ff3d626e05f9 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期四, 19 六月 2025 16:48:07 +0800
Subject: [PATCH] 最新
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs | 109 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 99 insertions(+), 10 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 ec8fa5a..848a862 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"
@@ -12,6 +12,7 @@
using MailKit.Search;
using System.Reflection.Metadata;
using static WIDESEA_ITaskInfoService.ITaskService;
+using WIDESEA_Common.Log;
namespace WIDESEA_TaskInfoService
{
@@ -239,11 +240,12 @@
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;
@@ -253,11 +255,81 @@
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);
+
+
+
+
+ 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);
+ }
+
+
+ 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)
+ {
+ return WebResponseContent.Instance.Error($"鏃犳硶鎵惧埌鍙敤搴撲綅锛堝凡灏濊瘯 {retryCount} 娆★級");
+ }
+
+
+
//string[] Pallet = PalletCode.Split("-");
if (newLocation != null && newSourceAddress != null)
{
@@ -284,8 +356,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();
@@ -308,6 +385,7 @@
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
return content = WebResponseContent.Instance.Error($"鐢熸垚鍏ュ簱浠诲姟鍑洪敊锛屽嚭閿欎俊鎭�:{ex.Message}");
throw;
}
@@ -384,6 +462,8 @@
}
}
+
+ public static List<int> InventoryCode = new List<int>() { 0,1,2,4,5,6}; //0:寰呮 1锛氬悎鏍� 2锛氫笉鍚堟牸 4锛氶��璐� 5锛氳繑宸� 6锛氱壒閲�
/// <summary>
/// 瑙ｆ瀽搴撳瓨
/// </summary>
@@ -395,13 +475,20 @@
{
string[] targetCodes = generate.PalletCode.Split("*");
- if (targetCodes.Length == 4)
+ if (targetCodes.Length == 5)
{
Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.OrderName == targetCodes[0]);
- if(dt_Inbound != null)
+ bool isContained = InventoryCode.Contains(int.Parse(targetCodes[4]));
+ if(!isContained)
{
- Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
+ return content = WebResponseContent.Instance.Error($"绗簲浣嶇墿鏂欑姸鎬佺紪鐮佽В鏋愰敊璇細{generate.PalletCode}");
+ }
+
+ if (dt_Inbound != null)
+ {
+ string PalletCodetarget = string.Join("*", targetCodes.Take(3));
+ Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode.Contains(PalletCodetarget));
if (dt_Inbound.OrderType == (int)InventoryMaterialType.鍘熸潗鏂�) //0涓哄師鏉愭枡缂栫爜
{
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);
@@ -417,7 +504,8 @@
CreateDate = DateTime.Now,
MaterialType = (int)InventoryMaterialType.鍘熸潗鏂�,
Materialweight = decimal.Parse(targetCodes[3]),
- Wlstatus = (int)InventoryMaterialStatus.寰呮,
+ Wlstatus = int.Parse(targetCodes[4]),
+ Mgeneratetime=DateTime.Now,
};
_unitOfWorkManage.BeginTran();
_stockService.StockInfoService.Repository.AddData(dt_Stock);
@@ -485,7 +573,8 @@
CreateDate = DateTime.Now,
MaterialType = (int)InventoryMaterialType.鎴愬搧,
Materialweight = decimal.Parse(targetCodes[3]),
- Wlstatus = (int)InventoryMaterialStatus.寰呮,
+ Wlstatus = int.Parse(targetCodes[4]),
+ Mgeneratetime = DateTime.Now,
};
_unitOfWorkManage.BeginTran();
_stockService.StockInfoService.Repository.AddData(dt_Stock);
@@ -539,7 +628,7 @@
}
catch (Exception ex)
{
- return content=WebResponseContent.Instance.Error($"绯荤粺宸烽亾鍏ュ簱鎺ュ彛瑙ｆ瀽閿欒锛氶敊璇細{ex.Message}");
+ return content=WebResponseContent.Instance.Error($"鎵樼洏鏉＄爜閿欒锛屽鑷寸郴缁熼敊璇細{ex.Message}");
throw;
}
}
@@ -697,7 +786,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.MaterialsCube && x.EnableStatus == (int)EnableStatusEnum.Normal);
+ && 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