From 38f7aa5340b760d639263959aa59f87c512e75fa Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期六, 19 七月 2025 19:18:28 +0800
Subject: [PATCH] 双钱-点对点、满托出库上线、暂时取消RFID读卡器校验 双钱：取消任务收到4取货完成后，不会再次解锁重置起点
---
device/ScanCodeHelper.cs | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/device/ScanCodeHelper.cs b/device/ScanCodeHelper.cs
index 415ed2b..4c0f05f 100644
--- a/device/ScanCodeHelper.cs
+++ b/device/ScanCodeHelper.cs
@@ -53,15 +53,20 @@
{
var db = new SqlHelper<TN_Task>().GetInstance();
var task = new TN_Task();
- task = db.Queryable<TN_Task>().Where(a => a.S_EQ_NO == agvCode && a.N_B_STATE == 2).OrderByDescending(b => b.T_CREATE).First();
- if (task != null && RFID.Contains(task.S_CNTR_CODE))
+ task = db.Queryable<TN_Task>().Where(a => a.S_EQ_NO == agvCode).OrderByDescending(b => b.T_START_TIME).First();
+ if (task != null &&
+ (
+ RFID == task.S_CNTR_CODE
+ || RFID.Contains(task.S_CNTR_CODE)
+ || task.S_CNTR_CODE.Contains(RFID)
+ ))
{
- LogHelper.Info($"鏍￠獙鎴愬姛Agv锛歿agvCode}瀹瑰櫒鍙凤細{RFID}");
+ LogHelper.Info($"鏍￠獙鎴愬姛Agv锛歿agvCode}锛岃鍗″櫒鐨勫鍣ㄥ彿锛歿RFID}锛屼换鍔＄殑瀹瑰櫒鍙凤細{ task.S_CNTR_CODE}");
return true;
}
else
{
- LogHelper.Info($"鏍￠獙澶辫触Agv锛歿agvCode}瀹瑰櫒鍙凤細{RFID}");
+ LogHelper.Info($"鏍￠獙澶辫触Agv锛歿agvCode}锛岃鍗″櫒鐨勫鍣ㄥ彿锛歿RFID}锛屼换鍔＄殑瀹瑰櫒鍙凤細{ task?.S_CNTR_CODE ?? "浠诲姟鏈壘鍒�}");
//鏍￠獙澶辫触灏卞彇娑堜换鍔� //var task1 = Task.Run(() =>
--
Gitblit v1.9.1