From be36bf1468fd1dfacad941e35702e76d1b29ffe2 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Fri, 2 Jun 2023 18:02:37 +0800 Subject: [PATCH] =?UTF-8?q?rev:MES=E8=B0=83=E7=94=A8=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E4=B8=8B=E5=8D=B7=E4=B8=8D=E5=81=9A=E5=A4=84=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E5=88=86=E5=88=87=E8=BE=93=E9=80=81=E5=87=BA=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=BD=BD=E5=85=B7=E5=8F=B7=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/ext/mes/service/impl/MesToLmsServiceImpl.java | 4 ++-- .../wms/ext/sap/service/impl/SapToLmsServiceImpl.java | 10 +++++++++- .../org/nl/wms/pda/mps/service/impl/InServiceImpl.java | 1 + .../java/org/nl/wms/sch/tasks/CutConveyorTask.java | 6 +++--- .../main/java/org/nl/wms/sch/tasks/CutTrussTask.java | 2 +- 5 files changed, 16 insertions(+), 7 deletions(-) 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 a4b8feb23..c8dca0c5b 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 @@ -210,7 +210,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { JSONObject jsonSb = sbTab.query("ext_code = '" + resourceName + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonSb)) throw new BadRequestException("点位设备不存在"); - if (StrUtil.equals("1", jsonSb.getString("is_used"))) { + /*if (StrUtil.equals("1", jsonSb.getString("is_used"))) { //查询该母卷对应的工单状态是否为准备就绪，如果不是则提示报错 // 更新工单状态 JSONObject jsonRaw = rawTab.query("container_name = '" + containerName + "'").uniqueResult(0); @@ -233,7 +233,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { } jsonRaw.put("status", "04"); rawTab.update(jsonRaw); - } + }*/ result.put("RTYPE", "S"); result.put("RTMSG", "操作成功!"); result.put("RTOAL", 1); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java index f8b8a1d1b..3b3047325 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java @@ -214,7 +214,7 @@ public class SapToLmsServiceImpl implements SapToLmsService { throw new BadRequestException("此物料不存在" + json.getString("MATNR")); } - JSONObject sub_jo = WQLObject.getWQLObject("PDM_BI_SubPackageRelation").query("container_name = '" + sap_pcsn + "'").uniqueResult(0); + JSONObject sub_jo = WQLObject.getWQLObject("PDM_BI_SubPackageRelation").query("sap_pcsn = '" + sap_pcsn + "'").uniqueResult(0); if (ObjectUtil.isEmpty(sub_jo)) { //为空新增一条 sub_jo = new JSONObject(); @@ -229,6 +229,7 @@ public class SapToLmsServiceImpl implements SapToLmsService { sub_jo.put("container_name", sap_pcsn); sub_jo.put("width", width); sub_jo.put("net_weight", json.getString("LFIMG")); + sub_jo.put("box_weight", json.getString("LFIMG")); sub_jo.put("length", length); sub_jo.put("is_un_plan_production", 0); sub_jo.put("create_id", 0); @@ -238,16 +239,23 @@ public class SapToLmsServiceImpl implements SapToLmsService { sub_jo.put("sap_pcsn", sap_pcsn); sub_jo.put("vbeln", json.getString("VBELN")); sub_jo.put("posnr", json.getString("POSNR")); + sub_jo.put("box_length", json.getString("ZMXL")); + sub_jo.put("box_width", json.getString("ZMXW")); + sub_jo.put("box_high", json.getString("ZMXH")); WQLObject.getWQLObject("PDM_BI_SubPackageRelation").insert(sub_jo); } else { //不为空修改子卷包装关系 sub_jo.put("vbeln", json.getString("VBELN")); sub_jo.put("posnr", json.getString("POSNR")); + sub_jo.put("quanlity_in_box", 1); sub_jo.put("package_box_sn", package_box_sn); sub_jo.put("width", width); sub_jo.put("length", length); sub_jo.put("status", "0"); sub_jo.put("net_weight", json.getString("LFIMG")); // 变更为真实退货数量 + sub_jo.put("box_length", json.getString("ZMXL")); + sub_jo.put("box_width", json.getString("ZMXW")); + sub_jo.put("box_high", json.getString("ZMXH")); WQLObject.getWQLObject("PDM_BI_SubPackageRelation").update(sub_jo); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/InServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/InServiceImpl.java index 8b81925b7..22eaf3206 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/InServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/InServiceImpl.java @@ -129,6 +129,7 @@ public class InServiceImpl implements InService { JSONObject ss_jo = WQLObject.getWQLObject("sch_base_point").query("product_area = '" + convey_jo.getString("product_area") + "' AND point_type = '7'").uniqueResult(0); form.put("point_code2", ss_jo.getString("point_code")); form.put("task_type", "010401"); + form.put("vehicle_code2", ss_jo.getString("vehicle_code")); CutConveyorTask cutConveyorTask = new CutConveyorTask(); cutConveyorTask.createTask(form); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java index 5b10a00dd..ad8de3468 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java @@ -43,12 +43,12 @@ public class CutConveyorTask extends AbstractAcsTask { for (int i = 0; i < arr.size(); i++) { JSONObject json = arr.getJSONObject(i); - String vehicle_code = ""; + /*String vehicle_code = ""; if (json.getString("task_type").equals("010507")) { vehicle_code = json.getString("vehicle_code"); } else { vehicle_code = json.getString("vehicle_code2"); - } + }*/ AcsTaskDto dto = AcsTaskDto.builder() .ext_task_id(json.getString("task_id")) @@ -56,7 +56,7 @@ public class CutConveyorTask extends AbstractAcsTask { .task_type(json.getString("acs_task_type")) .start_device_code(json.getString("point_code1")) .next_device_code(json.getString("point_code2")) - .vehicle_code(vehicle_code) + .vehicle_code(json.getString("vehicle_code2")) .priority(json.getString("priority")) .remark(json.getString("remark")) .build(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java index 3ba7c1be4..41a0ae863 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java @@ -253,7 +253,7 @@ public class CutTrussTask extends AbstractAcsTask { form.put("point_code1", jsonTask.getString("point_code2")); JSONObject ss_jo = WQLObject.getWQLObject("sch_base_point").query("product_area = '" + delivery_point.getString("product_area") + "' AND point_type = '7'").uniqueResult(0); form.put("point_code2", ss_jo.getString("point_code")); - form.put("vehiclie_code2", delivery_point.getString("vehicle_code")); + form.put("vehicle_code2", delivery_point.getString("vehicle_code")); form.put("task_type", "010401"); cutConveyorTask.createTask(form); }