From d1d54295eab4d81c8f30a94a530642c723749fd5 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Wed, 22 Feb 2023 11:33:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/wms/pda/mps/service/impl/InServiceImpl.java | 6 +++---
 .../org/nl/wms/pda/mps/service/impl/OutServiceImpl.java     | 2 +-
 .../src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

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 08db501fd..8b81925b7 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
@@ -61,7 +61,7 @@ public class InServiceImpl implements InService {
             throw new BadRequestException("未查询到对应的分切机！");
         }
 
-        if (!StrUtil.equals(cut_row.getString("point_code"),cut_ivt.getString("point_code"))){
+        if (!StrUtil.equals(cut_row.getString("resource_name"), cut_ivt.getString("ext_code"))) {
             throw new BadRequestException("请选择和分切计划相同的设备点位进行上空轴！");
         }
 
@@ -125,8 +125,8 @@ public class InServiceImpl implements InService {
         //如果查询到给ACS下发一个输送线任务
         JSONObject form = new JSONObject();
         form.put("point_code1", point_code);
-        JSONObject convey_jo = WQLObject.getWQLObject("st_ivt_deliverypointivt").query("point_code = '"+point_code+"'").uniqueResult(0);
-        JSONObject ss_jo = WQLObject.getWQLObject("sch_base_point").query("product_area = '"+convey_jo.getString("product_area")+"' AND point_type = '7'").uniqueResult(0);
+        JSONObject convey_jo = WQLObject.getWQLObject("st_ivt_deliverypointivt").query("point_code = '" + point_code + "'").uniqueResult(0);
+        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");
         CutConveyorTask cutConveyorTask = new CutConveyorTask();
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java
index aacc91545..270802c5d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java
@@ -108,7 +108,7 @@ public class OutServiceImpl implements OutService {
         }
 
         if (!StrUtil.equals(rows.getJSONObject(0).getString("resource_name"), cut_ivt.getString("ext_code"))) {
-            throw new BadRequestException("请选择和分切计划相同的设备点位进行上空轴！");
+            throw new BadRequestException("请选择和分切计划相同的设备点位进行下卷！");
         }
 
         String cut_qzzno = rows.getJSONObject(0).getString("qzzno");
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 a8f3bd3eb..43a339b28 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
@@ -393,7 +393,7 @@ public class CutTrussTask extends AbstractAcsTask {
         }
 
         //分切>输送线  子卷出站
-        if (form.getString("task_type").equals("010404")) {
+        if (form.getString("task_type").equals("010404") && !json.getString("vehicle_code").equals("waste foil")) {
             //更新出站气涨轴的分切计划状态
             JSONArray plan_jo2 = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + json.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '05'").getResultJSONArray(0);
             if (ObjectUtil.isEmpty(plan_jo2)) {