From 1006f54afbe67a81b9c6822db5e535590050ceea Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Mon, 17 Jul 2023 11:57:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E9=99=A4warning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EquipMgr/Tnb.EquipMgr/EqpDaqService.cs | 8 ++++---- EquipMgr/Tnb.EquipMgr/EqpEquipFileService.cs | 2 +- .../Tnb.EquipMgr/EqpEquipSparePartsService.cs | 6 +++--- EquipMgr/Tnb.EquipMgr/EqpSubEquipService.cs | 4 ++-- .../EqpTechnologyParameterService.cs | 4 ++-- .../EqpWorkshopChangeLogService.cs | 2 +- .../Tnb.EquipMgr/ToolMoldRequisitionService.cs | 8 ++++---- EquipMgr/Tnb.EquipMgr/ToolMoldReturnService.cs | 15 ++++++++++----- .../Dto/PrdManage/PrdMoListTreeOutput.cs | 18 +++++++++--------- .../Dto/PrdManage/PrdTaskManageListOutput.cs | 6 +++--- .../Tnb.ProductionMgr/PrdTaskManageService.cs | 4 ++-- 11 files changed, 41 insertions(+), 36 deletions(-) diff --git a/EquipMgr/Tnb.EquipMgr/EqpDaqService.cs b/EquipMgr/Tnb.EquipMgr/EqpDaqService.cs index 0218b0e5..6c233f6d 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpDaqService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpDaqService.cs @@ -39,10 +39,10 @@ namespace Tnb.EquipMgr } var result = await db.Queryable() .LeftJoin((a,b)=>a.create_id==b.Id) - .WhereIF(input!=null,a=>a.equip_id==input.equip_id) - .WhereIF(queryJson!=null && queryJson.ContainsKey("data_source"),a=>a.data_source==queryJson["data_source"]) - .WhereIF(queryJson!=null && queryJson.ContainsKey("label_name"),a=>a.label_name.Contains(queryJson["label_name"])) - .WhereIF(queryJson!=null && queryJson.ContainsKey("label_point"),a=>a.label_point.Contains(queryJson["label_point"])) + .WhereIF(input!=null,a=>a.equip_id==input!.equip_id) + .WhereIF(queryJson!=null && queryJson.ContainsKey("data_source"),a=>a.data_source==queryJson!["data_source"]) + .WhereIF(queryJson!=null && queryJson.ContainsKey("label_name"),a=>a.label_name.Contains(queryJson!["label_name"])) + .WhereIF(queryJson!=null && queryJson.ContainsKey("label_point"),a=>a.label_point.Contains(queryJson!["label_point"])) .Select((a,b) => new EquipDaqQueryOutput { id = a.id, diff --git a/EquipMgr/Tnb.EquipMgr/EqpEquipFileService.cs b/EquipMgr/Tnb.EquipMgr/EqpEquipFileService.cs index 6a61b196..97f48c1a 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpEquipFileService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpEquipFileService.cs @@ -89,7 +89,7 @@ namespace Tnb.EquipMgr .LeftJoin((a, b,c) => a.modify_id == c.Id) .LeftJoin((a, b,c,d) => a.equip_id == d.id) .Where((a,b,c,d)=>a.equip_id==input.equip_id) - .WhereIF(queryJson!=null && queryJson.ContainsKey("file_name"),(a,b,c,d)=>a.file_name.Contains(queryJson["file_name"])) + .WhereIF(queryJson!=null && queryJson.ContainsKey("file_name"),(a,b,c,d)=>a.file_name.Contains(queryJson!["file_name"])) .Select((a, b, c,d) => new EquipFileQueryOutput { id = a.id, diff --git a/EquipMgr/Tnb.EquipMgr/EqpEquipSparePartsService.cs b/EquipMgr/Tnb.EquipMgr/EqpEquipSparePartsService.cs index 83d1341c..351b7f60 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpEquipSparePartsService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpEquipSparePartsService.cs @@ -47,7 +47,7 @@ namespace Tnb.EquipMgr id = SnowflakeIdHelper.NextId(), equip_id = input.equip_id, spare_parts_id = spare_parts_id, - create_id = _userManager.UserId, + create_id = _userManager?.UserId ?? "", create_time = DateTime.Now, org_id = orgId, }); @@ -71,8 +71,8 @@ namespace Tnb.EquipMgr .LeftJoin((a, b, c) => c.EnCode == Tnb.BasicData.DictConst.SparePartsType && c.DeleteMark == null) .LeftJoin((a, b,c,d) => d.DictionaryTypeId == c.Id && b.type_id == d.EnCode) .Where((a,b,c,d)=>a.equip_id==input.equip_id) - .WhereIF(queryJson!=null && queryJson.ContainsKey("code"),(a,b,c,d)=>b.code.Contains(queryJson["code"])) - .WhereIF(queryJson!=null && queryJson.ContainsKey("name"),(a,b,c,d)=>b.name.Contains(queryJson["name"])) + .WhereIF(queryJson!=null && queryJson.ContainsKey("code"),(a,b,c,d)=>b.code.Contains(queryJson!["code"])) + .WhereIF(queryJson!=null && queryJson.ContainsKey("name"),(a,b,c,d)=>b.name.Contains(queryJson!["name"])) .Select((a, b, c,d) => new EquipSparePartsQueryOutput { id = a.id, diff --git a/EquipMgr/Tnb.EquipMgr/EqpSubEquipService.cs b/EquipMgr/Tnb.EquipMgr/EqpSubEquipService.cs index 95e2b2c9..276ab5a1 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpSubEquipService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpSubEquipService.cs @@ -43,8 +43,8 @@ namespace Tnb.EquipMgr .LeftJoin((a, b,c) => a.modify_id == c.Id) .LeftJoin((a, b,c,d) => a.equip_id == d.id) .Where((a,b,c,d)=>a.equip_id==input.equip_id) - .WhereIF(queryJson!=null && queryJson.ContainsKey("code"),(a,b,c,d)=>a.code.Contains(queryJson["code"])) - .WhereIF(queryJson!=null && queryJson.ContainsKey("name"),(a,b,c,d)=>a.name.Contains(queryJson["name"])) + .WhereIF(queryJson!=null && queryJson.ContainsKey("code"),(a,b,c,d)=>a.code.Contains(queryJson!["code"])) + .WhereIF(queryJson!=null && queryJson.ContainsKey("name"),(a,b,c,d)=>a.name.Contains(queryJson!["name"])) .Select((a, b, c,d) => new SubEquipQueryOutput { id = a.id, diff --git a/EquipMgr/Tnb.EquipMgr/EqpTechnologyParameterService.cs b/EquipMgr/Tnb.EquipMgr/EqpTechnologyParameterService.cs index 4ec042e2..22035383 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpTechnologyParameterService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpTechnologyParameterService.cs @@ -37,8 +37,8 @@ namespace Tnb.EquipMgr queryJson = JsonConvert.DeserializeObject>(input?.queryJson ?? ""); } var result = await db.Queryable() - .WhereIF(input!=null,a=>a.equip_id==input.equip_id) - .WhereIF(queryJson!=null && queryJson.ContainsKey("name"),a=>a.name.Contains(queryJson["name"])) + .WhereIF(input!=null,a=>a.equip_id==input!.equip_id) + .WhereIF(queryJson!=null && queryJson.ContainsKey("name"),a=>a.name.Contains(queryJson!["name"])) .Select(a => new EquipTechnologyParameterQueryOutput { id = a.id, diff --git a/EquipMgr/Tnb.EquipMgr/EqpWorkshopChangeLogService.cs b/EquipMgr/Tnb.EquipMgr/EqpWorkshopChangeLogService.cs index 94074c06..75ac0af0 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpWorkshopChangeLogService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpWorkshopChangeLogService.cs @@ -42,7 +42,7 @@ namespace Tnb.EquipMgr var result = await db.Queryable() .LeftJoin((a,b)=>a.old_workshop_id==b.Id) .LeftJoin((a,b,c)=>a.new_workshop_id==c.Id) - .WhereIF(input!=null,a=>a.equip_id==input.equip_id) + .WhereIF(input!=null,a=>a.equip_id==input!.equip_id) //.WhereIF(queryJson!=null && queryJson.ContainsKey("name"),a=>a.name.Contains(queryJson["name"])) .Select((a,b,c) => new EquipWorkshopChangeQueryOutput { diff --git a/EquipMgr/Tnb.EquipMgr/ToolMoldRequisitionService.cs b/EquipMgr/Tnb.EquipMgr/ToolMoldRequisitionService.cs index 6b8b554e..7f4aa7e7 100644 --- a/EquipMgr/Tnb.EquipMgr/ToolMoldRequisitionService.cs +++ b/EquipMgr/Tnb.EquipMgr/ToolMoldRequisitionService.cs @@ -52,7 +52,7 @@ namespace Tnb.EquipMgr private async Task GetList(VisualDevModelListQueryInput input) { Dictionary? queryJson = new Dictionary(); - string requisitionCode = ""; + string? requisitionCode = ""; DateTime[] requisitionTimeArr = null; DateTime[] estimatedReturnArr = null; if (input!=null && !string.IsNullOrEmpty(input.queryJson)) @@ -60,15 +60,15 @@ namespace Tnb.EquipMgr queryJson = JsonConvert.DeserializeObject>(input?.queryJson ?? ""); } - if (queryJson.TryGetValue("requisition_code", out var value)) + if (queryJson!.TryGetValue("requisition_code", out var value)) { requisitionCode = value.ToString(); } - if (queryJson.TryGetValue("requisition_time", out var value1)) + if (queryJson!.TryGetValue("requisition_time", out var value1)) { requisitionTimeArr = value1.ToObject().Select(x=>DateTimeOffset.FromUnixTimeSeconds(x/1000).ToLocalTime().DateTime).ToArray(); } - if (queryJson.TryGetValue("estimated_return_time", out var value2)) + if (queryJson!.TryGetValue("estimated_return_time", out var value2)) { estimatedReturnArr = value2.ToObject().Select(x=>DateTimeOffset.FromUnixTimeSeconds(x/1000).ToLocalTime().DateTime).ToArray(); } diff --git a/EquipMgr/Tnb.EquipMgr/ToolMoldReturnService.cs b/EquipMgr/Tnb.EquipMgr/ToolMoldReturnService.cs index 9f64db8e..79e9a012 100644 --- a/EquipMgr/Tnb.EquipMgr/ToolMoldReturnService.cs +++ b/EquipMgr/Tnb.EquipMgr/ToolMoldReturnService.cs @@ -49,15 +49,20 @@ namespace Tnb.EquipMgr await _runService.Create(templateEntity, input); - string locationId = ""; + string? locationId = ""; if (input.data.TryGetValue("location_id", out var value)) { locationId = value.ToString(); } - await _db.Updateable() - .SetColumns(x => x.mold_status == Tnb.BasicData.DictConst.ZKTypeId) - .SetColumnsIF(!string.IsNullOrEmpty(locationId),x=>x.location_id==locationId) - .Where(X => X.id == input.data["mold_id"]).ExecuteCommandAsync(); + + string moldId = input.data.ContainsKey("mold_id") ? input.data["mold_id"].ToString() : ""; + if (!string.IsNullOrEmpty(moldId)) + { + await _db.Updateable() + .SetColumns(x => x.mold_status == Tnb.BasicData.DictConst.ZKTypeId) + .SetColumnsIF(!string.IsNullOrEmpty(locationId),x=>x.location_id==locationId) + .Where(X => X.id == moldId).ExecuteCommandAsync(); + } }); if (!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008); diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoListTreeOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoListTreeOutput.cs index 7636d120..bb1c96ca 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoListTreeOutput.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoListTreeOutput.cs @@ -36,7 +36,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage /// /// 物料规格型号 /// - public string material_standard { get; set; } = string.Empty; + public string? material_standard { get; set; } = string.Empty; /// /// 工单类型：1-正常工单、2-返工工单、3-试制工单 @@ -51,32 +51,32 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage /// /// 计划生产数量 /// - public string plan_qty { get; set; } = string.Empty; + public string? plan_qty { get; set; } = string.Empty; /// /// 已投入数量 /// - public string input_qty { get; set; } = string.Empty; + public string? input_qty { get; set; } = string.Empty; /// /// 已完工数量 /// - public string complete_qty { get; set; } = string.Empty; + public string? complete_qty { get; set; } = string.Empty; /// /// 报废数量 /// - public string scrap_qty { get; set; } = string.Empty; + public string? scrap_qty { get; set; } = string.Empty; /// /// 计划开始时间 /// - public string plan_start_date { get; set; } = string.Empty; + public string? plan_start_date { get; set; } = string.Empty; /// /// 计划结束时间 /// - public string plan_end_date { get; set; } = string.Empty; + public string? plan_end_date { get; set; } = string.Empty; /// /// 是否生派工单 @@ -112,7 +112,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage /// /// 创建时间 /// - public string create_time { get; set; } = string.Empty; + public string? create_time { get; set; } = string.Empty; /// /// 修改用户 @@ -131,7 +131,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage /// /// 已排产数量 /// - public string scheduled_qty { get; set; } = string.Empty; + public string? scheduled_qty { get; set; } = string.Empty; /// /// 父工单id /// diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdTaskManageListOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdTaskManageListOutput.cs index 42f333f4..eb79327c 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdTaskManageListOutput.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdTaskManageListOutput.cs @@ -3,7 +3,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage public class PrdTaskManageListOutput { public string id { get; set; } = string.Empty; - public string mo_task_code { get; set; } = string.Empty; + public string? mo_task_code { get; set; } = string.Empty; public string material_id { get; set; } = string.Empty; public string mold_id { get; set; } = string.Empty; public string eqp_id { get; set; } = string.Empty; @@ -11,7 +11,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage public string plan_end_date { get; set; } = string.Empty; public int? plan_qty { get; set; } public int? complete_qty { get; set; } - public string mo_task_status { get; set; } = string.Empty; - public string schedule_type { get; set; } = string.Empty; + public string? mo_task_status { get; set; } = string.Empty; + public string? schedule_type { get; set; } = string.Empty; } } \ No newline at end of file diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdTaskManageService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdTaskManageService.cs index 9d5d4331..ff33e912 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdTaskManageService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdTaskManageService.cs @@ -144,8 +144,8 @@ namespace Tnb.ProductionMgr material_id = c.code+"/"+c.name, mold_id = d.mold_code+"/"+d.mold_name, eqp_id = b.code+"/"+b.name, - plan_start_date = a.estimated_start_date.Value.ToString("yyyy-MM-dd"), - plan_end_date = a.estimated_end_date.Value.ToString("yyyy-MM-dd"), + plan_start_date = a.estimated_start_date==null ? "" : a.estimated_start_date.Value.ToString("yyyy-MM-dd"), + plan_end_date = a.estimated_end_date==null ? "" : a.estimated_end_date.Value.ToString("yyyy-MM-dd"), plan_qty = a.scheduled_qty, complete_qty = a.reported_work_qty, mo_task_status = a.mo_task_status,