From 4f39dcc195f28fa275fc2d065fbf1bf6a46c21b7 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 17 六月 2025 00:41:18 +0800
Subject: [PATCH] 优化出入库逻辑
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
index e21b334..1658b2f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
@@ -42,12 +42,12 @@
Dt_Task task = new()
{
CurrentAddress = stockInfo.LocationCode,
- Grade = 2,
+ Grade = 3,
PalletCode = stockInfo.PalletCode,
NextAddress = roadwayInfo.OutSCStationCode,
Roadway = locationInfo.RoadwayNo,
SourceAddress = stockInfo.LocationCode,
- TargetAddress = roadwayInfo.OutStationCode,
+ TargetAddress = roadwayInfo.OutSCStationCode,
TaskStatus = OutTaskStatusEnum.OutNew.ObjToInt(),
TaskType = TaskTypeEnum.Outbound.ObjToInt(),
Depth = locationInfo.Depth,
@@ -74,12 +74,12 @@
if (outboundOrderDetail == null)
{
- throw new Exception("鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
+ throw new Exception("鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅!");
}
if (stockSelectViews.Sum(x => x.UseableQuantity) > outboundOrderDetail.OrderQuantity - outboundOrderDetail.LockQuantity)
{
- throw new Exception("閫夋嫨鏁伴噺瓒呭嚭鍗曟嵁鏁伴噺");
+ throw new Exception("閫夋嫨鏁伴噺瓒呭嚭鍗曟嵁鏁伴噺!");
}
List<Dt_StockInfo>? stockInfos = null;
Dt_OutboundOrderDetail? orderDetail = null;
@@ -104,12 +104,12 @@
}
else
{
- throw new Exception("鏃犲簱瀛�");
+ throw new Exception("鏃犲簱瀛�!");
}
}
else
{
- List<Dt_OutStockLockInfo> stockLockInfos = _outboundService.OutboundStockLockInfoService.GetByOrderDetailId(outboundOrderDetail.OrderId);
+ List<Dt_OutStockLockInfo> stockLockInfos = _outboundService.OutboundStockLockInfoService.GetByOrderDetailId(outboundOrderDetail.Id);
if (stockLockInfos != null && stockLockInfos.Count > 0)
{
List<Dt_StockInfo> stocks = _stockService.StockInfoService.Repository.GetStockInfosByPalletCodes(stockLockInfos.Select(x => x.PalletCode).Distinct().ToList());
@@ -138,7 +138,7 @@
}
catch (Exception ex)
{
- return WebResponseContent.Instance.Error(ex.Message);
+ return WebResponseContent.Instance.Error($"{ex.Message}");
}
}
@@ -162,11 +162,11 @@
{
AddData(result.Item1);
var response = HttpHelper.Post<WebResponseContent>(url + "ReceiveTask/", result.Item1, "鍑哄簱浠诲姟涓嬪彂");
- if (!response.Status)
- {
- _unitOfWorkManage.RollbackTran();
- return content = WebResponseContent.Instance.Error($"{response.Message}");
- }
+ //if (!response.Status)
+ //{
+ // _unitOfWorkManage.RollbackTran();
+ // return content = WebResponseContent.Instance.Error($"{response.Message}");
+ //}
}
if(result.Item2 != null&&result.Item2.Count>0)
{
@@ -180,11 +180,11 @@
}
AddData(result.Item2);
var response = HttpHelper.Post<WebResponseContent>(url + "ReceiveTask/", result.Item2, "鍑哄簱浠诲姟涓嬪彂");
- if (!response.Status)
- {
- _unitOfWorkManage.RollbackTran();
- return content = WebResponseContent.Instance.Error($"{response.Message}");
- }
+ //if (!response.Status)
+ //{
+ // _unitOfWorkManage.RollbackTran();
+ // return content = WebResponseContent.Instance.Error($"{response.Message}");
+ //}
}
@@ -274,7 +274,7 @@
if (sum == 0)
{
Dt_Task relocariontask = RelocationTask(result);
- task[i].Grade=1;
+ task[i].Grade=2;
relocationList.Add(relocariontask);
relocationList.Add(task[i]);
}
@@ -352,7 +352,7 @@
Roadway = location.RoadwayNo,
SourceAddress = location.LocationCode,
TargetAddress = locationInfos.LocationCode,
- TaskStatus = InTaskStatusEnum.RelocationNew.ObjToInt(),
+ TaskStatus = RelocationTaskStatusEnum.RelocationNew.ObjToInt(),
TaskType = TaskTypeEnum.Relocation.ObjToInt(),
Depth= location.Depth,
TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum))
@@ -454,10 +454,11 @@
{
return WebResponseContent.Instance.Error("鏈壘鍒扮粓鐐瑰贩閬撲俊鎭�");
}
+ List<Dt_Task> tasks = new List<Dt_Task>();
Dt_Task task = new Dt_Task()
{
CurrentAddress = stockInfo.LocationCode,
- Grade = 0,
+ Grade = 1,
NextAddress = endStation,
PalletCode = stockInfo.PalletCode,
Roadway = roadwayNo,
@@ -472,11 +473,14 @@
_unitOfWorkManage.BeginTran();
stockInfo.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
- List<Dt_Task> tasks=new List<Dt_Task>();
tasks.Add(task);
(List<Dt_Task>?, List<Dt_Task>?) result = RelocationTasks(tasks.OrderBy(x => x.Depth).ToList());
if (result.Item1 != null && result.Item1.Count > 0)
{
+ for (int i = 0; i < result.Item1.Count; i++)
+ {
+ result.Item1[i].Grade = 1;
+ }
AddData(result.Item1);
var response = HttpHelper.Post<WebResponseContent>(url + "ReceiveTask/", result.Item1, "鍏ュ簱浠诲姟涓嬪彂");
if (!response.Status)
@@ -494,7 +498,7 @@
{
_basicService.LocationInfoService.UpdateLocationLock(location, result.Item2[i].TaskNum, StockChangeType.Outbound.ObjToInt(), false);
}
-
+ result.Item2[i].Grade = 1;
}
AddData(result.Item2);
var response = HttpHelper.Post<WebResponseContent>(url + "ReceiveTask/", result.Item2, "鍑哄簱浠诲姟涓嬪彂");
--
Gitblit v1.9.3