From 29cd467ba62b2bdf49c6546e78ae3ec809c4a723 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 19 六月 2025 17:50:28 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs | 96 ++++++++++++++++++++++++++++++++---------------
1 files changed, 65 insertions(+), 31 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 3b7fac9..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"
@@ -13,6 +13,8 @@
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using SkiaSharp;
using System.Collections;
+using Newtonsoft.Json;
+using WIDESEA_Core.Log;
namespace WIDESEA_TaskInfoService
{
@@ -40,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,
@@ -72,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;
@@ -102,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());
@@ -136,7 +138,7 @@
}
catch (Exception ex)
{
- return WebResponseContent.Instance.Error(ex.Message);
+ return WebResponseContent.Instance.Error($"{ex.Message}");
}
}
@@ -151,37 +153,38 @@
/// <returns></returns>
public WebResponseContent GenerateOutboundTaskDataUpdate(List<Dt_Task> tasks, List<Dt_StockInfo>? stockInfos = null, List<Dt_OutboundOrderDetail>? outboundOrderDetails = null, List<Dt_OutStockLockInfo>? outStockLockInfos = null, List<Dt_LocationInfo>? locationInfos = null)
{
+ WebResponseContent content = new WebResponseContent();
try
{
- WebResponseContent content=new WebResponseContent();
_unitOfWorkManage.BeginTran();
- //鍒ゆ柇绉诲簱
(List<Dt_Task>?, List<Dt_Task>?) result=RelocationTasks(tasks.OrderBy(x=>x.Depth).ToList());
if (result.Item1 != null && result.Item1.Count >0)
{
AddData(result.Item1);
- var response = HttpHelper.Post<WebResponseContent>(url + "ReceiveTask/", result.Item1, "鍏ュ簱浠诲姟涓嬪彂");
- if (!response.Status)
- {
- _unitOfWorkManage.RollbackTran();
- return content = WebResponseContent.Instance.Error($"{response.Message}");
- }
+ var response = HttpHelper.Post<WebResponseContent>(url + "ReceiveTask/", result.Item1, "鍑哄簱浠诲姟涓嬪彂");
+ //if (!response.Status)
+ //{
+ // _unitOfWorkManage.RollbackTran();
+ // return content = WebResponseContent.Instance.Error($"{response.Message}");
+ //}
}
if(result.Item2 != null&&result.Item2.Count>0)
{
for (int i = 0; i < result.Item2.Count; i++)
{
Dt_LocationInfo location = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == result.Item2[i].SourceAddress && x.RoadwayNo == result.Item2[i].Roadway);
- _basicService.LocationInfoService.UpdateLocationLock(location, result.Item2[i].TaskNum, StockChangeType.Outbound.ObjToInt(), false);
-
+ if (location.Depth == 2)
+ {
+ _basicService.LocationInfoService.UpdateLocationLock(location, result.Item2[i].TaskNum, StockChangeType.Outbound.ObjToInt(), false);
+ }
}
AddData(result.Item2);
- var response = HttpHelper.Post<WebResponseContent>(url + "ReceiveTask/", result.Item2, "鍏ュ簱浠诲姟涓嬪彂");
- if (!response.Status)
- {
- _unitOfWorkManage.RollbackTran();
- return content = WebResponseContent.Instance.Error($"{response.Message}");
- }
+ var response = HttpHelper.Post<WebResponseContent>(url + "ReceiveTask/", result.Item2, "鍑哄簱浠诲姟涓嬪彂");
+ //if (!response.Status)
+ //{
+ // _unitOfWorkManage.RollbackTran();
+ // return content = WebResponseContent.Instance.Error($"{response.Message}");
+ //}
}
@@ -197,7 +200,6 @@
{
_unitOfWorkManage.RollbackTran();
}
- return content;
}
else if (outboundOrderDetails != null && outboundOrderDetails.Count > 0)
{
@@ -208,6 +210,27 @@
_outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
}
+ if (outboundOrderDetails != null&&outboundOrderDetails.Count()>0)
+ {
+ for (int i = 0; i < outboundOrderDetails.Count(); i++)
+ {
+ _outboundService.OutboundOrderDetailService.Repository.DeleteAndMoveIntoHty(outboundOrderDetails[i], App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ Dt_OutboundOrder outboundOrder = _outboundService.OutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetails[i].OrderId);
+ List<Dt_OutboundOrderDetail> outboundOrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryData(x => x.OrderId == outboundOrder.Id&&x.OrderDetailStatus==OrderDetailStatusEnum.New.ObjToInt()).ToList();
+ if (outboundOrderDetail.Count <= 0)
+ {
+ outboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
+ _outboundService.OutboundOrderService.Repository.DeleteAndMoveIntoHty(outboundOrder, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ }
+ else
+ {
+ outboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱涓�.ObjToInt();
+ _outboundService.OutboundOrderService.Repository.UpdateData(outboundOrder);
+ }
+ }
+
+ }
+
_unitOfWorkManage.CommitTran();
return WebResponseContent.Instance.OK();
}
@@ -215,6 +238,10 @@
{
_unitOfWorkManage.RollbackTran();
return WebResponseContent.Instance.Error(ex.Message);
+ }
+ finally
+ {
+ WriteLog.GetLog("鍑哄簱浠诲姟涓嬪彂").Write(JsonConvert.SerializeObject(content), "鍑哄簱浠诲姟涓嬪彂");
}
}
@@ -247,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]);
}
@@ -325,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))
@@ -427,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,
@@ -445,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)
@@ -463,11 +494,14 @@
for (int i = 0; i < result.Item2.Count; i++)
{
Dt_LocationInfo location = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == result.Item2[i].SourceAddress && x.RoadwayNo == result.Item2[i].Roadway);
- _basicService.LocationInfoService.UpdateLocationLock(location, result.Item2[i].TaskNum, StockChangeType.Outbound.ObjToInt(), false);
-
+ if (location.Depth == 2)
+ {
+ _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, "鍏ュ簱浠诲姟涓嬪彂");
+ var response = HttpHelper.Post<WebResponseContent>(url + "ReceiveTask/", result.Item2, "鍑哄簱浠诲姟涓嬪彂");
if (!response.Status)
{
_unitOfWorkManage.RollbackTran();
--
Gitblit v1.9.3