From ac3d4563b35f38ced8513318457de4af5ffca4fe Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期六, 14 三月 2026 11:09:14 +0800
Subject: [PATCH] 优化出库任务逻辑
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs | 157 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 135 insertions(+), 22 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs"
index b799926..203a99b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs"
@@ -10,6 +10,9 @@
using WIDESEAWCS_Common.LocationEnum;
using WIDESEAWCS_Common;
using WIDESEAWCS_Common.TaskEnum;
+using WIDESEAWCS_DTO;
+using WIDESEAWCS_ITaskInfoService;
+using WIDESEAWCS_Core.Helper;
namespace WIDESEAWCS_TaskInfoService
{
@@ -23,9 +26,17 @@
/// <returns></returns>
public WebResponseContent CreateKLSNewInTask(TaskDTO taskDTO, int taskType)
{
+ WebResponseContent content = new WebResponseContent();
try
{
- int containerType = taskDTO.containerCode.Contains("LLM") ? LocationTypeEnum.LargePallet.ObjToInt() : LocationTypeEnum.SmallPallet.ObjToInt();
+ int containerType = taskDTO.containerCode.Contains("LLM") ? (int)LocationTypeEnum.LargePallet : (int)LocationTypeEnum.SmallPallet;
+ #region 鐐瑰埌鐐�
+ if (!string.IsNullOrEmpty(taskDTO.toLocationCode))
+ {
+ var LocationInfo = _kLSLocationInfoService.Repository.QueryFirst(x => x.LocationCode == taskDTO.toLocationCode) ?? throw new Exception($"鏈壘鍒扮粓鐐硅揣浣嶃�恵taskDTO.toLocationCode}銆�");
+ if (LocationInfo.LocationStatus != (int)LocationStatusEnum.Free) throw new Exception($"缁堢偣璐т綅銆恵taskDTO.toLocationCode}銆戣揣浣嶇姸鎬佷笉涓虹┖璐т綅");
+ }
+ #endregion
//鑾峰彇璐т綅淇℃伅
Dt_KLSLocationInfo? kLSLocationInfo = _kLSLocationInfoService.GetFreeLocationInfo(taskDTO.toAreaCode, containerType) ?? throw new Exception($"鏈壘鍒扮粓鐐瑰簱鍖恒�恵taskDTO.toAreaCode}銆戝彲鐢ㄧ┖璐т綅锛�");
Dt_Task dt_Task = new()
@@ -36,7 +47,7 @@
Grade = taskDTO.taskPriority,
PalletCode = taskDTO.containerCode,
Roadway = kLSLocationInfo.RoadwayNo,
- TaskState = TaskStatusEnum.New.ObjToInt(),
+ TaskState = (int)TaskStatusEnum.New,
TaskType = taskType,
SourceAddress = taskDTO.fromLocationCode,
CurrentAddress = taskDTO.fromLocationCode,
@@ -44,17 +55,39 @@
TargetAddress = kLSLocationInfo.LocationCode,
Creater = "WMS",
};
- kLSLocationInfo.LocationStatus = LocationStatusEnum.InLock.ObjToInt();
- Db.Ado.BeginTran();
- BaseDal.AddData(dt_Task);
- _kLSLocationInfoService.Repository.UpdateData(kLSLocationInfo);
- Db.Ado.CommitTran();
- return WebResponseContent.Instance.OK();
+ kLSLocationInfo.LocationStatus = (int)LocationStatusEnum.InLock;
+ #region 涓嬪彂鍑箰澹换鍔�
+ content = SendKLSTask(dt_Task);
+ if (!content.Status) throw new Exception(content.Message);
+ dt_Task.TaskState = (int)TaskStatusEnum.Execut;
+ #endregion
+ try
+ {
+ Db.Ado.BeginTran();
+ BaseDal.AddData(dt_Task);
+ _kLSLocationInfoService.Repository.UpdateData(kLSLocationInfo);
+ Db.Ado.CommitTran();
+ }
+ catch (Exception ex)
+ {
+ Db.Ado.RollbackTran();
+ throw new Exception(ex.Message);
+ }
+
+ return content.OK(data: new
+ {
+ taskCode = taskDTO.taskCode,
+ Message = "鎴愬姛锛�"
+ });
}
catch (Exception ex)
{
- Db.Ado.RollbackTran();
- throw new Exception(ex.Message);
+ content.Data = new
+ {
+ taskCode = taskDTO.taskCode,
+ Message = $"澶辫触锛亄ex.Message}"
+ };
+ return content.Error(ex.Message);
}
}
/// <summary>
@@ -65,10 +98,12 @@
/// <returns></returns>
public WebResponseContent CreateKLSNewOutTask(TaskDTO taskDTO, int taskType)
{
+ WebResponseContent content = new WebResponseContent();
try
{
Dt_KLSLocationInfo? kLSLocationInfo = _kLSLocationInfoService.Repository.QueryFirst(x => x.LocationCode == taskDTO.fromLocationCode) ?? throw new Exception($"鏈壘鍒拌捣鐐瑰簱浣嶃�恵taskDTO.fromLocationCode}銆戯紒");
- if (kLSLocationInfo.LocationStatus != LocationStatusEnum.InStock.ObjToInt()) throw new Exception($"璧风偣搴撲綅銆恵taskDTO.fromLocationCode}銆戝綋鍓嶅簱浣嶇姸鎬佷笉鍙嚭搴擄紒");
+ if (kLSLocationInfo.LocationStatus != (int)LocationStatusEnum.InStock) throw new Exception($"璧风偣搴撲綅銆恵taskDTO.fromLocationCode}銆戝綋鍓嶅簱浣嶇姸鎬佷笉鍙嚭搴擄紒");
+ if (kLSLocationInfo.PalletCode != taskDTO.containerCode) throw new Exception($"璧风偣搴撲綅銆恵taskDTO.fromLocationCode}銆戠粦瀹氭枡绠卞彿銆恵kLSLocationInfo.PalletCode}銆戜笌浠诲姟鏂欑鍙枫�恵taskDTO.containerCode}銆戜笉鍖归厤锛�");
Dt_Task dt_Task = new()
{
TaskNum = GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
@@ -77,7 +112,7 @@
Grade = taskDTO.taskPriority,
PalletCode = taskDTO.containerCode,
Roadway = kLSLocationInfo.RoadwayNo,
- TaskState = TaskStatusEnum.New.ObjToInt(),
+ TaskState = (int)TaskStatusEnum.New,
TaskType = taskType,
SourceAddress = taskDTO.fromLocationCode,
CurrentAddress = taskDTO.fromLocationCode,
@@ -85,25 +120,95 @@
TargetAddress = taskDTO.toLocationCode,
Creater = "WMS",
};
- kLSLocationInfo.LocationStatus = LocationStatusEnum.OutLock.ObjToInt();
- Db.Ado.BeginTran();
- BaseDal.AddData(dt_Task);
- _kLSLocationInfoService.Repository.UpdateData(kLSLocationInfo);
- Db.Ado.CommitTran();
- return WebResponseContent.Instance.OK();
+ kLSLocationInfo.LocationStatus = (int)LocationStatusEnum.OutLock;
+ #region 涓嬪彂鍑箰澹换鍔�
+ content = SendKLSTask(dt_Task);
+ if (!content.Status) throw new Exception(content.Message);
+ dt_Task.TaskState = (int)TaskStatusEnum.Execut;
+ #endregion
+ try
+ {
+ Db.Ado.BeginTran();
+ BaseDal.AddData(dt_Task);
+ _kLSLocationInfoService.Repository.UpdateData(kLSLocationInfo);
+ Db.Ado.CommitTran();
+ }
+ catch (Exception ex)
+ {
+ Db.Ado.RollbackTran();
+ throw new Exception(ex.Message);
+ }
+ return content.OK(data: new
+ {
+ taskCode = taskDTO.taskCode,
+ Message = "鎴愬姛锛�"
+ });
}
catch (Exception ex)
{
- Db.Ado.RollbackTran();
- throw new Exception(ex.Message);
+ content.Data = new
+ {
+ taskCode = taskDTO.taskCode,
+ Message = $"澶辫触锛亄ex.Message}"
+ };
+ return content.Error(ex.Message);
}
+ }
+ #endregion
+
+ #region 涓嬪彂鍑箰澹换鍔�
+ public WebResponseContent SendKLSTask(Dt_Task task)
+ {
+ WebResponseContent content = new WebResponseContent();
+ GALAXISTaskInfo gALAXISTaskInfo = new();
+ GALAXISReturn agvContent = new();
+ try
+ {
+ gALAXISTaskInfo.groupId = DateTime.Now.ToString("yyMMddHHmmss") + task.TaskNum;
+ gALAXISTaskInfo.msgTime = DateTime.Now.ToString();
+ GALAXISTask gALAXISTask = new GALAXISTask()
+ {
+ taskId = task.WMSTaskNum,
+ taskType = task.TaskType == (int)TaskTypeEnum.MLInbound ? 0 : 1,
+ barCode = task.PalletCode,
+ endNode = task.TargetAddress,
+ startNode = task.SourceAddress,
+ priorityCode = task.Grade
+ };
+ gALAXISTaskInfo.tasks.Add(gALAXISTask);
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(GALAXISTaskInfo)) ?? throw new Exception("鏈壘鍒板嚡涔愬＋AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ string response = HttpHelper.Post(apiInfo.ApiAddress, gALAXISTaskInfo.Serialize());
+ agvContent = response.DeserializeObject<GALAXISReturn>();
+ content.OK(data: agvContent);
+ if (agvContent.success)
+ {
+ if (agvContent.data.returnStatus != 0) throw new Exception(agvContent.data.returnInfo);
+ }
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ finally
+ {
+ _trackloginfoService.AddTrackLog(gALAXISTaskInfo, content, "涓嬪彂鍑箰澹獳GV浠诲姟", "", agvContent.data.returnInfo);
+ }
+ return content;
}
#endregion
#region 5 璺ㄦゼ灞傝繍杈撲换鍔″垱寤�
public WebResponseContent CarryTask(TaskDTO taskDTO, int taskType)
{
- return WebResponseContent.Instance.OK();
+ try
+ {
+
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
}
#endregion
@@ -111,7 +216,15 @@
#region 6 瑁佸壀閫佽揣
public WebResponseContent CJCarryTaske(TaskDTO taskDTO, int taskType)
{
- return WebResponseContent.Instance.OK();
+ try
+ {
+
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
}
#endregion
}
--
Gitblit v1.9.3