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 11:01:37 +08:00
parent 8c5d302daa
commit 30b40fb28e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -519,6 +519,7 @@ namespace Tnb.ProductionMgr
Dictionary<string, object> queryJson = string.IsNullOrEmpty(input.queryJson) ? new Dictionary<string, object>() : input.queryJson.ToObject<Dictionary<string, object>>(); Dictionary<string, object> queryJson = string.IsNullOrEmpty(input.queryJson) ? new Dictionary<string, object>() : input.queryJson.ToObject<Dictionary<string, object>>();
string? code = queryJson.ContainsKey("code") ? queryJson["code"].ToString() : ""; string? code = queryJson.ContainsKey("code") ? queryJson["code"].ToString() : "";
string? status = queryJson.ContainsKey("status") ? queryJson["status"].ToString() : "";
// DateTime? start_time = queryJson.ContainsKey("start_time") ? queryJson["start_time"].ToString() == "" ? null : Convert.ToDateTime(queryJson["start_time"]) : null; // DateTime? start_time = queryJson.ContainsKey("start_time") ? queryJson["start_time"].ToString() == "" ? null : Convert.ToDateTime(queryJson["start_time"]) : null;
// DateTime? end_time = queryJson.ContainsKey("end_time") ? queryJson["end_time"].ToString() == "" ? null : Convert.ToDateTime(queryJson["end_time"]) : null; // DateTime? end_time = queryJson.ContainsKey("end_time") ? queryJson["end_time"].ToString() == "" ? null : Convert.ToDateTime(queryJson["end_time"]) : null;
@@ -531,6 +532,7 @@ namespace Tnb.ProductionMgr
var queryable1 = db.Queryable<PrdKittingOutH>() var queryable1 = db.Queryable<PrdKittingOutH>()
.LeftJoin<UserEntity>((a, b) => a.create_id == b.Id) .LeftJoin<UserEntity>((a, b) => a.create_id == b.Id)
.Where((a,b)=>a.workstation_id==input.stationId) .Where((a,b)=>a.workstation_id==input.stationId)
.WhereIF(!string.IsNullOrEmpty(status),a=>a.status==status)
.Select((a, b) => new FeedingRecordListOutput() .Select((a, b) => new FeedingRecordListOutput()
{ {
id = a.id, id = a.id,
@@ -545,6 +547,7 @@ namespace Tnb.ProductionMgr
var queryable2 = db.Queryable<PrdOutstockH>() var queryable2 = db.Queryable<PrdOutstockH>()
.LeftJoin<UserEntity>((a, b) => a.create_id == b.Id) .LeftJoin<UserEntity>((a, b) => a.create_id == b.Id)
.Where((a,b)=>a.workstation_id==input.stationId) .Where((a,b)=>a.workstation_id==input.stationId)
.WhereIF(!string.IsNullOrEmpty(status),a=>a.status==status)
.Select((a, b) => new FeedingRecordListOutput() .Select((a, b) => new FeedingRecordListOutput()
{ {
id = a.id, id = a.id,