From b2c070eaf8cc59b40d27bda904312d0c394a51f4 Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期五, 20 六月 2025 17:23:37 +0800
Subject: [PATCH] 开发与优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/process/TaskProcess.cs | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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..8fc972b 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,7 +126,7 @@
{
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;
@@ -145,7 +146,9 @@
{
var task = WCSHelper.GetTaskByOpName(mst.S_OP_CODE, 3);
if (task != null)
- { result = true; }
+ {
+ result = true;
+ }
}
}
if (mst.S_TYPE == "鍑哄簱")
@@ -155,7 +158,23 @@
{
var task = WCSHelper.GetTaskByOpName(mst.S_OP_CODE, 3);
if (task != null)
- { result = true; }
+ {
+ 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