From a07e4702be045efa9b04b49a561463875dd28e0a Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期六, 04 一月 2025 16:18:33 +0800
Subject: [PATCH] 更新配置文件和事件总线逻辑，修复任务处理逻辑
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
index b8ee868..3b6a326 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -283,7 +283,7 @@
//task.CurrentAddress = task.NextAddress;
//task.NextAddress = task.TargetAddress;
- _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery,task.TaskNum);
+ _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum);
LogFactory.GetLog("浠诲姟瀹屾垚").Info(true, "鏇存柊搴撳瓨鐘舵�佷笌浠诲姟鐘舵��");
return (location, task);
@@ -359,7 +359,7 @@
try
{
// 鏇存柊璐т綅鍜屽簱瀛樹俊鎭�
- (DtStockInfo updateStock, DtLocationInfo locationInForm, DtLocationInfo locationInfoTo) = UpdateStockLocation(stock, task);
+ (DtStockInfo updateStock, DtLocationInfo locationInForm, DtLocationInfo locationInfoTo) = UpdateStockLocation(stock, task);
var taskHty = CreateHistoricalTask(task);
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "绉诲簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庡簱瀛樻暟鎹細{JsonConvert.SerializeObject(updateStock)}锛屽師鍏堣揣浣嶆暟鎹細{locationInForm}");
@@ -567,7 +567,7 @@
Remark = boxing.BoxingInfoDetails.Count().ToString(),
};
- if (boxing.ProcessCode != "OCVB" || !task.Roadway.Contains("FR"))
+ if (boxing.ProcessCode != "OCVB" && !task.Roadway.Contains("FR"))
{
// 澶勭悊璇锋眰鍙傛暟
AgingInputDto agingInputDto = new AgingInputDto()
@@ -994,17 +994,27 @@
return content.Error(result.MOMMessage);
}
- // 澶勭悊寮傚父鐢佃姱鎯呭喌
- var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList();
- if (serialNosError.Count > 0)
+
+ if (result.SerialNos.Count <= 0)
{
- return await HandleErrorCells(input, area, serialNosError);
+ return await RequestTrayInTaskAsync(input);
}
+ else
+ {
- var boxing = CreateBoxingInfo(result, input.PalletCode);
- if (boxing == null) return content.Error("缁勭洏澶辫触");
- return await ProcessBasedOnProcessCode(boxing, area, input, result);
+ // 澶勭悊寮傚父鐢佃姱鎯呭喌
+ var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList();
+ if (serialNosError.Count > 0)
+ {
+ return await HandleErrorCells(input, area, serialNosError);
+ }
+
+ var boxing = CreateBoxingInfo(result, input.PalletCode);
+ if (boxing == null) return content.Error("缁勭洏澶辫触");
+
+ return await ProcessBasedOnProcessCode(boxing, area, input, result);
+ }
}
catch (Exception err)
{
--
Gitblit v1.9.3