From e8042fe43a178ca26fe4fe4f8cf5dedbfc9910fd Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 03 七月 2025 10:50:24 +0800
Subject: [PATCH] 更新任务查询逻辑以包含条形码在CommonConveyorLineJob.cs和 CommonConveyorLine_GWJob.cs文件中,修改了多个任务查询方法,现支持使用任务号、子设备代码和条形码进行查询。这一改动旨在提高任务查询的准确性。同时,移除了不再需要的注释代码行。

---
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs |   35 ++++++++++++++++++++++++++---------
 1 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs
index aad02cc..8a4b227 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs
@@ -1,9 +1,4 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+锘縰sing System.ComponentModel;
 
 namespace WIDESEA_Core.Enums
 {
@@ -94,10 +89,25 @@
         NotAllow = 2
     }
 
+    public enum LocationType
+    {
+        /// <summary>
+        /// 鍗曟繁璐т綅
+        /// </summary>
+        [Description("鍗曟繁璐т綅")]
+        Single = 1,
+
+        /// <summary>
+        /// 鍙屾繁璐т綅
+        /// </summary>
+        [Description("鍙屾繁璐т綅")]
+        Double = 2
+    }
+
     #region 浠诲姟绫诲瀷
 
     /// <summary>
-    /// 浠诲姟绫诲瀷   
+    /// 浠诲姟绫诲瀷
     /// </summary>
 
     public enum TaskInboundTypeEnum
@@ -175,13 +185,19 @@
         /// NG鍑哄簱
         /// </summary>
         [Description("NG鍑哄簱")]
-        OutNG =105,
+        OutNG = 105,
 
         /// <summary>
         /// 鐩存帴鍑哄簱
         /// </summary>
         [Description("鐩存帴鍑哄簱")]
         InToOut = 106,
+
+        /// <summary>
+        /// 鐏鍑哄簱
+        /// </summary>
+        [Description("鐏鍑哄簱")]
+        OutFireAlarm = 500,
     }
 
     public enum TaskRelocationTypeEnum
@@ -202,6 +218,7 @@
     public enum TaskOtherTypeEnum
     {
     }
+
     public enum TaskTypeEnum
     {
         /// <summary>
@@ -262,7 +279,7 @@
         /// <summary>
         /// 搴撳绉诲簱
         /// </summary>
-        RelocationOut = 302
+        RelocationOut = 302,
     }
 
     #endregion 浠诲姟绫诲瀷

--
Gitblit v1.9.3