From 88af97e6dd1aac3107143d02c94fb13e37ed235d Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Thu, 13 Oct 2022 19:45:35 +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 --- .../service/impl/PdmWorkTaskServiceImpl.java | 51 ++++++++++++------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java index a33c136d..45983376 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java @@ -113,8 +113,8 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { } //判断该设备是否属于配粉设备 - JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '"+device_code+"' AND workprocedure_code = 'GX001'").uniqueResult(0); - if (ObjectUtil.isEmpty(device)){ + JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '" + device_code + "' AND workprocedure_code = 'GX001'").uniqueResult(0); + if (ObjectUtil.isEmpty(device)) { throw new PdaRequestException("请输入配粉工位设备编码！"); } @@ -465,8 +465,8 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { } //判断该设备是否属于配粉设备 - JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '"+device_code+"' AND workprocedure_code = 'GX001'").uniqueResult(0); - if (ObjectUtil.isEmpty(device)){ + JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '" + device_code + "' AND workprocedure_code = 'GX001'").uniqueResult(0); + if (ObjectUtil.isEmpty(device)) { throw new PdaRequestException("请输入配粉工位设备编码！"); } JSONObject device_point = WQLObject.getWQLObject("SCH_BASE_DevicePointPara") @@ -629,8 +629,8 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { } //判断该设备是否属于球磨设备 - JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '"+device_code+"' AND workprocedure_code = 'GX002'").uniqueResult(0); - if (ObjectUtil.isEmpty(device)){ + JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '" + device_code + "' AND workprocedure_code = 'GX002'").uniqueResult(0); + if (ObjectUtil.isEmpty(device)) { throw new PdaRequestException("请输入球磨设备编码！"); } @@ -721,7 +721,7 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { JSONObject work_order = WQLObject.getWQLObject("PDM_BI_WorkOrder").query("workorder_code = '" + work_task.getString("workorder_code") + "'").uniqueResult(0); //判断该设备是否属于球磨设备 JSONObject device_jo = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_id = '" + work_task.getString("device_id") + "' AND workprocedure_code = 'GX002'").uniqueResult(0); - if (ObjectUtil.isEmpty(device_jo)){ + if (ObjectUtil.isEmpty(device_jo)) { throw new PdaRequestException("请输入配粉工位设备编码！"); } JSONObject form_jo = WQLObject.getWQLObject("PDM_BI_Formula").query("workorder_code = '" + work_task.getString("workorder_code") + "' AND bucket_type = '01'").uniqueResult(0); @@ -759,13 +759,26 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { } data2.put("code", para.getString("ext_name")); data2.put("value", row.getString("value")); + //预磨1酒精设定值：开单重量*工艺参数"预磨1酒精设定值（改为比例）" + double masterbucket_qty = form_jo.getDoubleValue("masterbucket_qty"); + if (para.getString("para_code").equals("QM006")) { + data2.put("value", NumberUtil.round(data2.getDoubleValue("value") * 0.01 * masterbucket_qty, 3)); + } //球磨时间从配方表主桶配方中获取 if (para.getString("para_code").equals("QM008")) { data2.put("value", form_jo.getString("ball_time")); } - //工艺酒精加量设定值：工令重量*液料比，液料比从扩展属性中取； + //工艺酒精加量设定值：开单重量*[1-工艺参数"预磨1酒精量（改为比例）"] if (para.getString("para_code").equals("QM009")) { - data2.put("value", NumberUtil.mul(work_order.getDouble("workorder_qty"), material_ext.getDouble("liquid_rate"))); + //查询预磨1酒精设定值 + JSONObject qm006 = WQLObject.getWQLObject("PDM_BI_WorkProcedureParaProduct").query("material_id = '" + material_id + "' AND workprocedure_id = '" + workprocedure_id + "' AND para_code = 'QM006'").uniqueResult(0); + double a = (1.0-qm006.getDoubleValue("value")*0.01); + double b = work_order.getDouble("workorder_qty"); + data2.put("value", NumberUtil.round(NumberUtil.mul(b,a),3)); + } + //卸料酒精每次加量设定值：开单重量*工艺参数"每次卸料酒精加量（改为比例）" + if (para.getString("para_code").equals("QM014")) { + data2.put("value", NumberUtil.round(data2.getDoubleValue("value") * 0.01 * masterbucket_qty, 3)); } array.add(data2); } @@ -819,8 +832,8 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { JSONObject work_task = WQLObject.getWQLObject("PDM_BI_WorkTask").query("worktask_id = '" + worktask_id + "'").uniqueResult(0); //判断该设备是否属于球磨设备 - JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '"+device_code+"' AND workprocedure_code = 'GX002'").uniqueResult(0); - if (ObjectUtil.isEmpty(device)){ + JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '" + device_code + "' AND workprocedure_code = 'GX002'").uniqueResult(0); + if (ObjectUtil.isEmpty(device)) { throw new PdaRequestException("请输入球磨设备编码！"); } @@ -942,8 +955,8 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { } //判断该设备是否属于喷雾设备 - JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '"+device_code+"' AND workprocedure_code = 'GX003'").uniqueResult(0); - if (ObjectUtil.isEmpty(device)){ + JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '" + device_code + "' AND workprocedure_code = 'GX003'").uniqueResult(0); + if (ObjectUtil.isEmpty(device)) { throw new PdaRequestException("请输入喷雾设备编码！"); } @@ -1192,8 +1205,8 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { } //判断该设备是否属于喷雾设备 - JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '"+mix_device_code+"' AND workprocedure_code = 'GX004'").uniqueResult(0); - if (ObjectUtil.isEmpty(device)){ + JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '" + mix_device_code + "' AND workprocedure_code = 'GX004'").uniqueResult(0); + if (ObjectUtil.isEmpty(device)) { throw new PdaRequestException("请输入混合设备编码！"); } @@ -1366,12 +1379,12 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { } //查询对应的工序任务 - JSONObject work_task = WQLObject.getWQLObject("pdm_bi_worktask").query("workorder_code = '"+from_jo.getString("workorder_code")+"' AND workprocedure_code = 'GX001'").uniqueResult(0); - if (ObjectUtil.isEmpty(work_task)){ + JSONObject work_task = WQLObject.getWQLObject("pdm_bi_worktask").query("workorder_code = '" + from_jo.getString("workorder_code") + "' AND workprocedure_code = 'GX001'").uniqueResult(0); + if (ObjectUtil.isEmpty(work_task)) { throw new PdaRequestException("未查询到对应的工序任务！"); } - JSONObject device_jo = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_id = '"+work_task.getString("device_id")+"'").uniqueResult(0); - if (ObjectUtil.isEmpty(device_jo)){ + JSONObject device_jo = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_id = '" + work_task.getString("device_id") + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(device_jo)) { throw new PdaRequestException("当前工序未绑定设备！"); } JSONObject bucket_job = WQLObject.getWQLObject("PDM_BI_FormulaDtlJob").query("status < '99' AND formula_code = '" + formula_code + "'").uniqueResult(0);