From 4071804c634644d77fb9dc00719ba8b0d5f89263 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Thu, 23 Nov 2023 15:38:18 +0800 Subject: [PATCH] 1 --- ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs index 051a456d..7bd25207 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs @@ -553,9 +553,9 @@ namespace Tnb.ProductionMgr .LeftJoin((a, b) => a.create_id == b.Id) .LeftJoin((a,b,c)=>a.id==c.source_id) .LeftJoin((a,b,c,d)=>d.EnCode==DictConst.DOCUMENTSTATU) - .LeftJoin((a,b,c,d,e)=>e.DictionaryTypeId==d.Id && a.status==e.EnCode) + .LeftJoin((a,b,c,d,e)=>e.DictionaryTypeId==d.Id && c.status==e.Id) .Where((a,b)=>a.workstation_id==input.stationId) - .WhereIF(statusList.Count>0,(a,b,c,d,e)=>statusList.Contains(e.EnCode)) + .WhereIF(statusList.Count>0,(a,b,c,d,e)=>statusList.Contains(SqlFunc.IsNull(e.EnCode,a.status))) .Select((a, b,c,d,e) => new FeedingRecordListOutput() { id = a.id, @@ -571,9 +571,9 @@ namespace Tnb.ProductionMgr .LeftJoin((a, b) => a.create_id == b.Id) .LeftJoin((a,b,c)=>a.id==c.source_id) .LeftJoin((a,b,c,d)=>d.EnCode==DictConst.DOCUMENTSTATU) - .LeftJoin((a,b,c,d,e)=>e.DictionaryTypeId==d.Id && a.status==e.EnCode) + .LeftJoin((a,b,c,d,e)=>e.DictionaryTypeId==d.Id && c.status==e.Id) .Where((a,b)=>a.workstation_id==input.stationId) - .WhereIF(statusList.Count>0,(a,b,c,d,e)=>statusList.Contains(e.EnCode)) + .WhereIF(statusList.Count>0,(a,b,c,d,e)=>statusList.Contains(SqlFunc.IsNull(e.EnCode,a.status))) .Select((a, b,c,d,e) => new FeedingRecordListOutput() { id = a.id,