From c9d2be24052808dbb7d4116c6e9b80d34bee41bd Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Thu, 11 Apr 2024 14:46:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A5=97=E7=AE=A1=E4=B8=8B=E5=8F=91?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9A=84=E6=97=B6=E5=80=99=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E6=90=BA=E5=B8=A6=E9=9C=80=E8=A6=81=E7=9A=84=E7=BA=B8=E7=AE=A1?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=92=8C=E5=BD=93=E5=89=8D=E7=BA=B8=E7=AE=A1?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../slitter/auto/AutoCallAirShaftTask.java    | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
index 8ebbc0840..c6c33e6ce 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
@@ -143,7 +143,7 @@ public class AutoCallAirShaftTask {
             param.put("task_type", SlitterEnum.TASK_TYPE.code("穿拔轴缓存<>穿拔轴位"));
             param.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
             param.put("qzz_size", needPlan.getQzz_size());
-            // 纸管规格
+            // 所需的纸管规格
             for (PdmBiSlittingproductionplan plan : needPlans) {
                 if (SlitterConstant.SLITTER_SUB_VOLUME_LEFT.equals(plan.getLeft_or_right())) {
                     if (SlitterConstant.SLITTER_TYPE_PAPER.equals(plan.getPaper_tube_or_FRP())) {
@@ -159,6 +159,33 @@ public class AutoCallAirShaftTask {
                     }
                 }
             }
+            // 当前纸管的规格信息
+            String oldQzzNo = ObjectUtil.isNotEmpty(startPoint.getQzz_no1())
+                    ? startPoint.getQzz_no1() : startPoint.getQzz_no2();
+            if (oldQzzNo == null) {
+                throw new BadRequestException("当前气胀轴的编码为空！");
+            }
+            // 最多两条
+            List<PdmBiSlittingproductionplan> oldPlans = slittingproductionplanService.getByQzzNo(oldQzzNo);
+            for (PdmBiSlittingproductionplan plan : oldPlans) {
+                if (SlitterConstant.SLITTER_SUB_VOLUME_LEFT.equals(plan.getLeft_or_right())) {
+                    if (SlitterConstant.SLITTER_TYPE_PAPER.equals(plan.getPaper_tube_or_FRP())) {
+                        param.put("currentLeft", plan.getPaper_tube_model());
+                    } else {
+                        param.put("currentLeft", plan.getFRP_model());
+                    }
+                } else {
+                    if (SlitterConstant.SLITTER_TYPE_PAPER.equals(plan.getPaper_tube_or_FRP())) {
+                        param.put("currentRight", plan.getPaper_tube_model());
+                    } else {
+                        param.put("currentRight", plan.getFRP_model());
+                    }
+                }
+            }
+            // 套管数量
+            param.put("casingCount", needPlans.size());
+            // 拔管数量
+            param.put("pullCount", oldPlans.size());
             trussCallAirShaftTask.createTask(param);
             // 将分切计划is_paper_ok 1(纸管已经准备好) -> 2(已经套轴)
             needPlans.forEach(p -> {