From a45b66f9da35e3c697640dd305fc2ddc61893d90 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Mon, 5 Aug 2024 12:10:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=85=A5=E5=BA=93=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E3=80=81=E4=BA=8C=E6=9C=9FMES=E8=B0=83=E7=94=A8LMS=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91=E5=AD=90=E5=8D=B7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PdmBiContainerinfoServiceImpl.java   |  2 +
 .../b_lms/sch/tasks/TwoExceptionInTask.java   |  1 +
 .../mes/service/impl/MesToLmsServiceImpl.java | 52 +++++++++++++++----
 3 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/info/service/impl/PdmBiContainerinfoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/info/service/impl/PdmBiContainerinfoServiceImpl.java
index da0d1dec5..3edcb3273 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/info/service/impl/PdmBiContainerinfoServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/info/service/impl/PdmBiContainerinfoServiceImpl.java
@@ -96,6 +96,7 @@ public class PdmBiContainerinfoServiceImpl extends ServiceImpl<PdmBiContainerinf
             subpackagerelation.setCreate_id(Long.parseLong(SecurityUtils.getCurrentUserId()));
             subpackagerelation.setActual_value(containerinfo.getActual_value());
             subpackagerelation.setExt_code("BC01");
+            subpackagerelation.setNeed_delete("99");
             subpackagerelation.setSub_type(containerinfo.getSub_type());
             subpackagerelation.setJoint_type(slittingproductionplan.getJoint_type());
             subpackagerelation.setMaterial_type(slittingproductionplan.getMaterial_type());
@@ -121,6 +122,7 @@ public class PdmBiContainerinfoServiceImpl extends ServiceImpl<PdmBiContainerinf
             subpackagerelation.setUn_plan_product_property3(containerinfo.getUn_plan_product_property3());
             subpackagerelation.setSap_pcsn(containerinfo.getSap_pcsn());
             subpackagerelation.setSub_type(containerinfo.getSub_type());
+            subpackagerelation.setNeed_delete("99");
             subpackagerelation.setWidth_standard(containerinfo.getWidth_standard());
             subpackagerelation.setThickness_request(containerinfo.getThickness_request());
             subpackagerelation.setDemand_limit(containerinfo.getDemand_limit());
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExceptionInTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExceptionInTask.java
index 5c92626d5..f840238c8 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExceptionInTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExceptionInTask.java
@@ -128,6 +128,7 @@ public class TwoExceptionInTask extends AbstractAcsTask {
 
         json.put("task_type", form.getString("task_type"));
         json.put("vehicle_code", form.getString("vehicle_code"));
+        json.put("vehicle_code2", form.getString("vehicle_code2"));
         json.put("point_code1", form.getString("point_code1"));
         json.put("point_code2", form.getString("point_code2"));
         json.put("request_param", form.getString("request_param"));
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 12106e50f..b2e28788e 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
@@ -946,15 +946,40 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                         if (ObjectUtil.isEmpty(plan_jo)) {
                             throw new BadRequestException("未查询到分切计划：" + row.getString("ContainerGroup"));
                         }
-                        //如果入站的分切计划气涨轴为空，则虚拟一个气涨轴编号
+
                         if (StrUtil.isEmpty(plan_jo.getString("qzzno"))) {
-                            if (i == 0 || i == 2) {
-                                plan_jo.put("qzzno", "XN-" + plan_jo.getString("resource_name") + "A");
-                            }
-                            if (i == 1 || i == 3) {
-                                plan_jo.put("qzzno", "XN-" + plan_jo.getString("resource_name") + "B");
+                            String container_name = plan_jo.getString("container_name");
+                            if (container_name.startsWith("A")) {
+                                //如果入站的分切计划气涨轴为空，则虚拟一个气涨轴编号
+                                if (StrUtil.isEmpty(plan_jo.getString("qzzno"))) {
+                                    if (i == 0 || i == 2) {
+                                        plan_jo.put("qzzno", "XN-" + plan_jo.getString("resource_name") + "A");
+                                    }
+                                    if (i == 1 || i == 3) {
+                                        plan_jo.put("qzzno", "XN-" + plan_jo.getString("resource_name") + "B");
+                                    }
+                                }
+                            } else if (container_name.startsWith("B")) {
+                                //调用方法创建一个新的气胀轴编号，赋值
+                                String resourceName = cut_jo.getString("ext_code");
+                                String qzzNO = resourceName.substring(0, 2)
+                                        + resourceName.substring(resourceName.length() - 2)
+                                        + plan_jo.getString("split_group")
+                                        + TaskUtils.getDateTime("yyMMddHHmmss") + "-"
+                                        + plan_jo.getString("up_or_down");
+                                //赋值完成后，将气胀轴编号给绑定到分切机上
+                                if (plan_jo.getString("up_or_down").equals("1")) {
+                                    cut_jo.put("up_qzzno", qzzNO);
+                                }
+                                if (plan_jo.getString("up_or_down").equals("2")) {
+                                    cut_jo.put("down_qzzno", qzzNO);
+                                }
+                                plan_jo.put("qzzno", qzzNO);
+                                WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo);
                             }
                         }
+
+
                         plan_jo.put("status", "05");
                         plan_jo.put("is_parent_ok", "1");
                         plan_jo.put("is_child_tz_ok", "1");
@@ -1050,7 +1075,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                 if (plan.getString("container_name").startsWith("B")) {
                     //如果属于二期的子卷出战调用二期的方法
                     cut_jo.put("device_code", cut_jo.getString("ext_code"));
-                    slitterService.downRolls(cut_jo);
+                    //slitterService.downRolls(cut_jo);
                 } else {
                     {
                         String up_point_code = cut_jo.getString("up_point_code");
@@ -1264,7 +1289,14 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                 //查询库内是否存在相同的子卷号
                 JSONObject container_jo = WQLObject.getWQLObject("PDM_BI_SubPackageRelation").query("container_name = '" + ContainerName + "'").uniqueResult(0);
                 if (ObjectUtil.isNotEmpty(container_jo)) {
-                    throw new BadRequestException("LMS系统中已存在子卷号：" + ContainerName + "，请检查！");
+                    if (container_jo.getString("need_delete").equals("99")) {
+                        WQLObject tab = WQLObject.getWQLObject("PDM_BI_SubPackageRelation");
+                        HashMap<String, String> map = new HashMap<>();
+                        map.put("need_delete", "");
+                        tab.update(map, "package_box_sn = '" + PackageBoxSN + "'");
+                    } else {
+                        throw new BadRequestException("LMS系统中已存在子卷号：" + ContainerName + "，请检查！");
+                    }
                 }
 
                 JSONObject jo = new JSONObject();
@@ -2198,7 +2230,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
         String sub_type = "";
         if (ObjectUtil.isEmpty(ReWorkName)) {
             sub_type = "0";
-        }else {
+        } else {
             if ("Recheck".equals(ReWorkName)) {
                 sub_type = "1";
             }
@@ -2379,7 +2411,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
             // 更新子卷包装关系
             JSONObject json = new JSONObject();
             json.put("is_pass", param.getString("IsPss"));
-            subTab.update(json,"package_box_sn = '"+param.getString("PackageBoxSn")+"'");
+            subTab.update(json, "package_box_sn = '" + param.getString("PackageBoxSn") + "'");
 
             resultParam.put("RTYPE", "S");
             resultParam.put("RTMSG", "操作成功!");