From ba528c7a15058967ee3af7364035209aa0048025 Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期一, 07 七月 2025 17:30:14 +0800
Subject: [PATCH] 测试优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/process/TaskProcess.cs | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/process/TaskProcess.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/process/TaskProcess.cs
index 348d2b3..35e6e66 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/process/TaskProcess.cs
@@ -8,6 +8,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Reflection.Emit;
using System.Security.Cryptography;
using System.Text;
using static HH.WCS.DaYang.api.ApiModel;
@@ -125,27 +126,31 @@
{
Result<DeviceStatusModel> DeviceStatu = httpHelper.GetDeviceStatus(new string[] { mst.S_END_LOC }, tableUrl.url);
//璁惧鐘舵�绌哄垯鍏佽鎺ㄩ�
- if (DeviceStatu != null && DeviceStatu.Data[0].PhotoStatus == 0)
+ if (DeviceStatu != null && DeviceStatu.Data.PhotoStatus == 0)
{
- result = true;
+
}
else
{
LogHelper.Info($"Intercept:璁惧鐘舵�涓嶅厑璁告帹閫�);
+ result = true;
}
}
else
{
LogHelper.Info($"Intercept:鑾峰彇鎺ュ彛url澶辫触");
+ result = true;
}
}
}
if (mst.N_SCHEDULE_TYPE == 2)
{
var task = WCSHelper.GetTaskByOpName(mst.S_OP_CODE, 3);
- if (task != null)
- { result = true; }
+ if (task == null)
+ {
+ result = true;
+ }
}
}
if (mst.S_TYPE == "鍑哄簱")
@@ -154,8 +159,24 @@
if (mst.N_SCHEDULE_TYPE == 1)
{
var task = WCSHelper.GetTaskByOpName(mst.S_OP_CODE, 3);
- if (task != null)
- { result = true; }
+ if (task == null)
+ {
+ result = true;
+ }
+ }
+ else
+ {
+ //濡傛灉褰撳墠浠诲姟涓嶆槸绉诲簱浠诲姟锛岄渶瑕佸垽鏂Щ搴撲换鍔℃槸鍚﹀畬鎴�+ if (mst.S_TYPE != "绉诲簱")
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ var ykmst = db.Queryable<WCSTask>().Where(a => a.S_OP_CODE == mst.S_OP_NAME && a.N_B_STATE == 3 && a.S_TYPE == "绉诲簱").First();
+ if (ykmst != null)
+ {
+ result = true;
+ }
+ }
+
}
}
#endregion
--
Gitblit v1.9.1