From 96b1afcbf80cd6b12c1108b61ba2cef1345b1398 Mon Sep 17 00:00:00 2001 From: xxyy <cathay_xy@163.com> Date: 星期三, 12 二月 2025 17:33:20 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu --- Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Partial/Method.cs | 5 +++-- 1 files changed, 3 insertions(+), 2 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 d08878e..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 { @@ -12,12 +13,12 @@ public List<Dt_StationManager> GetAllStationByDeviceCode(string DeviceCode) { //todo锛� 浣跨敤缂撳瓨鍌ㄥ瓨 - return BaseDal.QueryData(x => x.stationPLC == DeviceCode).ToList(); + 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); + return BaseDal.QueryFirst(x => x.stationChildCode == ChildCode && x.stationArea == area && x.stationStatus == "1"); } } -- Gitblit v1.9.3