From 7b6750423088caf1434179726ed9306e688e1381 Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Wed, 30 Apr 2025 16:04:44 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BC=98=E5=8C=96=E7=A9=BA=E8=BD=B4?= =?UTF-8?q?=E9=80=80=E5=9B=9E=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dao/mapper/BstIvtShafttubeivtMapper.xml | 6 +++--- .../org/nl/b_lms/sch/tasks/slitter/ReturnShaftAgvTask.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml index 029697188..6b4139dc4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml @@ -71,16 +71,16 @@ WHERE b.have_qzz = '1' AND b.point_type = '6' AND b.qzz_size = #{size} - + AND b.qzz_generation = #{qzz_generation} AND b.point_location = #{location} AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status '07' AND t.point_code2 = b.point_code) AND 0 = (SELECT COUNT(*) FROM bst_ivt_shafttubeivt bb WHERE bb.have_qzz ='1' AND bb.point_type = '6' - + AND bb.qzz_generation = #{qzz_generation} - AND bb.qzz_size = #{qzz_size} AND bb.point_location = #{location} AND bb.sort_seq > b.sort_seq) + AND bb.qzz_size = #{size} AND bb.point_location = #{location} AND bb.sort_seq > b.sort_seq) ORDER BY b.sort_seq ASC diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/ReturnShaftAgvTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/ReturnShaftAgvTask.java index 82685ff3e..0149596da 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/ReturnShaftAgvTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/ReturnShaftAgvTask.java @@ -110,7 +110,7 @@ public class ReturnShaftAgvTask extends AbstractAcsTask { if (ObjectUtil.isEmpty(putWaitPoint)) { throw new BadRequestException("未找到可存放气涨轴规格「" + endPoint + "」的等待点位"); } - + log.info("点位信息：{}", endPointObj); // 创建行架任务 if (ObjectUtil.isNotEmpty(endPointObj.getQzz_no1())){ @@ -126,7 +126,7 @@ public class ReturnShaftAgvTask extends AbstractAcsTask { param.put("point_code1", endPointObj.getTruss_point_code1()); param.put("point_code2", putWaitPoint.getPoint_code()); // hint: 当前分切计划的气涨轴尺寸 - param.put("qzz_size", endPointObj.getQzz_no1()); + param.put("qzz_size", size); param.put("product_area", SlitterConstant.SLITTER_TASK_AREA); param.put("task_type", SlitterEnum.TASK_TYPE.code("穿拔轴缓存<>气胀轴缓存位")); param.put("is_bushing", "0"); @@ -145,7 +145,7 @@ public class ReturnShaftAgvTask extends AbstractAcsTask { param.put("point_code1", endPointObj.getTruss_point_code2()); param.put("point_code2", putWaitPoint.getPoint_code()); // hint: 当前分切计划的气涨轴尺寸 - param.put("qzz_size", endPointObj.getQzz_no2()); + param.put("qzz_size", size); param.put("task_type", SlitterEnum.TASK_TYPE.code("穿拔轴缓存<>气胀轴缓存位")); param.put("product_area", SlitterConstant.SLITTER_TASK_AREA); param.put("is_bushing", "0");