From 7d646a2341666034858a324d838622e2787fb8a6 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 26 二月 2026 14:36:46 +0800
Subject: [PATCH] 修改凯乐士wms与设备同步接口
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/EditreacklocationGALAXIS.cs | 35 +++++++++++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGV/KLSAGVController.cs | 20 ++++++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/GALAXISUpdateTaskStatus.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 96 +++++++++++++++++++++++++++----
5 files changed, 137 insertions(+), 18 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/EditreacklocationGALAXIS.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/EditreacklocationGALAXIS.cs"
new file mode 100644
index 0000000..596ad25
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/EditreacklocationGALAXIS.cs"
@@ -0,0 +1,35 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEAWCS_DTO
+{
+ /// <summary>
+ /// 淇敼搴撲綅鐨勫尯鍩�
+ /// </summary>
+ public class EditreacklocationGALAXIS
+ {
+ /// <summary>
+ /// 璇锋眰鏃堕棿鎴�
+ /// </summary>
+ public string timestamp { get; set; }
+
+ /// <summary>
+ /// 瀹瑰櫒缂栫爜鏁扮粍
+ /// </summary>
+ public string[] locationNos { get; set; }
+
+ /// <summary>
+ /// 淇敼鍚庣殑鍖哄煙鍙�
+ /// </summary>
+ public string area { get; set; }
+
+
+ /// <summary>
+ /// 瀹瑰櫒鍘熸湁搴撳尯锛岄粯璁も�渃g鈥�
+ /// </summary>
+ public string district { get; set; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/GALAXISUpdateTaskStatus.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/GALAXISUpdateTaskStatus.cs"
index 320ed77..69217c9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/GALAXISUpdateTaskStatus.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/GALAXISUpdateTaskStatus.cs"
@@ -7,7 +7,7 @@
namespace WIDESEAWCS_DTO
{
/// <summary>
- /// 鍑箰澹洿鏂颁换鍔＄姸鎬�
+ /// 鍑箰澹换鍔＄姸鎬佷笂鎶�
/// </summary>
public class GALAXISUpdateTaskStatus
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGV/KLSAGVController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGV/KLSAGVController.cs"
index 970ee35..5df1094 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGV/KLSAGVController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGV/KLSAGVController.cs"
@@ -3,6 +3,7 @@
using Microsoft.AspNetCore.Mvc;
using WIDESEAWCS_Common;
using WIDESEAWCS_Core;
+using WIDESEAWCS_DTO;
using WIDESEAWCS_DTO.WMS;
using WIDESEAWCS_ITaskInfoService;
@@ -24,9 +25,24 @@
/// <param name="taskDTOs"></param>
/// <returns></returns>
[HttpPost, Route("UpdateTaskStatus"), AllowAnonymous]
- public WebResponseContent UpdateTaskStatus([FromBody] object TaskDTO)
+ public ReturnGALAXIS UpdateTaskStatus([FromBody] object TaskDTO)
{
- return _taskService.UpdateTaskStatus(TaskDTO, DeviceTypeEnum.GALAXIS);
+ ReturnGALAXIS returnGALAXIS = new ReturnGALAXIS();
+ var take= _taskService.UpdateTaskStatus(TaskDTO, DeviceTypeEnum.GALAXIS);
+ if (take.Status)
+ {
+ returnGALAXIS.returnStatus = 0;
+ returnGALAXIS.msgTime=DateTime.Now.ToString();
+ returnGALAXIS.returnInfo = "";
+ }
+ else
+ {
+ returnGALAXIS.returnStatus=take.Code;
+ returnGALAXIS.msgTime=DateTime.Now.ToString();
+ returnGALAXIS.returnInfo = take.Message;
+ }
+
+ return returnGALAXIS;
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
index 64c6398..2c2ef26 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
@@ -64,7 +64,7 @@
}
catch (Exception ex)
{
- throw new Exception(ex.Message);
+ return WebResponseContent.Instance.Error(ex.Message);
}
}
#endregion
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index abb3c4b..9c0bf7a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -26,6 +26,7 @@
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Core.Helper;
+using WIDESEAWCS_DTO;
using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_DTO.WMS;
using WIDESEAWCS_IBasicInfoService;
@@ -44,6 +45,7 @@
private readonly IKLSLocationInfoService _kLSLocationInfoService;
private readonly IRGVLocationInfoService _rGVLocationInfoService;
private readonly IRepository<Dt_TaskExecuteDetail> _taskExecuteDetailRepository;
+ private readonly IApiInfoService _apiInfoService;
private readonly IMapper _mapper;
private Dictionary<string, OrderByType> _taskOrderBy = new()
@@ -63,7 +65,7 @@
/// </summary>
public IRepository<Dt_Task> Repository => BaseDal;
- public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository, IMapper mapper, IKLSLocationInfoService kLSLocationInfoService, IRGVLocationInfoService rGVLocationInfoService, IHKLocationInfoService hKLocationInfoService) : base(BaseDal)
+ public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository, IMapper mapper, IKLSLocationInfoService kLSLocationInfoService, IRGVLocationInfoService rGVLocationInfoService, IHKLocationInfoService hKLocationInfoService, IApiInfoService apiInfoService) : base(BaseDal)
{
_routerService = routerService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -72,6 +74,7 @@
_kLSLocationInfoService = kLSLocationInfoService;
_rGVLocationInfoService = rGVLocationInfoService;
_hKLocationInfoService = hKLocationInfoService;
+ _apiInfoService = apiInfoService;
}
public WebResponseContent ReceiveWMSTask([NotNull] List<WMSTasksDTO> taskDTOs)
{
@@ -141,7 +144,36 @@
Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode);
if (dt_Task == null) throw new Exception("鏈煡璇㈠埌浠诲姟鍙风浉鍏充换鍔�");
dt_Task.TaskType = TaskOutStatusEnum.OutCancel.ObjToInt();
- BaseDal.UpdateData(dt_Task);
+ // 鍒ゆ柇褰撳墠浠诲姟鏄惁涓哄嚡涔愬＋浠诲姟
+ bool isGALAXISTask = dt_Task.TaskType == (int)TaskTypeEnum.MLInbound ||
+ dt_Task.TaskType == (int)TaskTypeEnum.MLOutbound;
+
+ //鍥涘悜杞�
+ bool isAGV = dt_Task.TaskType == (int)TaskTypeEnum.CPInbound || dt_Task.TaskType == (int)TaskTypeEnum.CPOutbound;
+
+ //娴峰悍
+ bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
+ if (isGALAXISTask)
+ {
+ var KLS = new CancelGALAXISTask {
+ taskId= dt_Task.WMSTaskNum,
+ reportTime=DateTime.Now.ToString()
+ };
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(CancelGALAXISTask));
+ if (apiInfo == null) throw new Exception("鏈壘鍒板嚡涔愬＋AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ string response = HttpHelper.Post(apiInfo.ApiAddress, KLS.Serialize());
+ GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
+ if (agvContent.success == true && agvContent.code == 0)
+ {
+ BaseDal.UpdateData(dt_Task);
+ }
+ else
+ {
+ content.Error("鍙栨秷浠诲姟澶辫触");
+ }
+ }
+
+ //BaseDal.UpdateData(dt_Task);
content.OK("鍙栨秷浠诲姟鎴愬姛",dt_Task);
}
catch (Exception ex)
@@ -165,7 +197,41 @@
Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == updateTaskPriority.taskCode);
if (dt_Task == null) throw new Exception("鏈煡璇㈠埌浠诲姟鍙风浉鍏充换鍔�");
dt_Task.Grade = updateTaskPriority.taskPriority;
- BaseDal.UpdateData(dt_Task);
+ // 鍒ゆ柇褰撳墠浠诲姟鏄惁涓哄嚡涔愬＋浠诲姟
+ bool isGALAXISTask = dt_Task.TaskType == (int)TaskTypeEnum.MLInbound ||
+ dt_Task.TaskType == (int)TaskTypeEnum.MLOutbound;
+
+ //鍥涘悜杞�
+ bool isAGV = dt_Task.TaskType == (int)TaskTypeEnum.CPInbound || dt_Task.TaskType == (int)TaskTypeEnum.CPOutbound;
+
+ //娴峰悍
+ bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound|| dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
+ #region 鍑箰澹�
+ if (isGALAXISTask)
+ {
+ var updateGALAXISTaskGrade = new UpdateGALAXISTaskGrade
+ {
+ taskId = dt_Task.TaskNum.ToString(),
+ reportTime = DateTime.Now.ToString(),
+ district = dt_Task.Roadway,//浠诲姟搴撳尯
+ priorityCode = updateTaskPriority.taskPriority,
+ };
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(UpdateGALAXISTaskGrade));
+ if (apiInfo == null) throw new Exception("鏈壘鍒板嚡涔愬＋AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ string response = HttpHelper.Post(apiInfo.ApiAddress, updateGALAXISTaskGrade.Serialize());
+ GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
+ if (agvContent.success == true && agvContent.code == 0)
+ {
+ BaseDal.UpdateData(dt_Task);
+ }
+ else
+ {
+ content.Error("淇敼浠诲姟浼樺厛绾уけ璐�");
+ }
+ }
+ #endregion
+
+
content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
}
catch (Exception ex)
@@ -179,8 +245,6 @@
/// 淇敼搴撲綅鍒嗗尯
/// </summary>
/// <returns></returns>
- ///
-
public WebResponseContent ModifyWMSLayoutZone(WMSUpdateLocationArea wMSUpdateLocationArea)
{
WebResponseContent content = new WebResponseContent();
@@ -191,27 +255,31 @@
var hk=new List<Dt_HKLocationInfo>();
if(wMSUpdateLocationArea.WarehouseId == 1)
{
- foreach (var LocationCode in wMSUpdateLocationArea.LocationCodes)
+ var rgvList = _rGVLocationInfoService.Repository.QueryData(x =>wMSUpdateLocationArea.LocationCodes.Contains(x.LocationCode)).ToList();
+ foreach (var item in rgvList)
{
- Dt_RGVLocationInfo dt_RGVLocationInfo = _rGVLocationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
- rgv.Add(dt_RGVLocationInfo);
+ item.LocationCode = wMSUpdateLocationArea.UpdateAreaCode;
}
+ rgv.AddRange(rgvList);
}
if (wMSUpdateLocationArea.WarehouseId == 2)
{
- foreach (var LocationCode in wMSUpdateLocationArea.LocationCodes)
+
+ var KLSLocationInfoList = _kLSLocationInfoService.Repository.QueryData(x => wMSUpdateLocationArea.LocationCodes.Contains(x.LocationCode)).ToList();
+ foreach (var item in KLSLocationInfoList)
{
- Dt_KLSLocationInfo dt_KLSLocationInfo = _kLSLocationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
- kls.Add(dt_KLSLocationInfo);
+ item.LocationCode = wMSUpdateLocationArea.UpdateAreaCode;
}
+ kls.AddRange(KLSLocationInfoList);
}
if (wMSUpdateLocationArea.WarehouseId == 3)
{
- foreach (var LocationCode in wMSUpdateLocationArea.LocationCodes)
+ var hkList = _hKLocationInfoService.Repository.QueryData(x => wMSUpdateLocationArea.LocationCodes.Contains(x.LocationCode)).ToList();
+ foreach (var item in hkList)
{
- Dt_HKLocationInfo dt_HKLocationInfo = _hKLocationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
- hk.Add(dt_HKLocationInfo);
+ item.LocationCode = wMSUpdateLocationArea.UpdateAreaCode;
}
+ hk.AddRange(hkList);
}
Db.Ado.BeginTran();
_rGVLocationInfoService.UpdateData(rgv);
--
Gitblit v1.9.3