From f590d457f629d4a7cf6a5e2f77f5454d807e90db Mon Sep 17 00:00:00 2001
From: zhangchengsong <zhangchengsong@hnkhzn.com>
Date: 星期三, 08 四月 2026 14:09:15 +0800
Subject: [PATCH] 添加手动删除任务按钮功能
---
项目代码/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/WMSTaskService.cs | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/WMSTaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/WMSTaskService.cs"
index e011e25..dcb91f9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/WMSTaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/WMSTaskService.cs"
@@ -17,6 +17,7 @@
using AutoMapper;
using Castle.Components.DictionaryAdapter.Xml;
+using HslCommunication;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Microsoft.OpenApi.Any;
@@ -185,9 +186,16 @@
//鏄惁鏈夎揣
int StationStatus = conveyorLine.Communicator.Read<ushort>(StationNumProDTO.DeviceProAddress);
- //鏈夎揣锛屽彲杩涗俊鍙�
- statusValue = ((portStatus == 1 && StationStatus == 1) || (portStatus == 2 && StationStatus == 0)) ? 1 : (portStatus == 0) ? 0 : 0;
+ if(DeStateName== "G01" || DeStateName == "G06" || DeStateName == "G07")
+ {
+ //鏈夎揣锛屽彲杩涗俊鍙�
+ statusValue = (portStatus == 1 && StationStatus == 1) ? 1 : (portStatus == 2 && StationStatus == 0) ?0: (portStatus == 0) ? 0 : 0;
+ }
+ else
+ {
+ statusValue = StationStatus == 1 ? 0 : 1;
+ }
portStatusDict[DeStateName] = statusValue;
}
@@ -274,8 +282,13 @@
int statusValue = 0;
int portStatus = conveyorLine.Communicator.Read<ushort>(deviceProDTO.DeviceProAddress);
int StationStatus = conveyorLine.Communicator.Read<ushort>(StationNumProDTO.DeviceProAddress);
+
//鏈夎揣锛屽彲杩涗俊鍙�
statusValue = ((portStatus == 1 && StationStatus == 1) || (portStatus == 2 && StationStatus == 0)) ? 1 : (portStatus == 0) ? 0 : 0;
+ WriteLog.Write_Log("AGV鍙嶉淇″彿淇℃伅", "AGV鍙嶉淇″彿淇℃伅", $"鏄惁鍏佽杩涘叆鍦板潃锛氥�恵deviceProDTO.DeviceProAddress}銆戯紝璇诲彇鏁版嵁锛氥�恵portStatus}銆慭n" +
+ $"鏄惁鏈夎揣鍦板潃锛氥�恵StationNumProDTO.DeviceProAddress}銆戯紝璇诲彇鏁版嵁锛氥�恵StationStatus}銆慭n" +
+ $"鏈夎揣鍙繘鍏ヤ俊鍙凤細銆恵statusValue}銆�");
+
if (statusValue == 1)
{
return apiResponse.SuccessResponse();
@@ -328,17 +341,20 @@
taskInfo1.taskType = taskType;
taskInfo1.invType = invType;
taskInfo1.psd = "akjfapjfpadaoif";
+
commandResult = HttpHelper.Post<CommandResult>(urlWMStaskreturn, taskInfo1, "浠诲姟鐘舵�佸洖璋�");
- WriteLog.Write_Log("鍚屾缁欎笂娓稿弽棣堜换鍔″畬鎴�", "浠诲姟淇℃伅", $"浠诲姟鍙凤細{taskId}", $"璋冨彇鍙傛暟锛歿taskInfo1.ToJson()},杩斿洖鍙傛暟锛歿commandResult.ToJson()}");
+ WriteLog.Write_Log("鍚屾缁欎笂娓稿弽棣堜换鍔″畬鎴�", "浠诲姟淇℃伅", $"浠诲姟鍙凤細{taskId}", $"璋冨彇鍙傛暟锛歿taskInfo1.ToJsonString()},杩斿洖鍙傛暟锛歿commandResult.ToJsonString()}");
return commandResult;
}
catch (Exception ex)
{
+ Console.WriteLine("璋冨彇涓婃父鎺ュ彛閿欒锛氬師鍥狅細"+ex.Message);
commandResult.status = "error";
- commandResult.result = $"WCS鎺ュ彛閿欒锛屽師鍥狅細{ex.Message}";
+ string resujos = $"WCS鎺ュ彛閿欒锛屽師鍥狅細{ex.Message}";
+ commandResult.result = resujos.ToJsonString();
- WriteLog.Write_Log("鍚屾缁欎笂娓稿弽棣堜换鍔″畬鎴�", "浠诲姟淇℃伅", $"浠诲姟鍙凤細{taskId}", $"WCS鎺ュ彛閿欒锛屽師鍥狅細{ex.Message}");
+ WriteLog.Write_Log("鍚屾缁欎笂娓稿弽棣堜换鍔″畬鎴�", "浠诲姟淇℃伅", $"浠诲姟鍙凤細{taskId}", $"闇�瑕佷笂浼燱MS淇℃伅鍐呭锛歿commandResult.ToJsonString()},WCS鎺ュ彛閿欒锛屽師鍥狅細{ex.Message}");
return commandResult;
}
@@ -376,7 +392,9 @@
catch (Exception ex)
{
commandResult.status = "error";
- commandResult.result = $"WCS鎺ュ彛閿欒锛屽師鍥狅細{ex.Message}";
+ string resujos = $"WCS鎺ュ彛閿欒锛屽師鍥狅細{ex.Message}";
+ commandResult.result = resujos.ToJsonString();
+
WriteLog.Write_Log("鍚屾缁欎笂娓歌澶囨晠闅滀俊鎭�", "璁惧鏁呴殰淇℃伅", $"璁惧id锛歿devuuid}锛屽け璐�", $"WCS鎺ュ彛閿欒锛屽師鍥狅細{ex.Message}");
return commandResult;
@@ -404,7 +422,9 @@
catch (Exception ex)
{
commandResult.status = "error";
- commandResult.result = $"WCS鎺ュ彛閿欒锛屽師鍥狅細{ex.Message}";
+ string resujos = $"WCS鎺ュ彛閿欒锛屽師鍥狅細{ex.Message}";
+ commandResult.result = resujos.ToJsonString();
+
WriteLog.Write_Log("鍚屾缁欎笂娓告彁鍗囧埌浣嶄俊鎭�", "淇℃伅鍐呭", $"閿欒淇℃伅", $"WCS鎺ュ彛閿欒锛屽師鍥狅細{ex.Message}");
return commandResult;
}
--
Gitblit v1.9.3