From bc8d5d9f033b638e97007c8a9cec8a703879fcbe Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 27 二月 2026 18:15:33 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 96 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 75 insertions(+), 21 deletions(-)
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 92506be..507cece 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"
@@ -16,6 +16,7 @@
#endregion << 鐗� 鏈� 娉� 閲� >>
using AutoMapper;
+using Dm;
using SqlSugar;
using System.Diagnostics.CodeAnalysis;
using System.Threading.Tasks;
@@ -25,8 +26,10 @@
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
+using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_DTO;
+using WIDESEAWCS_DTO.RGV.FOURBOT;
using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_DTO.WMS;
using WIDESEAWCS_IBasicInfoService;
@@ -144,21 +147,23 @@
{
Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode);
if (dt_Task == null) throw new Exception("鏈煡璇㈠埌浠诲姟鍙风浉鍏充换鍔�");
- dt_Task.TaskType = TaskOutStatusEnum.OutCancel.ObjToInt();
+
// 鍒ゆ柇褰撳墠浠诲姟鏄惁涓哄嚡涔愬＋浠诲姟
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;
+ //杩欓噷灏嗙姸鎬佹敼鍙樹簡198鍙栨秷浠诲姟
+ dt_Task.TaskType = TaskStatusEnum.WMSCancel.ObjToInt();
+ #region
if (isGALAXISTask)
{
- var KLS = new CancelGALAXISTask {
- taskId= dt_Task.WMSTaskNum,
- reportTime=DateTime.Now.ToString()
+ 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浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
@@ -166,16 +171,41 @@
GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
if (agvContent.success == true && agvContent.code == 0)
{
- BaseDal.UpdateData(dt_Task);
+ //鐩存帴绉诲叆鍘嗗彶
+ BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
+ return content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
}
else
{
- content.Error("鍙栨秷浠诲姟澶辫触");
+ return content.Error($"浠诲姟澶辫触{agvContent.data.returnInfo}");
+
}
}
+ #endregion
- //BaseDal.UpdateData(dt_Task);
- content.OK("鍙栨秷浠诲姟鎴愬姛",dt_Task);
+ #region 鍥涘悜杞�
+ if (isAGV)
+ {
+ CancelSXCTake cancelSXCTake = new CancelSXCTake
+ {
+ taskID = dt_Task.RGVTaskId
+ };
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(CancelSXCTake));
+ if (apiInfo == null) throw new Exception("鏈壘鍒板嚡涔愬＋AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ string response = HttpHelper.Post(apiInfo.ApiAddress, cancelSXCTake.Serialize());
+ FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn.returnUserMsg == "鎴愬姛")
+ {
+ //鐩存帴绉诲叆鍘嗗彶
+ BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
+ return content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
+ }
+ else
+ {
+ return content.Error($"浠诲姟澶辫触{fOURBOTReturn.data}");
+ }
+ }
+ #endregion
}
catch (Exception ex)
{
@@ -197,7 +227,7 @@
{
Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == updateTaskPriority.taskCode);
if (dt_Task == null) throw new Exception("鏈煡璇㈠埌浠诲姟鍙风浉鍏充换鍔�");
- dt_Task.Grade = updateTaskPriority.taskPriority;
+
// 鍒ゆ柇褰撳墠浠诲姟鏄惁涓哄嚡涔愬＋浠诲姟
bool isGALAXISTask = dt_Task.TaskType == (int)TaskTypeEnum.MLInbound ||
dt_Task.TaskType == (int)TaskTypeEnum.MLOutbound;
@@ -206,13 +236,15 @@
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;
+ 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;
+ //淇敼鍘熸湰浠诲姟浼樺厛绾�
+ dt_Task.Grade = updateTaskPriority.taskPriority;
#region 鍑箰澹�
if (isGALAXISTask)
{
var updateGALAXISTaskGrade = new UpdateGALAXISTaskGrade
{
- taskId = dt_Task.TaskNum.ToString(),
+ taskId = dt_Task.WMSTaskNum,
reportTime = DateTime.Now.ToString(),
district = dt_Task.Roadway,//浠诲姟搴撳尯
priorityCode = updateTaskPriority.taskPriority,
@@ -223,17 +255,39 @@
GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
if (agvContent.success == true && agvContent.code == 0)
{
- BaseDal.UpdateData(dt_Task);
+
+ return content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
}
- else
- {
- content.Error("淇敼浠诲姟浼樺厛绾уけ璐�");
+ else {
+ return content.Error($"浠诲姟澶辫触{agvContent.data.returnInfo}");
}
}
#endregion
+ #region 鍥涘悜杞�
+ if (isAGV)
+ {
+ var request = new UpdateAgvSXCTake
+ {
+ taskID = dt_Task.RGVTaskId,
+ priority = updateTaskPriority.taskPriority
+ };
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(UpdateAgvSXCTake));
+ if (apiInfo == null) throw new Exception("鏈壘鍒板嚡涔愬＋AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ string response = HttpHelper.Post(apiInfo.ApiAddress, request.Serialize());
+ FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn .returnUserMsg== "鎴愬姛")
+ {
- content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ return content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ }
+ else
+ {
+ return content.Error($"浠诲姟澶辫触{fOURBOTReturn.data}");
+ }
+ }
+ #endregion
+
}
catch (Exception ex)
{
@@ -259,7 +313,7 @@
var rgvList = _rGVLocationInfoService.Repository.QueryData(x =>wMSUpdateLocationArea.LocationCodes.Contains(x.LocationCode)).ToList();
foreach (var item in rgvList)
{
- item.LocationCode = wMSUpdateLocationArea.UpdateAreaCode;
+ item.WarehouseId = wMSUpdateLocationArea.UpdateAreaCode.ObjToInt();
}
rgv.AddRange(rgvList);
}
@@ -269,7 +323,7 @@
var KLSLocationInfoList = _kLSLocationInfoService.Repository.QueryData(x => wMSUpdateLocationArea.LocationCodes.Contains(x.LocationCode)).ToList();
foreach (var item in KLSLocationInfoList)
{
- item.LocationCode = wMSUpdateLocationArea.UpdateAreaCode;
+ item.WarehouseId = wMSUpdateLocationArea.UpdateAreaCode.ObjToInt();
}
kls.AddRange(KLSLocationInfoList);
}
@@ -278,7 +332,7 @@
var hkList = _hKLocationInfoService.Repository.QueryData(x => wMSUpdateLocationArea.LocationCodes.Contains(x.LocationCode)).ToList();
foreach (var item in hkList)
{
- item.LocationCode = wMSUpdateLocationArea.UpdateAreaCode;
+ item.WarehouseId = wMSUpdateLocationArea.UpdateAreaCode.ObjToInt();
}
hk.AddRange(hkList);
}
--
Gitblit v1.9.3