From f51582d5b4b498f28513f215f91828ef181df4a1 Mon Sep 17 00:00:00 2001
From: Huangxiaoqiang-03 <1247017146@qq.com>
Date: 星期三, 06 十一月 2024 17:16:09 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 220 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 164 insertions(+), 56 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index 573566f..41f4c02 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -17,6 +17,7 @@
using AutoMapper;
using MailKit.Search;
+using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
using System;
@@ -25,6 +26,7 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Linq.Expressions;
+using System.Net.Http.Headers;
using System.Reflection;
using System.Reflection.Metadata;
using System.Text;
@@ -34,6 +36,7 @@
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
+using WIDESEA_Core.Log;
using WIDESEA_DTO.Inbound;
using WIDESEA_DTO.Stock;
using WIDESEA_IBasicRepository;
@@ -86,6 +89,7 @@
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
public WebResponseContent TaskCompleted(int taskNum)
{
+ WebResponseContent content = new WebResponseContent();
try
{
Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
@@ -93,45 +97,125 @@
{
return WebResponseContent.Instance.Error("鏈壘鍒颁换鍔′俊鎭�");
}
+ _unitOfWorkManage.BeginTran();
MethodInfo? methodInfo = GetType().GetMethod(((TaskTypeEnum)task.TaskType) + "TaskCompleted");
if (methodInfo != null)
{
WebResponseContent? responseContent = (WebResponseContent?)methodInfo.Invoke(this, new object[] { task });
if (responseContent != null)
{
- return responseContent;
+ if (App.User.UserId > 0)
+ {
+ var response = HttpHelper.Post<WebResponseContent>(url + "StackCraneTaskCompleted?taskNum=" + task.TaskNum, "", "浠诲姟瀹屾垚");
+ if (!response.Status)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error(response.Message);
+ }
+ _unitOfWorkManage.CommitTran();
+ return content = responseContent;
+ }
+ _unitOfWorkManage.CommitTran();
+ return content = responseContent;
}
}
- return WebResponseContent.Instance.Error("鏈壘鍒颁换鍔＄被鍨嬪搴斾笟鍔″鐞嗛�昏緫");
+ return content = WebResponseContent.Instance.Error("鏈壘鍒颁换鍔＄被鍨嬪搴斾笟鍔″鐞嗛�昏緫");
}
catch (Exception ex)
{
- return WebResponseContent.Instance.Error(ex.Message);
+ _unitOfWorkManage.RollbackTran();
+ return content = WebResponseContent.Instance.Error(ex.Message);
+ }
+ finally
+ {
+ WriteLog.GetLog("浠诲姟瀹屾垚").Write($"鎿嶄綔浜猴細{(App.User.UserId>0? App.User.UserName: "System")}{ Environment.NewLine}{ JsonConvert.SerializeObject(content)}", "浠诲姟瀹屾垚");
}
}
- public WebResponseContent TaskCancel(SaveModel saveModel)
+ public WebResponseContent TaskCancel(int taskNum)
{
+ WebResponseContent content = new WebResponseContent();
try
{
- int taskNum = int.Parse(saveModel.MainData["taskNum"].ToString());
Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
if (task == null)
{
- return WebResponseContent.Instance.Error("鏈壘鍒颁换鍔′俊鎭�");
+ return content=WebResponseContent.Instance.Error("鏈壘鍒颁换鍔′俊鎭�");
}
+ _unitOfWorkManage.BeginTran();
MethodInfo? methodInfo = GetType().GetMethod(((TaskTypeEnum)task.TaskType) + "TaskCancel");
if (methodInfo != null)
{
WebResponseContent? responseContent = (WebResponseContent?)methodInfo.Invoke(this, new object[] { task });
if (responseContent != null)
{
- return responseContent;
+ if (responseContent != null)
+ {
+ if (App.User.UserId > 0)
+ {
+ var response = HttpHelper.Post<WebResponseContent>(url + "TaskCancel?taskNum=" + task.TaskNum, "", "浠诲姟鍙栨秷");
+ if (!response.Status)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return content=WebResponseContent.Instance.Error(response.Message);
+ }
+ _unitOfWorkManage.CommitTran();
+ return content=responseContent;
+ }
+ _unitOfWorkManage.CommitTran();
+ return content=responseContent;
+ }
}
}
- return WebResponseContent.Instance.Error("鏈壘鍒颁换鍔＄被鍨嬪搴斾笟鍔″鐞嗛�昏緫");
+ return content=WebResponseContent.Instance.Error("鏈壘鍒颁换鍔＄被鍨嬪搴斾笟鍔″鐞嗛�昏緫");
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
+ return content=WebResponseContent.Instance.Error(ex.Message);
+ }
+ finally
+ {
+ WriteLog.GetLog("浠诲姟鍙栨秷").Write($"鎿嶄綔浜猴細{(App.User.UserId > 0 ? App.User.UserName : "System")}{Environment.NewLine}{JsonConvert.SerializeObject(content)}", "浠诲姟鍙栨秷");
+ }
+ }
+
+ public WebResponseContent UpdateTaskStatus(int taskNum)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ if (task == null)
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒颁换鍔′俊鎭�");
+ }
+ if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt() || task.TaskType == TaskTypeEnum.PalletOutbound.ObjToInt())
+ {
+ task.TaskStatus = OutTaskStatusEnum.SC_OutExecuting.ObjToInt();
+ }
+ else if (task.TaskType == TaskTypeEnum.Inbound.ObjToInt() || task.TaskType == TaskTypeEnum.PalletInbound.ObjToInt())
+ {
+ task.TaskStatus = InTaskStatusEnum.SC_InExecuting.ObjToInt();
+ }
+ else if (task.TaskType == TaskTypeEnum.Relocation.ObjToInt())
+ {
+ task.TaskStatus = InTaskStatusEnum.RelocationExecuting.ObjToInt();
+ }
+ else
+ {
+ throw new Exception($"浠诲姟绫诲瀷閿欒,鏈壘鍒拌浠诲姟绫诲瀷,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟绫诲瀷:銆恵task.TaskType}銆�");
+ }
+ _unitOfWorkManage.BeginTran();
+ task.Dispatchertime = DateTime.Now;
+ task.ModifyDate = DateTime.Now;
+ task.Modifier = "System";
+ BaseDal.UpdateData(task);
+ _unitOfWorkManage.CommitTran();
+ return content = WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
return WebResponseContent.Instance.Error(ex.Message);
}
}
@@ -164,7 +248,7 @@
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Inbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);
- _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) + beforeQuantity, StockChangeType.Inbound);
+ _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) + beforeQuantity, StockChangeType.Inbound,task.TaskNum);
_unitOfWorkManage.CommitTran();
return WebResponseContent.Instance.OK();
}
@@ -191,12 +275,13 @@
{
PalletCode = task.PalletCode,
LocationCode = task.TargetAddress,
- StockStatus = StockStatusEmun.宸插叆搴�.ObjToInt()
+ StockStatus = StockStatusEmun.宸插叆搴�.ObjToInt(),
+ Creater = App.User.UserId > 0 ? App.User.UserName : "System",
+ CreateDate = App.User.UserId > 0 ? DateTime.Now : DateTime.Now,
};
Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
CheckCompleted(stockInfo, locationInfo);
-
_stockService.StockInfoService.Repository.AddData(stockInfo);
@@ -262,22 +347,16 @@
stockInfo.StockStatus = StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt();
_stockService.StockInfoService.Repository.UpdateData(stockInfo);
int beforeStatus = locationInfo.LocationStatus;
- if (task.Depth == 1)
+ if (locationInfo.Depth == 2)
{
- if (DepthTask(task)) { }
- else
+ if (DepthTask(locationInfo) == false)
{
- locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
_basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
- _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
+
}
}
- else
- {
- locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
- _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
- _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
- }
+ locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
task.TaskStatus = OutTaskStatusEnum.OutFinish.ObjToInt();
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
@@ -287,10 +366,11 @@
beforeQuantity = stockInfo.Details.Where(x => x.Id != 0).Sum(x => x.StockQuantity);
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);
- _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) - beforeQuantity, StockChangeType.Outbound);
+ _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) - beforeQuantity, StockChangeType.Outbound, task.TaskNum);
_unitOfWorkManage.CommitTran();
return OnOutboundTaskCompleted?.Invoke(task) ?? WebResponseContent.Instance.OK();
+
}
catch (Exception ex)
{
@@ -312,10 +392,15 @@
int beforeStatus = locationInfo.LocationStatus;
+ if (locationInfo.Depth == 2)
+ {
+ if (DepthTask(locationInfo) == false)
+ {
+ _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
+ }
+ }
locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
- _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
_basicService.LocationInfoService.Repository.UpdateData(locationInfo);
-
task.TaskStatus = OutTaskStatusEnum.OutFinish.ObjToInt();
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
@@ -341,12 +426,28 @@
Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);
Dt_LocationInfo locationEnd = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
+ Dt_LocationInfo locationStart = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
CheckCompleted(stockInfo, locationEnd);
stockInfo.LocationCode = locationEnd.LocationCode;
stockInfo.StockStatus = StockStatusEmun.宸插叆搴�.ObjToInt();
_stockService.StockInfoService.Repository.UpdateData(stockInfo);
+
+ if (locationStart.Depth == 1)
+ {
+ if (DepthTask(locationStart) == false)
+ {
+ locationStart.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ _basicService.LocationInfoService.RelocationFree(locationEnd, task.TaskNum);
+ _basicService.LocationInfoService.Repository.UpdateData(locationStart);
+ }
+ else
+ {
+ locationStart.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ _basicService.LocationInfoService.Repository.UpdateData(locationStart);
+ }
+ }
_basicService.LocationInfoService.RelocationFree(locationEnd, task.TaskNum);
@@ -376,7 +477,6 @@
CheckCompleted(stockInfo, locationInfo);
- stockInfo.LocationCode = locationInfo.LocationCode;
stockInfo.StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt();
_stockService.StockInfoService.Repository.UpdateData(stockInfo);
@@ -384,7 +484,10 @@
int beforeStatus = locationInfo.LocationStatus;
locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
- _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Inbound.ObjToInt(), false);
+ if (locationInfo.Depth == 2)
+ {
+ _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
+ }
_basicService.LocationInfoService.Repository.UpdateData(locationInfo);
task.TaskStatus = InTaskStatusEnum.InCancel.ObjToInt();
@@ -414,7 +517,10 @@
int beforeStatus = locationInfo.LocationStatus;
locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
- _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
+ if (locationInfo.Depth == 2)
+ {
+ _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
+ }
_basicService.LocationInfoService.Repository.UpdateData(locationInfo);
task.TaskStatus = InTaskStatusEnum.InCancel.ObjToInt();
@@ -440,6 +546,7 @@
_unitOfWorkManage.BeginTran();
decimal beforeQuantity = 0;
Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);
+ Dt_StockInfoDetail stockInfoDetail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == stockInfo.Id);
Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
@@ -447,23 +554,22 @@
stockInfo.LocationCode = locationInfo.LocationCode;
stockInfo.StockStatus = StockStatusEmun.宸插叆搴�.ObjToInt();
+ stockInfoDetail.OutboundQuantity = beforeQuantity;
+
_stockService.StockInfoService.Repository.UpdateData(stockInfo);
+ _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetail);
int beforeStatus = locationInfo.LocationStatus;
- if (task.Depth == 1)
+
+ if (locationInfo.Depth == 2)
{
- if (!DepthTask(task))
+ if (DepthTask(locationInfo) == false)
{
- locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
- _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
- _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
+ _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), true);
}
}
- else
- {
- locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
- _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
- _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
- }
+ locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
+ _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
+
task.TaskStatus = OutTaskStatusEnum.OutCancel.ObjToInt();
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
@@ -471,10 +577,10 @@
beforeQuantity = stockInfo.Details.Where(x => x.Id != 0).Sum(x => x.StockQuantity);
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);
- _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) - beforeQuantity, StockChangeType.Outbound);
+ _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) - beforeQuantity, StockChangeType.Outbound, task.TaskNum);
_unitOfWorkManage.CommitTran();
- return OnOutboundTaskCompleted?.Invoke(task) ?? WebResponseContent.Instance.OK();
+ return WebResponseContent.Instance.OK();
}
catch (Exception ex)
{
@@ -496,15 +602,22 @@
int beforeStatus = locationInfo.LocationStatus;
+ if (locationInfo.Depth == 2)
+ {
+ if (DepthTask(locationInfo) == false)
+ {
+ _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), true);
+ }
+ }
locationInfo.LocationStatus = LocationStatusEnum.Pallet.ObjToInt();
- _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
_basicService.LocationInfoService.Repository.UpdateData(locationInfo);
+ stockInfo.StockStatus = StockStatusEmun.宸插叆搴�.ObjToInt();
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
task.TaskStatus = OutTaskStatusEnum.OutCancel.ObjToInt();
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
- _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
-
+
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);
_unitOfWorkManage.CommitTran();
@@ -527,6 +640,9 @@
Dt_LocationInfo locationEnd = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
Dt_LocationInfo locationStart = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
+ stockInfo.StockStatus = StockStatusEmun.宸插叆搴�.ObjToInt();
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+
locationEnd.LocationStatus= LocationStatusEnum.Free.ObjToInt();
_basicService.LocationInfoService.RelocationFree(locationStart, task.TaskNum);
_basicService.LocationInfoService.Repository.UpdateData(locationEnd);
@@ -543,27 +659,19 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
- public bool DepthTask(Dt_Task task)
+ public bool DepthTask(Dt_LocationInfo location)
{
- Dt_LocationInfo location=_locationInfoService.Repository.QueryFirst(x=>x.LocationCode == task.SourceAddress);
- if(location != null)
+ if (location != null )
{
- if(location.Row%2==0)
+ Dt_LocationInfo locations = _locationInfoService.Repository.QueryFirst(x => x.RoadwayNo == location.RoadwayNo && x.Column == location.Column && x.Layer == location.Layer && x.Depth != location.Depth && x.Row != location.Row && (SqlFunc.Abs(x.Row - location.Row) == 1));
+ if (locations != null)
{
- Dt_LocationInfo locations = _locationInfoService.Repository.QueryFirst(x => x.Row == location.Row + 1 && x.Layer == location.Layer && x.Column == location.Column && x.RoadwayNo == location.RoadwayNo);
- Dt_Task tasks=BaseDal.QueryFirst(x=>x.SourceAddress == locations.LocationCode);
- return tasks != null ? true : false;
- }
- else
- {
- Dt_LocationInfo locations = _locationInfoService.Repository.QueryFirst(x => x.Row == location.Row - 1 && x.Layer == location.Layer && x.Column == location.Column && x.RoadwayNo == location.RoadwayNo);
Dt_Task tasks = BaseDal.QueryFirst(x => x.SourceAddress == locations.LocationCode);
return tasks != null ? true : false;
}
}
return false;
}
-
public WebResponseContent GetTaskInfo()
{
WebResponseContent content = new WebResponseContent();
--
Gitblit v1.9.3