From 0e450768c357b45701a2e5ed162f4e93b3dd617c Mon Sep 17 00:00:00 2001
From: zhangchengsong <zhangchengsong@hnkhzn.com>
Date: 星期三, 15 四月 2026 20:53:24 +0800
Subject: [PATCH] 最新
---
项目代码/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/WMSTaskService.cs | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 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 1370735..f1ad7fe 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"
@@ -234,7 +234,8 @@
//璁剧疆鍏夊箷
public ApiResponse setCurtain(SetCurtainRequest setCurtain)
{
-
+ //鑾峰彇WMS璋冨彇鐨勫弬鏁�
+ WriteLog.Write_Log("璁剧疆鍏夊箷鎺ュ彛", "璁剧疆鍏夊箷鎺ュ彛淇℃伅", $"搴撳彛鍚嶇О锛氥�恵string.Join(",", setCurtain.Datas)}銆�,鐢宠鐘舵�侊細銆恵setCurtain.Operate}銆�");
ApiResponse apiResponse = new ApiResponse();
bool HandShakeboolOPEN = false;
bool HandShakeboolCLOSE = false;
@@ -259,20 +260,28 @@
if (setCurtain.Operate.Equals("OPEN"))
{
//鍐欏叆plc锛宎gv閫�鍑轰腑鎵撳紑淇″彿
- HandShakeboolOPEN = conveyorLine.Communicator.Write<short>(Request.DeviceProAddress, 0);
-
- WriteLog.Write_Log("璁剧疆鎵撳紑鍏夊箷鎺ュ彛", "璁剧疆鎵撳紑鍏夊箷淇℃伅", $"搴撳彛鍚嶇О锛氥�恵DeStateName}銆戯紝鎵撳紑鍏夊箷淇″彿鍦板潃锛氥�恵Request.DeviceProAddress}銆戯紝璇诲彇鏁版嵁锛氥�恵conveyorLine.Communicator.Read<ushort>(Request.DeviceProAddress)}銆慭n" +
- $"鍐欏叆鎵撳紑鍏夊箷淇″彿鏄惁鎴愬姛杩斿洖鍊硷細銆恵HandShakeboolOPEN}銆�");
+ if(DeStateName == "G01" || DeStateName == "G06" || DeStateName == "G07")
+ {
+ HandShakeboolOPEN = conveyorLine.Communicator.Write<short>(Request.DeviceProAddress, 0);
+ }
+ else
+ {
+ HandShakeboolOPEN = conveyorLine.Communicator.Write<short>(HandShake.DeviceProAddress, 0);
+ }
}
else
{
//鍐欏叆plc锛宎gv杩涘叆鍏抽棴鍏夋爡淇″彿
- HandShakeboolCLOSE = conveyorLine.Communicator.Write<short>(HandShake.DeviceProAddress, 1)&& conveyorLine.Communicator.Write<short>(Request.DeviceProAddress, 1);
+ if (DeStateName == "G01" || DeStateName == "G06" || DeStateName == "G07")
+ {
+ HandShakeboolCLOSE = conveyorLine.Communicator.Write<short>(HandShake.DeviceProAddress, 1) && conveyorLine.Communicator.Write<short>(Request.DeviceProAddress, 1);
+ }
+ else
+ {
+ HandShakeboolCLOSE = conveyorLine.Communicator.Write<short>(HandShake.DeviceProAddress, 1);
+ }
- WriteLog.Write_Log("璁剧疆鍏抽棴鍏夊箷鎺ュ彛", "璁剧疆鍏抽棴鍏夊箷鎺ュ彛淇℃伅", $"搴撳彛鍚嶇О锛氥�恵DeStateName}銆戯紝鍏抽棴鍏夊箷淇″彿鍦板潃锛氥�恵HandShake.DeviceProAddress}銆戯紝璇诲彇鏁版嵁锛氥�恵conveyorLine.Communicator.Read<ushort>(HandShake.DeviceProAddress)}銆�" +
- $"鍏抽棴鍏夊箷淇″彿澶囩敤鍦板潃锛氥�恵Request.DeviceProAddress}銆戯紝璇诲彇鏁版嵁锛氥�恵conveyorLine.Communicator.Read<ushort>(Request.DeviceProAddress)}銆慭n" +
- $"鍐欏叆鍏抽棴鍏夊箷淇″彿鏄惁鎴愬姛杩斿洖鍊硷細銆恵HandShakeboolCLOSE}銆�");
}
}
if ((HandShakeboolOPEN && setCurtain.Operate.Equals("OPEN") )|| (HandShakeboolCLOSE && setCurtain.Operate.Equals("CLOSE")))
@@ -297,7 +306,7 @@
public ApiResponse getAGVStatus(AgvUpdateRequest agvUpdateRequest)
{
//鑾峰彇WMS璋冨彇鐨勫弬鏁�
- WriteLog.Write_Log("agv杩涘嚭鐘舵�佸弽棣堟帴鍙�", "agv杩涘嚭鐘舵�佷俊鎭�", "璋冨彇鍙傛暟", setCurtain);
+ WriteLog.Write_Log("agv杩涘嚭鐘舵�佸弽棣堟帴鍙�", "agv杩涘嚭鐘舵�佷俊鎭�", $"搴撳彛鍚嶇О锛氥�恵agvUpdateRequest.warehousenumber}銆戯紝鐢宠鐘舵�侊細銆恵agvUpdateRequest.agvstatus}銆�");
ApiResponse apiResponse = new ApiResponse();
try
@@ -334,9 +343,6 @@
//鏈夎揣锛屽彲杩涗俊鍙�
statusValue = ((portStatus == 1 && StationStatus == 1) || (portStatus == 2 && StationStatus == 0)) ? 1 : (portStatus == 0) ? 0 : 0;
- WriteLog.Write_Log("鐢宠杩涘叆AGV鍙嶉淇″彿淇℃伅", "鐢宠杩涘叆AGV鍙嶉淇″彿淇℃伅", $"搴撳彛缂栧彿锛氥�恵agvUpdateRequest.warehousenumber}銆戯紝鏄惁鍏佽杩涘叆鍦板潃锛氥�恵deviceProDTO.DeviceProAddress}銆戯紝璇诲彇鏁版嵁锛氥�恵portStatus}銆慭n" +
- $"鏄惁鏈夎揣鍦板潃锛氥�恵StationNumProDTO.DeviceProAddress}銆戯紝璇诲彇鏁版嵁锛氥�恵StationStatus}銆慭n" +
- $"鏄惁鍙繘鍏ヤ俊鍙凤細銆恵statusValue}銆�");
if (agvUpdateRequest.warehousenumber == "G01" || agvUpdateRequest.warehousenumber == "G06" || agvUpdateRequest.warehousenumber == "G07")
{
if (statusValue == 1)
@@ -369,13 +375,6 @@
if (Request != null)
{
conveyorLine.Communicator.Write<short>(Request.DeviceProAddress, 0);
- WriteLog.Write_Log("鐢宠绂诲紑AGV鍙嶉淇″彿淇℃伅", "鐢宠绂诲紑AGV鍙嶉淇″彿淇℃伅", $"搴撳彛缂栧彿锛氥�恵agvUpdateRequest.warehousenumber}銆戯紝鐢宠淇″彿鍦板潃锛氥�恵HandShake.DeviceProAddress}銆戯紝璇诲彇鏁版嵁锛氥�恵conveyorLine.Communicator.Read<ushort>(HandShake.DeviceProAddress)}銆慭n" +
- $"澶囩敤淇″彿鍦板潃锛氥�恵Request.DeviceProAddress}銆戯紝璇诲彇鏁版嵁锛氥�恵conveyorLine.Communicator.Read<ushort>(Request.DeviceProAddress)}銆�");
-
- }
- else
- {
- WriteLog.Write_Log("鐢宠绂诲紑AGV鍙嶉淇″彿淇℃伅", "鐢宠绂诲紑AGV鍙嶉淇″彿淇℃伅", $"搴撳彛缂栧彿锛氥�恵agvUpdateRequest.warehousenumber}銆戯紝鐢宠淇″彿鍦板潃锛氥�恵HandShake.DeviceProAddress}銆戯紝璇诲彇鏁版嵁锛氥�恵conveyorLine.Communicator.Read<ushort>(HandShake.DeviceProAddress)}銆慭n" );
}
return apiResponse.SuccessResponse();
}
--
Gitblit v1.9.3