From f23e0326aa05a1c5b47d4aec4c06e73d0d86b8e7 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期二, 29 七月 2025 17:43:15 +0800
Subject: [PATCH] 代码提交
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DispatchInfoService.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DispatchInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DispatchInfoService.cs"
index 858681c..dfd441e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DispatchInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DispatchInfoService.cs"
@@ -55,7 +55,7 @@
/// <returns>杩斿洖璋冨害鏈嶅姟JobDTO闆嗗悎銆�</returns>
public List<DispatchInfoDTO> QueryDispatchInfos()
{
- return Db.Queryable<Dt_DispatchInfo, Dt_DeviceInfo>((a, b) => a.JobGroup == b.DeviceType && b.DeviceStatus == ((int)DeviceStatusEnum.Enable).ToString()).Select((a, b) => new DispatchInfoDTO
+ return Db.Queryable<Dt_DispatchInfo>().LeftJoin<Dt_DeviceInfo>((a, b) => a.Id == b.DispatchId).Select((a, b) => new DispatchInfoDTO
{
JobGroup = a.JobGroup,
AssemblyName = a.AssemblyName,
@@ -71,8 +71,9 @@
ModifyDate = a.ModifyDate,
Name = a.Name,
Remark = a.Remark,
- DeviceType = b.DeviceType
- }).ToList();
+ DeviceType = b.DeviceType,
+ Enable = (b.DeviceStatus) ?? (((int)DeviceStatusEnum.Enable).ToString())
+ }).ToList().Where(b => b.Enable == ((int)DeviceStatusEnum.Enable).ToString()).ToList();
}
public async Task<WebResponseContent> GetDispatchInfosAsync()
--
Gitblit v1.9.3