From e9e7d7d61f112db104165032961b86946a6e4fa4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com> Date: Tue, 25 Mar 2025 16:08:33 +0800 Subject: [PATCH] =?UTF-8?q?opt=EF=BC=9A=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E5=A5=97=E8=BD=B43=E5=AF=B8=E5=88=A4=E6=96=AD=E4=BB=A3?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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 | 10 ++++++---- 5 files changed, 13 insertions(+), 8 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 61edd60c2..513c51d71 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 pointCode, String location); + List getByQzzSize(String qzzSize, String specification ,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 c03347bdb..eaf7637ba 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 pointCode, String location); + List getByQzzSize(String qzzSize, String specification ,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 fef818915..d5dd51b90 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,6 +18,9 @@ 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 b486b4421..47ca8874d 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 pointCode, String location) { - return bstIvtShafttubeivtMapper.getByQzzSize(qzzSize, pointCode, location); + public List getByQzzSize(String qzzSize, String specification ,String pointCode, String location) { + return bstIvtShafttubeivtMapper.getByQzzSize(qzzSize, specification,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 f311dd2a7..a12c43f7e 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 @@ -226,13 +226,15 @@ public class AutoCallAirShaftTask { // 获取其中一条 PdmBiSlittingproductionplan needPlan = needPlans.get(0); String qzzSize = needPlan.getQzz_size(); + + String qzz_generation = needPlan.getQzz_generation(); // 从套轴对接位获取相同气涨轴大小 // update: 不需要(同标箔或者锂电分开) // todo: 需要校验区域0/1 List qzzPoint = bcutpointivtService.getPointByTypeAndShaftSize("1", qzzSize, specification); if (qzzPoint.size() == 0) { // 调用ACS滚条气涨轴下来 - if (!toAcsOutShaft(qzzSize, location, empty)) { + if (!toAcsOutShaft(qzzSize, qzz_generation,location, empty)) { log.error("穿拔轴{}不进行套轴，跳过！", empty.getPoint_code()); return; } @@ -248,7 +250,7 @@ public class AutoCallAirShaftTask { saveCutPlanMessage(empty, needPlans, qzzSize); // 如果不存在，则发起信号滚气涨轴 // 调用ACS滚条气涨轴下来 - if (!toAcsOutShaft(qzzSize, location, empty)) { + if (!toAcsOutShaft(qzzSize,qzz_generation, location, empty)) { log.error("穿拔轴{}不进行套轴，跳过！", empty.getPoint_code()); return; } @@ -435,9 +437,9 @@ public class AutoCallAirShaftTask { * @param location 位置：上半部分还是下半部分 * @param empty 套拔轴点位 */ - private Boolean toAcsOutShaft(String qzzSize, String location, BstIvtShafttubeivt empty) { + private Boolean toAcsOutShaft(String qzzSize, String specification, String location, BstIvtShafttubeivt empty) { // 需要区分上下 - List shafttubeivts = bstIvtShafttubeivtService.getByQzzSize(qzzSize, empty.getPoint_code(), location); + List shafttubeivts = bstIvtShafttubeivtService.getByQzzSize(qzzSize, specification ,empty.getPoint_code(), location); if (shafttubeivts.size() == 0) { log.error("气胀轴库找不到[" + qzzSize + "]规格的气涨轴位"); return false;