wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
yang.lee
2023-11-23 15:51:58 +08:00
parent 5e92c00df0 c18e5cd2d1
commit 8c47021064
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs
View File

@@ -553,9 +553,9 @@ namespace Tnb.ProductionMgr
.LeftJoin<UserEntity>((a, b) => a.create_id == b.Id)
.LeftJoin<WmsKittingoutH>((a,b,c)=>a.id==c.source_id)
.LeftJoin<DictionaryTypeEntity>((a,b,c,d)=>d.EnCode==DictConst.DOCUMENTSTATU)
.LeftJoin<DictionaryDataEntity>((a,b,c,d,e)=>e.DictionaryTypeId==d.Id && a.status==e.EnCode)
.LeftJoin<DictionaryDataEntity>((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<UserEntity>((a, b) => a.create_id == b.Id)
.LeftJoin<WmsOutstockH>((a,b,c)=>a.id==c.source_id)
.LeftJoin<DictionaryTypeEntity>((a,b,c,d)=>d.EnCode==DictConst.DOCUMENTSTATU)
.LeftJoin<DictionaryDataEntity>((a,b,c,d,e)=>e.DictionaryTypeId==d.Id && a.status==e.EnCode)
.LeftJoin<DictionaryDataEntity>((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,