From 840e04a550be5647a50a015f686ffa45a5e272a9 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 17 三月 2026 11:01:03 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 124 ++++++++++++++++++++++++++--------------
1 files changed, 80 insertions(+), 44 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 b1318e5..a563dd1 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"
@@ -20,6 +20,7 @@
using SqlSugar;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
using WIDESEAWCS_BasicInfoService;
using WIDESEAWCS_Common;
using WIDESEAWCS_Common.LocationEnum;
@@ -37,6 +38,7 @@
using WIDESEAWCS_IBasicInfoService;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Service;
@@ -92,12 +94,12 @@
{
List<object> objects = new List<object>();
foreach (var item in taskDTOs)
- {
+ {
foreach (var task in item.tasks)
{
#region 鍒ゆ柇
- content = TaskHelpMethods.isOkTaskInfo(task, true, true);
- if (!content.Status)
+ var contentStatus = TaskHelpMethods.isOkTaskInfo(task, true, true);
+ if (!contentStatus.Status)
{
objects.Add(new
{
@@ -132,7 +134,7 @@
objects.Add(new
{
taskCode = task.taskCode,
- Message = $"璧风偣浣嶇疆銆恵task.containerCode}銆戝凡瀛樺湪浠诲姟"
+ Message = $"璧风偣浣嶇疆銆恵task.fromLocationCode}銆戝凡瀛樺湪浠诲姟"
});
continue;
//throw new Exception($"璧风偣浣嶇疆銆恵task.containerCode}銆戝凡瀛樺湪浠诲姟");
@@ -207,9 +209,10 @@
var KLS = new CancelGALAXISTask();
CancelHIKROBOTTask cancelHIKROBOTTask = new CancelHIKROBOTTask();
CancelSXCTake cancelSXCTake = new CancelSXCTake();
+ var deviceName = "";
try
{
- Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode);
+ Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode&&x.TaskType!=TaskTypeEnum.CPMoveInventory.ObjToInt());
if (dt_Task == null) throw new Exception("鏈煡璇㈠埌浠诲姟鍙风浉鍏充换鍔�");
// 鍒ゆ柇褰撳墠浠诲姟鏄惁涓哄嚡涔愬＋浠诲姟
@@ -224,6 +227,7 @@
#region 鍑箰澹�
if (isGALAXISTask)
{
+ deviceName= "鍑箰澹獳GV";
KLS = new CancelGALAXISTask
{
taskId = dt_Task.WMSTaskNum,
@@ -251,31 +255,42 @@
#region 鍥涘悜杞�
if (isAGV)
{
- cancelSXCTake = new CancelSXCTake
+ deviceName = "鍥涘悜杞�";
+ if (dt_Task.RGVTaskId==0)
{
- taskID = dt_Task.RGVTaskId,
- withoutRunning = 1
- };
- 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>();
- content.OK(data: fOURBOTReturn);
- if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn.returnUserMsg == "鎴愬姛")
- {
- //鐩存帴绉诲叆鍘嗗彶
- BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
+ BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩鍒犻櫎);
content.OK($"鍙栨秷{dt_Task.WMSTaskNum}浠诲姟鎴愬姛", dt_Task);
}
else
{
- content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触{fOURBOTReturn.data}");
+ cancelSXCTake = new CancelSXCTake
+ {
+ taskID = dt_Task.RGVTaskId,
+ withoutRunning = 1
+ };
+ 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>();
+ content.OK(data: fOURBOTReturn);
+ if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn.returnUserMsg == "鎴愬姛")
+ {
+ //鐩存帴绉诲叆鍘嗗彶
+ BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
+ content.OK($"鍙栨秷{dt_Task.WMSTaskNum}浠诲姟鎴愬姛", dt_Task);
+ }
+ else
+ {
+ content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触{fOURBOTReturn.data}");
+ }
}
}
#endregion
+
#region 娴峰悍
if (isHK)
{
+ deviceName = "娴峰悍鏈哄櫒浜�";
cancelHIKROBOTTask = new CancelHIKROBOTTask
{
robotTaskCode = dt_Task.WMSTaskNum,
@@ -307,30 +322,7 @@
}
finally
{
- // 鍦� finally 涓垽鏂摢涓璞¤璧嬪�间簡
- object logObject = null;
- string deviceName = "";
-
- if (KLS != null)
- {
- logObject = KLS;
- deviceName = "鍑箰澹獳GV";
- }
- else if (cancelHIKROBOTTask != null)
- {
- logObject = cancelHIKROBOTTask;
- deviceName = "娴峰悍鏈哄櫒浜�";
- }
- else if (cancelSXCTake != null)
- {
- logObject = cancelSXCTake;
- deviceName = "鍥涘悜杞�";
- }
-
- if (logObject != null)
- {
- _trackloginfoService.AddTrackLog(logObject, content, $"鍙栨秷{deviceName}浠诲姟,", "", "");
- }
+ _trackloginfoService.AddTrackLog(wMSCancelTask, content, $"鍙栨秷{deviceName}浠诲姟,", "", "");
}
return content;
}
@@ -1133,7 +1125,22 @@
}
else if (getLocationInfo.WarehouseId == 5)
{
-
+ //璇诲彇鍏夌數淇″彿
+ var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice;
+ if (device == null) throw new Exception("鏈壘鍒�1妤艰川妫�闂ㄨ澶囦俊鎭�") ;
+ if (!device.IsConnected) throw new Exception("PLC1妤艰川妫�闂ㄨ澶囪繛鎺ュけ璐�");
+ var sta = _stationMangerService.Repository.QueryData(x => x.Remark == "鎴愬搧搴�");
+ foreach (var item in sta)
+ {
+ bool value = device.GetValue<QualityInspectionCommandEnum,bool>(QualityInspectionCommandEnum.R_StockAvailableSymbol, item.StationCode);
+ list.Add(new
+ {
+ LoctionCode = item.StationCode,
+ LocationStatus = value?100:0,
+ EnableStatus = 0,
+ });
+ }
+ content.OK(data: list);
}
}
catch (Exception ex)
@@ -1297,5 +1304,34 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+
+
+ public override WebResponseContent DeleteData(object[] keys)
+ {
+ try
+ {
+ // 鏌ユ壘鎵�鏈変换鍔′腑鍖呭惈杩欎釜id鐨�
+ var take = BaseDal.QueryData(x => keys.Contains(x.TaskId));
+
+ // 鎵ц绉诲叆鍘嗗彶鎿嶄綔锛屽苟妫�鏌ョ粨鏋�
+ bool moveResult = BaseDal.DeleteAndMoveIntoHty(take, OperateTypeEnum.浜哄伐鍒犻櫎);
+
+ if (!moveResult)
+ {
+ // 绉诲叆鍘嗗彶澶辫触锛岃繑鍥為敊璇俊鎭�
+ return WebResponseContent.Instance.Error("绉诲叆鍘嗗彶璁板綍澶辫触");
+ }
+ return WebResponseContent.Instance.OK("鍒犻櫎鎴愬姛锛屾暟鎹凡绉诲叆鍘嗗彶");
+ }
+ catch (Exception ex)
+ {
+ // 璁板綍寮傚父鏃ュ織
+ // Logger.Error(ex.Message);
+ return WebResponseContent.Instance.Error("鍒犻櫎澶辫触锛�" + ex.Message);
+ }
+ }
+
+
+
}
}
--
Gitblit v1.9.3