From b54c80b7748adf67afb53124c55b8bca18282d39 Mon Sep 17 00:00:00 2001 From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com> Date: Wed, 26 Mar 2025 12:32:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?opt:=E5=A5=97=E8=BD=B4=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shafttubeivt/service/IBstIvtShafttubeivtService.java | 2 +- .../service/dao/mapper/BstIvtShafttubeivtMapper.java | 2 +- .../service/dao/mapper/BstIvtShafttubeivtMapper.xml | 3 --- .../service/impl/BstIvtShafttubeivtServiceImpl.java | 4 ++-- .../sch/tasks/slitter/auto/AutoCallAirShaftTask.java | 8 ++++---- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java index 513c51d71..f8c65d218 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java @@ -76,7 +76,7 @@ public interface IBstIvtShafttubeivtService extends IService * @param location 位置：上半部分还是下半部分 * @return */ - List getByQzzSize(String qzzSize, String specification ,String pointCode, String location); + List getByQzzSize(String qzzSize ,String pointCode, String location); /** * 获取没任务的气涨轴缓存位 diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.java index eaf7637ba..d86e3de21 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.java @@ -14,7 +14,7 @@ public interface BstIvtShafttubeivtMapper extends BaseMapper List getAllShaftPointsByConditions(String type, String location, String have); - List getByQzzSize(String qzzSize, String specification ,String pointCode, String location); + List getByQzzSize(String qzzSize ,String pointCode, String location); /** * 获取含有气胀轴的气胀轴暂存位 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 d5dd51b90..fef818915 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 @@ -18,9 +18,6 @@ FROM `bst_ivt_shafttubeivt` bsf WHERE bsf.is_used = '1' AND bsf.qzz_size = #{qzzSize} - - AND bsf.qzz_generation = #{specification} - AND bsf.point_type = '1' AND bsf.point_location = #{location} AND bsf.parent_code = #{pointCode} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java index 47ca8874d..3037e44fc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java @@ -118,8 +118,8 @@ public class BstIvtShafttubeivtServiceImpl extends ServiceImpl getByQzzSize(String qzzSize, String specification ,String pointCode, String location) { - return bstIvtShafttubeivtMapper.getByQzzSize(qzzSize, specification,pointCode, location); + public List getByQzzSize(String qzzSize ,String pointCode, String location) { + return bstIvtShafttubeivtMapper.getByQzzSize(qzzSize,pointCode, location); } @Override 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 a12c43f7e..0b6357ac3 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 @@ -234,7 +234,7 @@ public class AutoCallAirShaftTask { List qzzPoint = bcutpointivtService.getPointByTypeAndShaftSize("1", qzzSize, specification); if (qzzPoint.size() == 0) { // 调用ACS滚条气涨轴下来 - if (!toAcsOutShaft(qzzSize, qzz_generation,location, empty)) { + if (!toAcsOutShaft(qzzSize,location, empty)) { log.error("穿拔轴{}不进行套轴，跳过！", empty.getPoint_code()); return; } @@ -250,7 +250,7 @@ public class AutoCallAirShaftTask { saveCutPlanMessage(empty, needPlans, qzzSize); // 如果不存在，则发起信号滚气涨轴 // 调用ACS滚条气涨轴下来 - if (!toAcsOutShaft(qzzSize,qzz_generation, location, empty)) { + if (!toAcsOutShaft(qzzSize, location, empty)) { log.error("穿拔轴{}不进行套轴，跳过！", empty.getPoint_code()); return; } @@ -437,9 +437,9 @@ public class AutoCallAirShaftTask { * @param location 位置：上半部分还是下半部分 * @param empty 套拔轴点位 */ - private Boolean toAcsOutShaft(String qzzSize, String specification, String location, BstIvtShafttubeivt empty) { + private Boolean toAcsOutShaft(String qzzSize, String location, BstIvtShafttubeivt empty) { // 需要区分上下 - List shafttubeivts = bstIvtShafttubeivtService.getByQzzSize(qzzSize, specification ,empty.getPoint_code(), location); + List shafttubeivts = bstIvtShafttubeivtService.getByQzzSize(qzzSize ,empty.getPoint_code(), location); if (shafttubeivts.size() == 0) { log.error("气胀轴库找不到[" + qzzSize + "]规格的气涨轴位"); return false; From 7a5df216819889f7377e7c22fee2d85d255f1fae Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 26 Mar 2025 19:47:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=203=E5=AF=B8=E6=94=BE=E8=B4=A7?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dao/mapper/BstIvtShafttubeivtMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fef818915..eaa0218a3 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 @@ -50,7 +50,7 @@ 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 b.qzz_generation = #{startPoint.qzz_generation} + AND bb.qzz_generation = #{startPoint.qzz_generation} AND bb.qzz_size = #{startPoint.qzz_size} AND bb.point_location = #{startPoint.point_location} AND bb.sort_seq > b.sort_seq) ORDER BY b.sort_seq ASC