From f82511343cf2c8ecf3981954e7eb92172d72a905 Mon Sep 17 00:00:00 2001
From: Huangxiaoqiang-03 <1247017146@qq.com>
Date: 星期二, 05 十一月 2024 17:26:08 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 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..e21b334 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
{
@@ -151,16 +153,15 @@
/// <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, "鍏ュ簱浠诲姟涓嬪彂");
+ var response = HttpHelper.Post<WebResponseContent>(url + "ReceiveTask/", result.Item1, "鍑哄簱浠诲姟涓嬪彂");
if (!response.Status)
{
_unitOfWorkManage.RollbackTran();
@@ -172,11 +173,13 @@
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, "鍏ュ簱浠诲姟涓嬪彂");
+ var response = HttpHelper.Post<WebResponseContent>(url + "ReceiveTask/", result.Item2, "鍑哄簱浠诲姟涓嬪彂");
if (!response.Status)
{
_unitOfWorkManage.RollbackTran();
@@ -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), "鍑哄簱浠诲姟涓嬪彂");
}
}
@@ -463,11 +490,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);
+ }
}
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