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/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Partial/Method.cs |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Partial/Method.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Partial/Method.cs
index a7eb02b..9000e31 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Partial/Method.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Partial/Method.cs
@@ -4,6 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_QuartzJob.DeviceBase;
 
 namespace WIDESEAWCS_BasicInfoService
 {
@@ -11,7 +12,14 @@
     {
         public List<Dt_StationManager> GetAllStationByDeviceCode(string DeviceCode)
         {
-            return BaseDal.QueryData(x => x.stationPLC == DeviceCode).ToList();
+            //todo锛� 浣跨敤缂撳瓨鍌ㄥ瓨
+            return BaseDal.QueryData(x => x.stationPLC == DeviceCode && x.stationStatus == "1").ToList();
         }
+
+        public Dt_StationManager GetStationInfoByChildCode(string ChildCode, string area)
+        {
+            return BaseDal.QueryFirst(x => x.stationChildCode == ChildCode && x.stationArea == area && x.stationStatus == "1");
+        }
+
     }
 }

--
Gitblit v1.9.3