From 557058f03533e730f5379e311f492f471244969a Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期六, 21 十二月 2024 11:00:03 +0800
Subject: [PATCH] 更新.gitignore以排除SemanticSymbols.db文件，新增MemoryLockManager类以管理任务锁，优化Dt_TaskService中的入库任务创建逻辑
---
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