From f5d86c2f95121b1c8492475bbb3179962ed1f47c Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Fri, 23 Aug 2024 16:55:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs | 6 +++++- QcMgr/Tnb.QcMgr.Entities/Dto/Trigger.cs | 1 + QcMgr/Tnb.QcMgr/QcCheckPlanService.cs | 2 +- .../Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs | 6 ++++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index b03b323a..f86433ac 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -1220,6 +1220,7 @@ namespace Tnb.ProductionMgr processid = task.process_id, workid = task.workstation_id, triggerevent = EnumTriggerEvent.开工首件检, + plan_check_type = WmsWareHouseConst.SHOUJIAN_ID, }; await _qcCheckPlanService.CreateTask(entity); } @@ -1847,6 +1848,7 @@ namespace Tnb.ProductionMgr carry_code = report.material_box_code, report_id = report.id, batch = report.batch, + plan_check_type = WmsWareHouseConst.MOJIAN_ID, }; await _qcCheckPlanService.CreateTask(entity); } @@ -1900,7 +1902,9 @@ namespace Tnb.ProductionMgr carry_code = report.material_box_code, report_id = report.id, batch = report.batch, - check_type = WmsWareHouseConst.FULLREVIEW_CODE + check_type = WmsWareHouseConst.FULLREVIEW_CODE, + plan_check_type = WmsWareHouseConst.LINGBUJIANZUIZHONGJIANYAN_ID, + }; int? reported = prdMoTask.reported_work_qty == null ? 0 : prdMoTask.reported_work_qty; int? scrap = prdMoTask.scrap_qty == null ? 0 : prdMoTask.scrap_qty; diff --git a/QcMgr/Tnb.QcMgr.Entities/Dto/Trigger.cs b/QcMgr/Tnb.QcMgr.Entities/Dto/Trigger.cs index e10f7bc4..4ad8af56 100644 --- a/QcMgr/Tnb.QcMgr.Entities/Dto/Trigger.cs +++ b/QcMgr/Tnb.QcMgr.Entities/Dto/Trigger.cs @@ -54,6 +54,7 @@ namespace Tnb.QcMgr.Entities /// public string report_id { get; set; } public string check_type { get; set; } + public string plan_check_type { get; set; } public string batch { get; set; } } diff --git a/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs b/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs index 9c60c863..d4d3d4a2 100644 --- a/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs +++ b/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs @@ -504,7 +504,7 @@ namespace Tnb.QcMgr RemarkAttribute remark = RemarkAttribute.GetRemark(enumTriggerEvent); string type = DictionaryData.Where(p => p.FullName == remark.CheckType).First().Id; TriggerEvent = _repository.AsSugarClient().Queryable().Where(p => p.type == type && p.name == remark.CheckContent).First(); - Query = Query.Where((a, b, c, d, e) => b.triggertype == "3" && b.content!.Contains(TriggerEvent.id)); + Query = Query.Where((a, b, c, d, e) => b.triggertype == "3" && b.content!.Contains(TriggerEvent.id) && a.checktype==entity.plan_check_type); } private void Filter(List QcCheckPlanHs, TriggerPlanEntity entity) { diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs index e1c8931b..f9643bfb 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs @@ -160,8 +160,10 @@ namespace Tnb.WarehouseMgr ["dbizdate"] = instock.create_time.ToString("yyyy-MM-dd HH:mm:ss"), ["dplanarrivedate"] = instock.create_time.ToString("yyyy-MM-dd HH:mm:ss"), ["dplanoutdate"] = instock.create_time.ToString("yyyy-MM-dd HH:mm:ss"), - ["nnum"] = item.qty, - ["nshouldnum"] = item.pr_qty, + // ["nnum"] = item.qty, + // ["nshouldnum"] = item.pr_qty, + ["nnum"] = wmsRawmatTransferinstockD.actual_qty, + ["nshouldnum"] = wmsRawmatTransferinstockD.actual_qty, ["pk_group"] = erpOrg.pk_group, ["pk_org"] = erpOrg.pk_org, ["pk_org_v"] = erpOrg.pk_org_v,