From 3fb7ec658ad3abe1bd0e942581aea07aa14dadd7 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Mon, 11 Jul 2022 01:07:22 +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 | 17 +++++++++++++++++ .../pdm/service/impl/PfScreenServiceImpl.java | 2 +- .../set/service/impl/EndProductServiceImpl.java | 4 ++-- 3 files changed, 20 insertions(+), 3 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 a411e8a0..0f5ab1b8 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 @@ -263,6 +263,8 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { if (!now_status.equals("20")) { throw new PdaRequestException("当前工令工序任务状态不为检查确认！"); } + +// JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '"+device_code+"'").uniqueResult(0); work_task.put("status", "30"); work_task.put("start_id", currentUserId); work_task.put("start_name", nickName); @@ -289,6 +291,10 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { work_task.put("device_id", device_info.getString("device_id")); } } + + if (work_task.getString("workprocedure_code").equals("GX002")||work_task.getString("workprocedure_code").equals("GX003")) { + + } //更新工令表实际开始时间 if (topDtl.getString("workprocedure_code").equals(work_task.getString("workprocedure_code"))){ work_order.put("realstart_time", now); @@ -685,7 +691,10 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { } JSONObject work_task = WQLObject.getWQLObject("PDM_BI_WorkTask").query("worktask_id = '" + worktask_id + "'").uniqueResult(0); + 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")+"'").uniqueResult(0); + JSONObject form_jo = WQLObject.getWQLObject("PDM_BI_Formula").query("workorder_code = '"+work_task.getString("workorder_code")+"' AND bucket_type = '01'").uniqueResult(0); + JSONObject material_ext = WQLObject.getWQLObject("MD_ME_ProducMaterialExt").query("material_id = '"+work_order.getString("material_id")+"'").uniqueResult(0); if (StrUtil.isEmpty(work_task.getString("device_id"))) { throw new PdaRequestException("当前工序任务还未绑定设备！"); @@ -719,6 +728,14 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { } data2.put("code", para.getString("ext_name")); data2.put("value", row.getString("value")); + //球磨时间从配方表主桶配方中获取 + if (para.getString("para_code").equals("QM008")){ + data2.put("value", form_jo.getString("ball_time")); + } + //工艺酒精加量设定值：工令重量*液料比，液料比从扩展属性中取； + if (para.getString("para_code").equals("QM009")){ + data2.put("value", NumberUtil.mul(work_order.getDouble("workorder_qty"),material_ext.getDouble("liquid_rate"))); + } array.add(data2); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PfScreenServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PfScreenServiceImpl.java index b845ba7a..f349f18a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PfScreenServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PfScreenServiceImpl.java @@ -130,7 +130,7 @@ public class PfScreenServiceImpl implements PfScreenService { scr_jo.put("putfit_qty", bucket_jo.getDoubleValue("putfit_qty")); } //查询最新的配粉工位称重记录表 - JSONObject err_mark = WQLObject.getWQLObject("PDM_BI_FormulaWeightRecord").query("device_code = '" + scr_jo2.getString("device_code") + "' order by record_time desc").uniqueResult(0); + JSONObject err_mark = WQLObject.getWQLObject("PDM_BI_FormulaWeightRecord").query("device_code = '" + scr_jo2.getString("device_code") + "' AND formula_code = '"+scr_jo2.getString("formula_code")+"' order by record_time desc").uniqueResult(0); if (ObjectUtil.isNotEmpty(err_mark) && !err_mark.getString("error").equals("0")) { //查询错误信息 scr_jo.put("msg", "投料确认异常！错误码："+err_mark.getString("error")); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/EndProductServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/EndProductServiceImpl.java index bef2a04e..d9abffc3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/EndProductServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/EndProductServiceImpl.java @@ -202,7 +202,7 @@ public class EndProductServiceImpl implements EndProductService { offlinejo.put("material_id", material_id); offlinejo.put("pcsn", pcsn); offlinejo.put("bucketunique", bucketunique); - offlinejo.put("ordernum", record_order); + offlinejo.put("ordernum", changeObj.getString("record_order")); offlinejo.put("qty", result_qty); offlinejo.put("qty_unit_id", materDto.getBase_unit_id()); offlinejo.put("qty_unit_name", materDto.getBase_unit_name()); @@ -216,7 +216,7 @@ public class EndProductServiceImpl implements EndProductService { map.put("material_id", material_id); map.put("pcsn", pcsn); map.put("bucketunique", bucketunique); - map.put("ordernum", record_order+""); + map.put("ordernum", changeObj.getString("record_order")); map.put("qty", result_qty+""); map.put("qty_unit_id", materDto.getBase_unit_id()+""); map.put("qty_unit_name", materDto.getBase_unit_name());