From b343a5c0547febee1c89e914c6dee4f6a550cd8b Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Tue, 9 Jul 2024 10:44:42 +0800
Subject: [PATCH] =?UTF-8?q?remove=EF=BC=9A=E6=89=8B=E6=8C=81=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=9C=A8=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E6=B0=94=E8=83=80=E8=BD=B4=E4=B8=8A=E4=B8=8B=E8=BD=B4=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../slitter/service/impl/SlitterServiceImpl.java    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
index 0caee935a..8eca237ac 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
@@ -1108,6 +1108,7 @@ public class SlitterServiceImpl implements SlitterService {
     public JSONObject toSubvolumeBinding(JSONObject param) {
         // param : container_name, point_code
         String containerName = param.getString("container_name");
+        String pointCode1 = param.getString("point_code");
         if (ObjectUtil.isEmpty(containerName)) {
             throw new BadRequestException("子卷号不能为空!");
         }
@@ -1116,7 +1117,7 @@ public class SlitterServiceImpl implements SlitterService {
         if (plans.size() == 0) {
             throw new BadRequestException("子卷号：[" + containerName + "] 的分切计划没找到，检查是否推送或者子卷号是否正确！");
         }
-        BstIvtCutpointivt pointCode = bcutpointivtService.getPintByTrussCode(param.getString("point_code"), false);
+        BstIvtCutpointivt pointCode = bcutpointivtService.getPintByTrussCode(pointCode1, false);
         PdmBiSlittingproductionplan demoPlan = plans.get(0);
         String resourceName = demoPlan.getResource_name();
         // 创建新的气胀轴编码
@@ -1128,12 +1129,12 @@ public class SlitterServiceImpl implements SlitterService {
         plans.forEach(p -> {
             p.setQzzno(qzzNo);
             TaskUtils.updateOptMessageBySlitterPlan(p);
-            if ("1".equals(p.getUp_or_down())) {
-                pointCode.setQzz_no1(qzzNo);
-            } else {
-                pointCode.setQzz_no2(qzzNo);
-            }
         });
+        if (pointCode1.endsWith("A")) {
+            pointCode.setQzz_no1(qzzNo);
+        } else {
+            pointCode.setQzz_no2(qzzNo);
+        }
         pointCode.setPoint_status("3");
         slittingproductionplanService.updateBatchById(plans);
         bcutpointivtService.updateById(pointCode);