From 0e829f4a5321c10900e1f4130a80f2e8c804a08e Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 19 六月 2025 17:30:47 +0800
Subject: [PATCH] 修复取消订单和更改终点货区流程与国自AGV交互的部分细节问题
---
core/WCSCore.cs | 34 +++-------------------------------
1 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index 61e832b..c904e6f 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -2,7 +2,6 @@
using HH.WCS.Mobox3.AnGang.dispatch;
using HH.WCS.Mobox3.AnGang.models;
using HH.WCS.Mobox3.AnGang.process;
-using HH.WCS.Mobox3.AnGang.config;
using Newtonsoft.Json;
using SqlSugar;
using System;
@@ -20,7 +19,7 @@
public static ReturnResult OperateAgvTaskStatus(AgvTaskState model) {
var result = new ReturnResult();
try {
- if (model.state > 0 && model.state < 1000) {
+ if (model.state > 0) {
// AGV 鎵ц浠诲姟鐨勯�杈戝鐞� if (!AgvTaskProcessOk(model)) {
// 鎵ц涓峅K锛岃鏄庢病鏈夋壘鍒颁换鍔�@@ -348,37 +347,10 @@
}
}
+ // DOC 4. 绔欏彴鐢宠瀹夊叏浜や簰 RCS->WMS
public static ReturnResult SafetyInteraction(SafetyInteractionInfo model) {
var gzResult = new ReturnResult();
- //var db = new SqlHelper<object>().GetInstance();
- //ModbusHelper.Relink();
-
- //var productionLineInfo = Settings.ProductionLines[0];
- //var prodLineDevice = new ProductionLineDevice(productionLineInfo.PlcIp, productionLineInfo.PlcPort);
- //if (!prodLineDevice.LoadDeviceStateOk()) {
- // LogHelper.Info("鍔犺浇璁惧淇℃伅澶辫触");
- //}
-
- //var tn_task = db.Queryable<TN_Task>().First(a => a.S_CODE == model.task_no);
- //if (tn_task == null) {
- // LogHelper.Info($"浠诲姟鍙�'{model.task_no}' 涓嶅瓨鍦�);
- //}
-
- //if (prodLineDevice.SystemState == 1
- // && prodLineDevice.FullOffline == 1 && tn_task.S_TYPE == "鎴愬搧鑳朵笅绾�鎵樼洏(WMS)") {
- // if (!prodLineDevice.SetAgvPicking(1)) {
- // LogHelper.Info("鍐欏叆杈撻�绾�PLC 澶辫触");
- // }
- //}
-
- //if (prodLineDevice.SystemState == 1
- // && prodLineDevice.AllowAgvPlacePallet == 1 && tn_task.S_TYPE == "绌烘墭鐩樹笂绾�WMS)") {
- // if (!prodLineDevice.SetAgvPlacingPallet(1)) {
- // LogHelper.Info("鍐欏叆杈撻�绾�PLC 澶辫触");
- // }
- //}
-
- //LogHelper.Info(JsonConvert.SerializeObject(prodLineDevice, Formatting.Indented));
+ // 鐩墠璇ラ」鐩病鏈夌珯鍙板畨鍏ㄤ氦浜掔殑鍔熻兘
return gzResult;
}
}
--
Gitblit v1.9.1