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/TaskService.cs | 130 +++++++++++++++++++++++++++---------------
1 files changed, 83 insertions(+), 47 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 e9b04ca..95da17c 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"
@@ -113,24 +113,29 @@
return WebResponseContent.Instance.Error(response.Message);
}
_unitOfWorkManage.CommitTran();
- return content=responseContent;
+ return content = responseContent;
}
_unitOfWorkManage.CommitTran();
- return content=responseContent;
+ return content = responseContent;
}
}
- return content=WebResponseContent.Instance.Error("鏈壘鍒颁换鍔＄被鍨嬪搴斾笟鍔″鐞嗛�昏緫");
+ return content = WebResponseContent.Instance.Error("鏈壘鍒颁换鍔＄被鍨嬪搴斾笟鍔″鐞嗛�昏緫");
}
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
- return content=WebResponseContent.Instance.Error(ex.Message);
+ return content = WebResponseContent.Instance.Error(ex.Message);
}
finally
{
- WriteLog.GetLog("浠诲姟瀹屾垚").Write(JsonConvert.SerializeObject(content), "浠诲姟瀹屾垚");
+ WriteLog.GetLog("浠诲姟瀹屾垚").Write($"鎿嶄綔浜猴細{(App.User.UserId>0? App.User.UserName: "System")}{ Environment.NewLine}浠诲姟鍙凤細{taskNum}{Environment.NewLine}{ JsonConvert.SerializeObject(content)}", "浠诲姟瀹屾垚");
}
}
+ /// <summary>
+ /// 浠诲姟鍙栨秷
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
public WebResponseContent TaskCancel(int taskNum)
{
WebResponseContent content = new WebResponseContent();
@@ -175,12 +180,13 @@
}
finally
{
- WriteLog.GetLog("浠诲姟鍙栨秷").Write(JsonConvert.SerializeObject(content), "浠诲姟鍙栨秷");
+ WriteLog.GetLog("浠诲姟鍙栨秷").Write($"鎿嶄綔浜猴細{(App.User.UserId > 0 ? App.User.UserName : "System")}{Environment.NewLine}浠诲姟鍙凤細{taskNum}{Environment.NewLine}{JsonConvert.SerializeObject(content)}", "浠诲姟鍙栨秷");
}
}
public WebResponseContent UpdateTaskStatus(int taskNum)
{
+ WebResponseContent content = new WebResponseContent();
try
{
Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
@@ -198,16 +204,23 @@
}
else if (task.TaskType == TaskTypeEnum.Relocation.ObjToInt())
{
- task.TaskStatus = InTaskStatusEnum.RelocationExecuting.ObjToInt();
+ task.TaskStatus = RelocationTaskStatusEnum.RelocationExecuting.ObjToInt();
}
else
{
throw new Exception($"浠诲姟绫诲瀷閿欒,鏈壘鍒拌浠诲姟绫诲瀷,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟绫诲瀷:銆恵task.TaskType}銆�");
}
- return WebResponseContent.Instance.Error("鏈壘鍒颁换鍔＄被鍨嬪搴斾笟鍔″鐞嗛�昏緫");
+ _unitOfWorkManage.BeginTran();
+ task.Dispatchertime = DateTime.Now;
+ task.ModifyDate = DateTime.Now;
+ task.Modifier = App.User.UserId > 0 ? App.User.UserName : "System";
+ BaseDal.UpdateData(task);
+ _unitOfWorkManage.CommitTran();
+ return content = WebResponseContent.Instance.OK();
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
return WebResponseContent.Instance.Error(ex.Message);
}
}
@@ -268,13 +281,12 @@
PalletCode = task.PalletCode,
LocationCode = task.TargetAddress,
StockStatus = StockStatusEmun.宸插叆搴�.ObjToInt(),
- Creater = App.User.UserId > 0 ? "" : "System",
- CreateDate = App.User.UserId > 0 ? DateTime.Now : DateTime.Now,
+ Creater = App.User.UserId > 0 ? App.User.UserName : "System",
+ CreateDate = DateTime.Now,
};
Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
CheckCompleted(stockInfo, locationInfo);
-
_stockService.StockInfoService.Repository.AddData(stockInfo);
@@ -340,21 +352,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))
- {
- locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ if (DepthTask(locationInfo) == false)
+ {
_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.浜哄伐瀹屾垚);
@@ -364,10 +371,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,task.TaskNum);
+ _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)
{
@@ -389,10 +397,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.浜哄伐瀹屾垚);
@@ -418,6 +431,7 @@
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);
@@ -425,9 +439,24 @@
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);
- task.TaskStatus = InTaskStatusEnum.RelocationFinish.ObjToInt();
+ task.TaskStatus = RelocationTaskStatusEnum.RelocationFinish.ObjToInt();
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
_unitOfWorkManage.CommitTran();
@@ -460,7 +489,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();
@@ -490,7 +522,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();
@@ -530,6 +565,13 @@
_stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetail);
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.InStock.ObjToInt();
_basicService.LocationInfoService.Repository.UpdateData(locationInfo);
@@ -565,8 +607,14 @@
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(), true);
_basicService.LocationInfoService.Repository.UpdateData(locationInfo);
stockInfo.StockStatus = StockStatusEmun.宸插叆搴�.ObjToInt();
@@ -604,7 +652,7 @@
_basicService.LocationInfoService.RelocationFree(locationStart, task.TaskNum);
_basicService.LocationInfoService.Repository.UpdateData(locationEnd);
- task.TaskStatus = InTaskStatusEnum.RelocationCancel.ObjToInt();
+ task.TaskStatus = RelocationTaskStatusEnum.RelocationCancel.ObjToInt();
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
_unitOfWorkManage.CommitTran();
@@ -616,31 +664,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;
}
}
- else
- {
- return false;
- }
-
+ return false;
}
-
public WebResponseContent GetTaskInfo()
{
WebResponseContent content = new WebResponseContent();
--
Gitblit v1.9.3