From 60b205d66af257fbd859e1be7009f829f0eda9d9 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Tue, 7 Feb 2023 09:40:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E4=BC=A0MES=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SlittingproductionplanServiceImpl.java    | 23 +++++++++++++------
 .../org/nl/wms/sch/tasks/CutConveyorTask.java |  5 ++--
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java
index 7f632aacc..44fd22e15 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java
@@ -190,7 +190,7 @@ public class SlittingproductionplanServiceImpl implements Slittingproductionplan
             }
 
             //判断该接口是否需要回传
-            JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollSemiFGInboundComplete'").uniqueResult(0);
+            JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'airSwellWithPaperTubeAssArrival'").uniqueResult(0);
             if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")){
                 lmsToMesService.cutPlanMomRollDeliveryComplete(mom_jo);
             }
@@ -243,12 +243,21 @@ public class SlittingproductionplanServiceImpl implements Slittingproductionplan
                 throw new BadRequestException("还未绑定气涨轴！");
             }
             HashMap map = new HashMap();
-            map.put("is_child_ps_ok","1");
-            map.put("status","03");
-            map.put("update_optid",currentUserId);
-            map.put("update_optname",currentUsername);
-            map.put("update_time",DateUtil.now());
-            tab.update(map,"qzzno = '"+jsonObject.getString("qzzno")+"'");
+            jsonObject.put("is_child_ps_ok","1");
+            jsonObject.put("status","03");
+            jsonObject.put("update_optid",currentUserId);
+            jsonObject.put("update_optname",currentUsername);
+            jsonObject.put("update_time",DateUtil.now());
+            tab.update(jsonObject);
+
+            //调用MES接口，通知MES已经套轴完成
+            JSONObject jo = new JSONObject();
+            jo.put("container_name", jsonObject.getString("container_name"));
+            //判断该接口是否需要回传
+            JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'airSwellWithPaperTubeAssComplete'").uniqueResult(0);
+            if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")) {
+                lmsToMesService.airSwellWithPaperTubeAssArrival(jo);
+            }
         }
     }
 
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 12561f483..1837624b1 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
@@ -113,6 +113,7 @@ public class CutConveyorTask extends AbstractAcsTask {
                     String sort_seq = jsonIvt.getString("sort_seq");
                     JSONObject right_point = WQL.getWO("PDA_02")
                             .addParam("point_location", point_location)
+                            .addParam("point_code", point_code1)
                             .addParam("product_area", product_area)
                             .addParam("sort_seq", sort_seq)
                             .addParam("find_type", "1")
@@ -158,14 +159,14 @@ public class CutConveyorTask extends AbstractAcsTask {
 
                 LmsToMesService lmsToMesService = SpringContextHolder.getBean(LmsToMesService.class);
                 //调用MES配送完成接口
-                JSONArray rows = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + jsonTask.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '0' AND is_delete ='0' AND status = '02'").getResultJSONArray(0);
+                JSONArray rows = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + jsonTask.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete ='0' AND status = '03'").getResultJSONArray(0);
                 for (int i = 0; i < rows.size(); i++) {
                     JSONObject row = rows.getJSONObject(i);
                     String ContainerName = row.getString("container_name");
                     JSONObject jo = new JSONObject();
                     jo.put("ContainerName", ContainerName);
                     //判断该接口是否需要回传
-                    JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollSemiFGInboundComplete'").uniqueResult(0);
+                    JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'airSwellWithPaperTubeAssArrival'").uniqueResult(0);
                     if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")) {
                         lmsToMesService.airSwellWithPaperTubeAssArrival(row);
                     }