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

齐套出库 一般出库 物料出库添加状态

Browse Source
This commit is contained in:
周科达
2023-11-08 14:06:40 +08:00
parent 30b40fb28e
commit bd739b3060
6 changed files with 159 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -528,12 +528,35 @@ namespace Tnb.ProductionMgr
input.sidx = "create_time";
input.sort = "desc";
}
List<string> statusList = new();
if (!string.IsNullOrEmpty(status))
{
switch (status)
{
case "1":
statusList.Add(DictConst.OUTSTOCKSTATUSADD);
statusList.Add(DictConst.OUTSTOCKSTATUSCALLED);
break;
case "2":
statusList.Add(DictConst.OUTSTOCKSTATUSTOBEDELIVERED);
statusList.Add(DictConst.OUTSTOCKSTATUSWORKING);
break;
case "3":
statusList.Add(DictConst.OUTSTOCKSTATUSCANCEL);
statusList.Add(DictConst.OUTSTOCKSTATUSCOMPLETED);
break;
}
}
var queryable1 = db.Queryable<PrdKittingOutH>()
.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 && c.status==e.Id)
.Where((a,b)=>a.workstation_id==input.stationId)
.WhereIF(!string.IsNullOrEmpty(status),a=>a.status==status)
.Select((a, b) => new FeedingRecordListOutput()
.WhereIF(statusList.Count>0,(a,b,c,d,e)=>statusList.Contains(e.EnCode))
.Select((a, b,c,d,e) => new FeedingRecordListOutput()
{
id = a.id,
code = a.code,
@@ -541,14 +564,17 @@ namespace Tnb.ProductionMgr
type = "0",
create_name = b.RealName,
create_time = a.create_time==null ? "" : a.create_time.Value.ToString(DbTimeFormat.SS),
status = a.status
status = e.FullName
});
var queryable2 = db.Queryable<PrdOutstockH>()
.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 && c.status==e.Id)
.Where((a,b)=>a.workstation_id==input.stationId)
.WhereIF(!string.IsNullOrEmpty(status),a=>a.status==status)
.Select((a, b) => new FeedingRecordListOutput()
.WhereIF(statusList.Count>0,(a,b,c,d,e)=>statusList.Contains(e.EnCode))
.Select((a, b,c,d,e) => new FeedingRecordListOutput()
{
id = a.id,
code = a.bill_code,
@@ -556,7 +582,7 @@ namespace Tnb.ProductionMgr
type = a.type,
create_name = b.RealName,
create_time = a.create_time==null ? "" : a.create_time.Value.ToString(DbTimeFormat.SS),
status = a.status
status = e.FullName
});
var result = await db.UnionAll(queryable1,queryable2)
.MergeTable()