From 6f509b0ac29c778c50ee6b89b954f61ca8a8c4d3 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Sat, 9 Jul 2022 20:44:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/pf/service/impl/FormulaServiceImpl.java | 1 + .../wms/pf/service/impl/InitformulaServiceImpl.java | 12 ++++++++++++ .../views/wms/pdm/produce/worktask/print2Dialog.vue | 3 ++- mes/qd/src/views/wms/pf/formula/DivDialog.vue | 11 +++++++++++ mes/qd/src/views/wms/pf/formula/ViewDialog.vue | 12 ++++++++++++ mes/qd/src/views/wms/pf/initformula/DivDialog.vue | 13 ++++++++++++- 6 files changed, 50 insertions(+), 2 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java index 4133edac..9f36c0b7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java @@ -239,6 +239,7 @@ public class FormulaServiceImpl implements FormulaService { PDM_BI_FormulaDtl.insert(jo); } Formula.put("masterbucket_qty",masterbucket_qty+""); + Formula.put("ball_time",whereJson.getString("ball_time")); Formula.put("extadd_qty",extadd_qty+""); Formula.put("is_audit", "1"); Formula.put("audit_id",currentUserId); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java index 1a15a9e8..e148f7be 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java @@ -293,6 +293,7 @@ public class InitformulaServiceImpl implements InitformulaService { Formula_01.put("total_qty","0"); Formula_01.put("status","10"); Formula_01.put("is_delete", "0"); + Formula_01.put("ball_time", whereJson.getString("ball_time")); Formula_01.put("create_id", currentUserId); Formula_01.put("create_name", nickName); Formula_01.put("create_time", now); @@ -400,6 +401,7 @@ public class InitformulaServiceImpl implements InitformulaService { Formula_02.put("total_qty","0"); Formula_02.put("status","10"); Formula_02.put("is_delete", "0"); + Formula_02.put("ball_time", whereJson.getString("ball_time")); Formula_02.put("create_id", currentUserId); Formula_02.put("create_name", nickName); Formula_02.put("create_time", now); @@ -576,6 +578,7 @@ public class InitformulaServiceImpl implements InitformulaService { Formula_01.put("total_qty","0"); Formula_01.put("status","20"); Formula_01.put("is_delete", "0"); + Formula_01.put("ball_time", whereJson.getString("ball_time")); Formula_01.put("create_id", currentUserId); Formula_01.put("create_name", nickName); Formula_01.put("create_time", now); @@ -684,6 +687,7 @@ public class InitformulaServiceImpl implements InitformulaService { Formula_02.put("total_qty","0"); Formula_02.put("status","20"); Formula_02.put("is_delete", "0"); + Formula_02.put("ball_time", whereJson.getString("ball_time")); Formula_02.put("create_id", currentUserId); Formula_02.put("create_name", nickName); Formula_02.put("create_time", now); @@ -806,6 +810,7 @@ public class InitformulaServiceImpl implements InitformulaService { @Override @Transactional(rollbackFor = Exception.class) public JSONObject getform(Map json) { + WQLObject pdm_bi_workprocedureparaproduct = WQLObject.getWQLObject("pdm_bi_workprocedureparaproduct"); WQLObject MD_ME_ProductMaterialExt = WQLObject.getWQLObject("MD_ME_ProducMaterialExt"); WQLObject md_me_materialbase = WQLObject.getWQLObject("md_me_materialbase"); WQLObject PDM_BI_WorkOrder = WQLObject.getWQLObject("PDM_BI_WorkOrder"); @@ -824,7 +829,14 @@ public class InitformulaServiceImpl implements InitformulaService { throw new BadRequestException("当前成品查询不到成品物料扩展信息！"); } JSONObject mater = md_me_materialbase.query("material_id ='"+material_id+"'").uniqueResult(0); + + JSONObject materPa = pdm_bi_workprocedureparaproduct.query("para_code ='QM008' and workprocedure_code='GX002' and material_id ='"+material_id+"'").uniqueResult(0); + + if(materPa == null ){ + throw new BadRequestException("当前成品查询不到球磨工艺参数球磨时间！"); + } workorder.put("formula_type","00"); + workorder.put("ball_time",materPa.getDouble("value")); workorder.put("waste_limit_down",material.getString("waste_limit_down")); workorder.put("waste_limit_up",material.getString("waste_limit_up")); workorder.put("c_balance",material.getString("c_balance")); diff --git a/mes/qd/src/views/wms/pdm/produce/worktask/print2Dialog.vue b/mes/qd/src/views/wms/pdm/produce/worktask/print2Dialog.vue index 68411482..198b3444 100644 --- a/mes/qd/src/views/wms/pdm/produce/worktask/print2Dialog.vue +++ b/mes/qd/src/views/wms/pdm/produce/worktask/print2Dialog.vue @@ -65,7 +65,7 @@