From 9326c96f31c313ef335c81f855a1167b2308c416 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Fri, 12 Jul 2024 18:45:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=94=9F=E7=AE=94=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../util/impl/InBoxManageServiceImpl.java | 2 +- .../mes/service/impl/MesToLmsServiceImpl.java | 17 +-- .../org/nl/wms/sch/tasks/CoolCutTask.java | 138 +++++++++++------- 3 files changed, 87 insertions(+), 70 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java index 6c39a1dcf..ced978dd6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java @@ -314,7 +314,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { .eq(BstIvtBoxinfo::getBox_no, whereJson.getString("box_no")) ); boxDao.setIs_packing("1"); - iBstIvtBoxinfoService.save(boxDao); + iBstIvtBoxinfoService.updateById(boxDao); if (boxDao == null) { throw new BadRequestException("木箱不存在!"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java index 533c16e08..9f2e09def 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java @@ -534,8 +534,8 @@ public class MesToLmsServiceImpl implements MesToLmsService { String SplitWeight = param.getString("SplitWeight"); // 子卷理论重量 String Attribute2 = param.getString("Attribute2"); // 销售订单及行号 String Attribute3 = param.getString("Attribute3"); // 上下轴 - String Attribute4 = param.getString("Attribute3"); // 位置左右 - String Attribute5 = param.getString("Attribute3"); // 是否套轴 + String Attribute4 = param.getString("Attribute4"); // 位置左右 + String Attribute5 = param.getString("Attribute5"); // 是否套轴 WQLObject tab = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan"); @@ -597,9 +597,6 @@ public class MesToLmsServiceImpl implements MesToLmsService { if (ObjectUtil.isEmpty(param.getString("RestructContainerName"))) { throw new BadRequestException("改制来源子卷号不能为空"); } - if (ObjectUtil.isEmpty(param.getString("PackageBoxSN"))) { - throw new BadRequestException("子卷立库木箱号不能为空"); - } } /* PaperTubeOrFRP * 1.当管件类型为1（纸筒）时 PaperTubeMaterial 纸筒物料编码、PaperTubeDescription 纸筒物料描述、PaperTubeModel 纸筒规格 不能为空 @@ -683,14 +680,6 @@ public class MesToLmsServiceImpl implements MesToLmsService { if (Attribute5.equals("0")) { json.put("is_paper_ok", "2"); } - if (ResourceName.startsWith("B60FQ000")) { - json.put("up_or_down", "1"); - json.put("left_or_right", "1"); - json.put("level", "4"); - } - if (ResourceName.equals("B60FQ00007")) { - json.put("up_or_down", "2"); - } json.put("sale_order_name", Attribute2); json.put("start_time", DateUtil.now()); json.put("status", "01"); @@ -2103,7 +2092,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { } else { dto.setQuality_guaran_period("90天"); } - dto.setDate_of_FG_inbound(String.format(DateUtil.now(), "yyyy-MM-dd")); + dto.setDate_of_FG_inbound(DateUtil.format(DateUtil.date(), "yyyy-MM-dd")); subpackagerelationService.save(dto); // 返回成功 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java index 2d8339916..f3616f47e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java @@ -111,69 +111,97 @@ public class CoolCutTask extends AbstractAcsTask { String point_code4 = jsonTask.getString("point_code4"); if ("010301".equals(jsonTask.getString("task_type"))) { - // 更新主表状态 - JSONObject coolMst = ivtTab.query("task_id = '" + task_id + "'").uniqueResult(0); - coolMst.put("bill_status", "50"); - ivtTab.update(coolMst); + String product_area = jsonTask.getString("product_area"); + if ("B1".equals(product_area)) { + //更新起点烘箱对接位 + JSONObject dj_jo = WQLObject.getWQLObject("sch_base_point").query("point_code ='" + point_code1 + "'").uniqueResult(0); + dj_jo.put("point_status", "1"); + dj_jo.put("material_code", ""); + WQLObject.getWQLObject("sch_base_point").update(dj_jo); + //更新满轴终点的空轴对接位 + JSONObject cut_jo = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("empty_point_code = '" + point_code3 + "'").uniqueResult(0); + cut_jo.put("empty_point_status", "2"); + cut_jo.put("empty_vehicle_code", "SJG"); + cut_jo.put("update_optid", currentUserId); + cut_jo.put("update_optname", currentUsername); + cut_jo.put("update_time", DateUtil.now()); + WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo); + //更新空轴点位 + JSONObject jsonCoolIvt2 = WQLObject.getWQLObject("st_ivt_coolpointivt").query("empty_point_code = '" + point_code4 + "'").uniqueResult(0); + jsonCoolIvt2.put("empty_point_status", "02"); + jsonCoolIvt2.put("empty_vehicle_code", jsonTask.getString("vehicle_code2")); + jsonCoolIvt2.put("cool_ivt_status", "01"); + jsonCoolIvt2.put("instorage_time", ""); + jsonCoolIvt2.put("update_optid", currentUserId); + jsonCoolIvt2.put("update_optname", currentUsername); + jsonCoolIvt2.put("update_time", DateUtil.now()); + WQLObject.getWQLObject("st_ivt_coolpointivt").update(jsonCoolIvt2); + } else { + // 更新主表状态 + JSONObject coolMst = ivtTab.query("task_id = '" + task_id + "'").uniqueResult(0); + coolMst.put("bill_status", "50"); + ivtTab.update(coolMst); - //更新冷却区母卷库存 - JSONObject jsonCoolIvt = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + point_code1 + "'").uniqueResult(0); - String container_name = jsonCoolIvt.getString("container_name"); // 母卷号 + //更新冷却区母卷库存 + JSONObject jsonCoolIvt = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + point_code1 + "'").uniqueResult(0); + String container_name = jsonCoolIvt.getString("container_name"); // 母卷号 - jsonCoolIvt.put("full_point_status", "01"); - jsonCoolIvt.put("container_name", ""); - jsonCoolIvt.put("workorder_id", ""); - jsonCoolIvt.put("ivt_qty", "0"); - jsonCoolIvt.put("cool_ivt_status", "01"); - jsonCoolIvt.put("instorage_time", ""); - jsonCoolIvt.put("update_optid", currentUserId); - jsonCoolIvt.put("update_optname", currentUsername); - jsonCoolIvt.put("update_time", DateUtil.now()); - WQLObject.getWQLObject("st_ivt_coolpointivt").update(jsonCoolIvt); + jsonCoolIvt.put("full_point_status", "01"); + jsonCoolIvt.put("container_name", ""); + jsonCoolIvt.put("workorder_id", ""); + jsonCoolIvt.put("ivt_qty", "0"); + jsonCoolIvt.put("cool_ivt_status", "01"); + jsonCoolIvt.put("instorage_time", ""); + jsonCoolIvt.put("update_optid", currentUserId); + jsonCoolIvt.put("update_optname", currentUsername); + jsonCoolIvt.put("update_time", DateUtil.now()); + WQLObject.getWQLObject("st_ivt_coolpointivt").update(jsonCoolIvt); - //更新分切区母卷库存 - JSONObject cut_jo = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("full_point_code = '" + point_code2 + "'").uniqueResult(0); - cut_jo.put("full_point_status", "02"); - cut_jo.put("container_name", container_name); - cut_jo.put("update_optid", currentUserId); - cut_jo.put("update_optname", currentUsername); - cut_jo.put("update_time", DateUtil.now()); - WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo); + //更新分切区母卷库存 + JSONObject cut_jo = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("full_point_code = '" + point_code2 + "'").uniqueResult(0); + cut_jo.put("full_point_status", "02"); + cut_jo.put("container_name", container_name); + cut_jo.put("update_optid", currentUserId); + cut_jo.put("update_optname", currentUsername); + cut_jo.put("update_time", DateUtil.now()); + WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo); - //更新分切区空轴库存 - JSONObject cut_jo2 = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("empty_point_code = '" + point_code3 + "'").uniqueResult(0); - cut_jo2.put("empty_point_status", "01"); - cut_jo2.put("empty_vehicle_code", ""); - cut_jo2.put("update_optid", currentUserId); - cut_jo2.put("update_optname", currentUsername); - cut_jo2.put("update_time", DateUtil.now()); - WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo2); + //更新分切区空轴库存 + JSONObject cut_jo2 = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("empty_point_code = '" + point_code3 + "'").uniqueResult(0); + cut_jo2.put("empty_point_status", "01"); + cut_jo2.put("empty_vehicle_code", ""); + cut_jo2.put("update_optid", currentUserId); + cut_jo2.put("update_optname", currentUsername); + cut_jo2.put("update_time", DateUtil.now()); + WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo2); - //更新冷却区空轴库存 - JSONObject jsonCoolIvt2 = WQLObject.getWQLObject("st_ivt_coolpointivt").query("empty_point_code = '" + point_code4 + "'").uniqueResult(0); - jsonCoolIvt2.put("empty_point_status", "02"); - jsonCoolIvt2.put("empty_vehicle_code", jsonTask.getString("vehicle_code2")); - jsonCoolIvt2.put("cool_ivt_status", "01"); - jsonCoolIvt2.put("instorage_time", ""); - jsonCoolIvt2.put("update_optid", currentUserId); - jsonCoolIvt2.put("update_optname", currentUsername); - jsonCoolIvt2.put("update_time", DateUtil.now()); - WQLObject.getWQLObject("st_ivt_coolpointivt").update(jsonCoolIvt2); + //更新冷却区空轴库存 + JSONObject jsonCoolIvt2 = WQLObject.getWQLObject("st_ivt_coolpointivt").query("empty_point_code = '" + point_code4 + "'").uniqueResult(0); + jsonCoolIvt2.put("empty_point_status", "02"); + jsonCoolIvt2.put("empty_vehicle_code", jsonTask.getString("vehicle_code2")); + jsonCoolIvt2.put("cool_ivt_status", "01"); + jsonCoolIvt2.put("instorage_time", ""); + jsonCoolIvt2.put("update_optid", currentUserId); + jsonCoolIvt2.put("update_optname", currentUsername); + jsonCoolIvt2.put("update_time", DateUtil.now()); + WQLObject.getWQLObject("st_ivt_coolpointivt").update(jsonCoolIvt2); - //更新该母卷对应分切计划的状态 - HashMap map = new HashMap<>(); - map.put("is_parent_ok", "1"); - WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(map, "parent_container_name = '" + container_name + "'"); + //更新该母卷对应分切计划的状态 + HashMap map = new HashMap<>(); + map.put("is_parent_ok", "1"); + WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(map, "parent_container_name = '" + container_name + "'"); - //回传MES - JSONObject mom_jo = new JSONObject(); - mom_jo.put("contain_name", container_name); - mom_jo.put("warehouse", "1"); - //判断该接口是否需要回传 - JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'cutPlanMomRollDeliveryComplete'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) { - new LmsToMesServiceImpl().cutPlanMomRollDeliveryComplete(mom_jo); + //回传MES + JSONObject mom_jo = new JSONObject(); + mom_jo.put("contain_name", container_name); + mom_jo.put("warehouse", "1"); + //判断该接口是否需要回传 + JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'cutPlanMomRollDeliveryComplete'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) { + new LmsToMesServiceImpl().cutPlanMomRollDeliveryComplete(mom_jo); + } } + } if ("010302".equals(jsonTask.getString("task_type"))) {