From 2ae5aa151f7b40a082e34aa7ed22b4b64edd1d3c Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 11 六月 2025 17:13:56 +0800
Subject: [PATCH] 修改堆垛机通讯协议及交互逻辑
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs | 157 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 106 insertions(+), 51 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 897c659..363855a 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"
@@ -12,6 +12,9 @@
using System.Reflection.Metadata;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using SkiaSharp;
+using System.Collections;
+using Newtonsoft.Json;
+using WIDESEA_Core.Log;
namespace WIDESEA_TaskInfoService
{
@@ -39,9 +42,9 @@
Dt_Task task = new()
{
CurrentAddress = stockInfo.LocationCode,
- Grade = 2,
+ Grade = 3,
PalletCode = stockInfo.PalletCode,
- NextAddress = roadwayInfo.OutSCStationCode,
+ NextAddress = roadwayInfo.OutStationCode,
Roadway = locationInfo.RoadwayNo,
SourceAddress = stockInfo.LocationCode,
TargetAddress = roadwayInfo.OutStationCode,
@@ -71,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;
@@ -101,7 +104,7 @@
}
else
{
- throw new Exception("鏃犲簱瀛�");
+ throw new Exception("鏃犲簱瀛�!");
}
}
else
@@ -135,7 +138,7 @@
}
catch (Exception ex)
{
- return WebResponseContent.Instance.Error(ex.Message);
+ return WebResponseContent.Instance.Error($"{ex.Message}");
}
}
@@ -150,20 +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)
+ 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}");
+ }
}
- for (int i = 0; i < result.Item2.Count; i++)
+ 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);
+ 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}");
+ }
}
@@ -179,7 +200,6 @@
{
_unitOfWorkManage.RollbackTran();
}
- return content;
}
else if (outboundOrderDetails != null && outboundOrderDetails.Count > 0)
{
@@ -190,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();
}
@@ -197,6 +238,10 @@
{
_unitOfWorkManage.RollbackTran();
return WebResponseContent.Instance.Error(ex.Message);
+ }
+ finally
+ {
+ WriteLog.GetLog("鍑哄簱浠诲姟涓嬪彂").Write(JsonConvert.SerializeObject(content), "鍑哄簱浠诲姟涓嬪彂");
}
}
@@ -215,8 +260,8 @@
int befoStatus=location.LocationStatus.ObjToInt();
if (location != null)
{
- Dt_LocationInfo result = isDepth(location);
- if (result != null && result.LocationStatus == LocationStatusEnum.Lock.ObjToInt() && result.LocationStatus != LocationStatusEnum.PalletLock.ObjToInt() && result.LocationStatus != LocationStatusEnum.Free.ObjToInt())
+ Dt_LocationInfo result = _basicService.LocationInfoService.isDepth(location);
+ if (result != null && result.LocationStatus != LocationStatusEnum.Lock.ObjToInt() && result.LocationStatus != LocationStatusEnum.PalletLock.ObjToInt() && result.LocationStatus != LocationStatusEnum.Free.ObjToInt())
{
int sum = 0;
for (int j = 0; j < task.Count; j++)
@@ -229,9 +274,9 @@
if (sum == 0)
{
Dt_Task relocariontask = RelocationTask(result);
- task[i].Grade=1;
- tasks.Add(task[i]);
+ task[i].Grade=2;
relocationList.Add(relocariontask);
+ relocationList.Add(task[i]);
}
else
{
@@ -270,7 +315,7 @@
break;
}
}
- return (tasks, relocationList);
+ return (relocationList,tasks);
}
else
{
@@ -307,10 +352,14 @@
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))
};
+ _basicService.LocationInfoService.RelocationLock(location, locationInfos, tasks.TaskNum);
+ stockInfo.StockStatus= StockStatusEmun.绉诲簱閿佸畾.ObjToInt();
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
return tasks;
}
else
@@ -405,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,
@@ -418,20 +468,52 @@
TaskType = TaskTypeEnum.PalletOutbound.ObjToInt(),
Depth = locationInfo.Depth,
TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum))
-
};
int beforeStatus = locationInfo.LocationStatus;
_unitOfWorkManage.BeginTran();
stockInfo.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
- BaseDal.AddData(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)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return 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);
+ 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, "鍑哄簱浠诲姟涓嬪彂");
+ if (!response.Status)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error($"{response.Message}");
+ }
+ }
_stockService.StockInfoService.UpdateData(stockInfo);
_basicService.LocationInfoService.UpdateData(locationInfo);
_basicService.LocationInfoService.UpdateLocationLock(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), "", task.TaskNum);
-
_unitOfWorkManage.CommitTran();
return WebResponseContent.Instance.OK();
}
@@ -439,33 +521,6 @@
{
return WebResponseContent.Instance.Error(ex.Message);
}
- }
-
- public Dt_LocationInfo isDepth(Dt_LocationInfo locationInfo)
- {
- if (locationInfo.Depth == 2)
- {
- if (locationInfo.Row == 1 || locationInfo.Row == 5)
- {
- Dt_LocationInfo dt_LocationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.Row == locationInfo.Row + 1 && x.Layer == locationInfo.Layer && x.Column == locationInfo.Column && x.RoadwayNo == locationInfo.RoadwayNo);
-
- if (dt_LocationInfo != null)
- {
- return dt_LocationInfo;
- }
-
- }
- else if (locationInfo.Row == 4 || locationInfo.Row == 8)
- {
- Dt_LocationInfo dt_LocationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.Row == locationInfo.Row + 1 && x.Layer == locationInfo.Layer && x.Column == locationInfo.Column && x.RoadwayNo == locationInfo.RoadwayNo);
-
- if (dt_LocationInfo != null && dt_LocationInfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
- {
- return dt_LocationInfo;
- }
- }
- }
- return null;
}
}
}
--
Gitblit v1.9.3