From 58a5a9af83492c5bbb4fba88b4443f08fa4becfc Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 17 十二月 2024 19:53:14 +0800
Subject: [PATCH] 解决冲突
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Partial/Method.cs | 9 ++++++++-
1 files changed, 8 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 c80e720..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,7 +13,13 @@
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 && x.stationStatus == "1");
+ }
+
}
}
--
Gitblit v1.9.3