From adaa1552d15fa220c432513b85294eeb12105b6c Mon Sep 17 00:00:00 2001 From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com> Date: Wed, 16 Apr 2025 12:13:59 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/sch/tasks/CallEmpReelTask.java | 55 ++++++++++--------- .../java/org/nl/wms/sch/tasks/OutHotTask.java | 3 - 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java index a385a5d26..8fb2a5ff2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java @@ -292,34 +292,37 @@ public class CallEmpReelTask extends AbstractAcsTask { // 创建桁架任务，入烘箱。 JSONObject hotPoint = bean.getJsonObject(jsonIvt2.getString("product_area"), jsonIvt2, temperature); String container_name = jsonTask.getString("material_code"); - // 创建暂存位 --> 烘烤区任务 - JSONObject param = new JSONObject(); - param.put("type", "2"); - param.put("point_code1", point_code4); - param.put("point_code2", hotPoint.getString("point_code")); - param.put("material_code", container_name); - param.put("product_area", hotPoint.getString("product_area")); - param.put("request_param", NumberUtil.mul(Double.parseDouble(hours), 60)); + //优化 + if (ObjectUtil.isNotEmpty(hotPoint)) { + // 创建暂存位 --> 烘烤区任务 + JSONObject param = new JSONObject(); + param.put("type", "2"); + param.put("point_code1", point_code4); + param.put("point_code2", hotPoint.getString("point_code")); + param.put("material_code", container_name); + param.put("product_area", hotPoint.getString("product_area")); + param.put("request_param", NumberUtil.mul(Double.parseDouble(hours), 60)); - InHotTask inHotTask = new InHotTask(); - String taskId = inHotTask.createTask(param); - // 3.插入主表 - JSONObject jsonRawHot = rawTab.query("container_name = '" + container_name + "' and is_delete = '0'").uniqueResult(0); - JSONObject jsonMater = materTab.query("material_code = '" + jsonRawHot.getString("product_name") + "'").uniqueResult(0); + InHotTask inHotTask = new InHotTask(); + String taskId = inHotTask.createTask(param); + // 3.插入主表 + JSONObject jsonRawHot = rawTab.query("container_name = '" + container_name + "' and is_delete = '0'").uniqueResult(0); + JSONObject jsonMater = materTab.query("material_code = '" + jsonRawHot.getString("product_name") + "'").uniqueResult(0); - JSONObject hotParam = new JSONObject(); - hotParam.put("container_name", container_name); - hotParam.put("workorder_id", jsonRawHot.getString("workorder_id")); - hotParam.put("material_id", jsonMater.getString("material_id")); - hotParam.put("qty", jsonRawHot.get("productin_qty")); - hotParam.put("io_type", "0"); - hotParam.put("qty_unit_id", jsonMater.getString("base_unit_id")); - hotParam.put("task_id", taskId); - hotParam.put("start_point_code", point_code1); - hotParam.put("end_point_code", hotPoint.getString("point_code")); - hotParam.put("temperature", temperature); - hotParam.put("oven_time", hours); - bean.createHotIoMst(hotParam); + JSONObject hotParam = new JSONObject(); + hotParam.put("container_name", container_name); + hotParam.put("workorder_id", jsonRawHot.getString("workorder_id")); + hotParam.put("material_id", jsonMater.getString("material_id")); + hotParam.put("qty", jsonRawHot.get("productin_qty")); + hotParam.put("io_type", "0"); + hotParam.put("qty_unit_id", jsonMater.getString("base_unit_id")); + hotParam.put("task_id", taskId); + hotParam.put("start_point_code", point_code1); + hotParam.put("end_point_code", hotPoint.getString("point_code")); + hotParam.put("temperature", temperature); + hotParam.put("oven_time", hours); + bean.createHotIoMst(hotParam); + } } else { // 校验终点是否存在 JSONObject jsonIvt2 = ivtTab.query("full_point_code ='" + point_code4 + "'").uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java index bf1be7f12..d787724ad 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java @@ -128,9 +128,6 @@ public class OutHotTask extends AbstractAcsTask { jo.put("product_area", cut_jo.getString("product_area")); jo.put("task_type", "010302"); } else { - if(ObjectUtil.isNotEmpty(cut_jo.getString("container_name"))){ - throw new BadRequestException("点位:"+cut_jo.getString("full_point_code")+"已存在母卷:"+cut_jo.getString("container_name")+""); - } jo.put("point_code1", jsonTask.getString("point_code2")); jo.put("point_code2", cut_jo.getString("full_point_code")); jo.put("point_code3", cut_jo.getString("empty_point_code"));