From 368f6b6427a5c26447ebcf4d3d40b75ae7f64595 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 1 May 2025 15:03:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A5=97=E8=BD=B4=E5=8A=A0=E5=BC=BA?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=B0=94=E6=B6=A8=E8=BD=B4=E5=BA=93=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=A0=A1=E9=AA=8C=EF=BC=881=E3=80=812=E5=8F=B7?= =?UTF-8?q?=E6=8F=92=E6=8B=94=E8=BD=B4=E6=9C=BA=E5=90=8C=E6=97=B6=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=A5=97=E7=AE=A1=EF=BC=8C=E6=B0=94=E8=83=80=E8=BD=B4?= =?UTF-8?q?=E5=BA=93=E9=87=8C=E5=8F=AA=E6=9C=891=E6=A0=B9=E8=BD=B4?= =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=98=AF=E5=90=8C=E6=97=B6=E7=94=9F=E6=88=90?= =?UTF-8?q?=E4=BA=86=E4=B8=A4=E4=B8=AA=E5=88=86=E5=88=AB=E5=8E=BB1?= =?UTF-8?q?=E3=80=812=E5=8F=B7=E6=8B=94=E8=BD=B4=E6=9C=BA=E7=9A=84?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IBstIvtShafttubeivtService.java | 8 +++++++ .../dao/mapper/BstIvtShafttubeivtMapper.java | 11 ++++++++++ .../dao/mapper/BstIvtShafttubeivtMapper.xml | 15 +++++++++++++ .../impl/BstIvtShafttubeivtServiceImpl.java | 5 +++++ .../slitter/TrussCallShaftCacheTask.java | 2 ++ .../slitter/auto/AutoCallAirShaftTask.java | 21 +++++++++++++------ .../service/impl/SlitterServiceImpl.java | 3 --- 7 files changed, 56 insertions(+), 9 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 0f02c094b..84550d7ad 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 @@ -86,6 +86,14 @@ public interface IBstIvtShafttubeivtService extends IService * @return */ List getNotTaskShaftCache(String qzzSize, String specification, String location); + /** + * 获取没任务的气涨轴缓存位2 + * @param qzzSize + * @param specification + * @param location + * @return + */ + List getNotTaskShaftCache2(String qzzSize, String specification, 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 3ab9dd097..80995005c 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 @@ -39,4 +39,15 @@ public interface BstIvtShafttubeivtMapper extends BaseMapper List getNotTaskEmptyShaftCache(@Param("size") String size, @Param("qzz_generation") String qzz_generation, @Param("location") String location); + + /** + * 获取含有气胀轴的气胀轴暂存位 + * @param qzzSize 气胀轴尺寸 + * @param specification 标箔/锂电 + * @param location 位置（上下） + * @return / + */ + List getNotTaskShaftCache2(@Param("qzzSize") String qzzSize, + @Param("specification") String specification, + @Param("location") 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 dfcd586c8..8d2842d02 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 @@ -83,4 +83,19 @@ 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/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 0ecafd762..03a3a67eb 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 @@ -127,6 +127,11 @@ public class BstIvtShafttubeivtServiceImpl extends ServiceImpl getNotTaskShaftCache2(String qzzSize, String specification, String location) { + return bstIvtShafttubeivtMapper.getNotTaskShaftCache2(qzzSize, specification, location); + } + @Override public List getNotTaskShaftCacheEmpty(BstIvtShafttubeivt startPoint) { return bstIvtShafttubeivtMapper.getNotTaskShaftCacheEmpty(startPoint); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallShaftCacheTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallShaftCacheTask.java index 503676c0d..193fabd35 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallShaftCacheTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallShaftCacheTask.java @@ -86,6 +86,8 @@ public class TrussCallShaftCacheTask extends AbstractAcsTask { // 起点清空,如果是入密集库的行架任务，起点不清空 if(!startPointObj.getPoint_code().contains("B_CBJ")){ startPointObj.setHave_qzz("0"); + startPointObj.setTube_name1(""); + startPointObj.setPlan(""); TaskUtils.updateOptMessageByBShaftPoint(startPointObj); shafttubeivtService.updateById(startPointObj); } 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 608ded95e..5fe39dc29 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 @@ -1,5 +1,6 @@ package org.nl.b_lms.sch.tasks.slitter.auto; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -578,18 +579,26 @@ public class AutoCallAirShaftTask { } boolean judgment1 = true; boolean judgment2 = true; - JSONObject data2 = pointStatus.getJSONArray("data").getJSONObject(0); - if (data2.getInteger("qty") == 0) { - log.warn("气胀轴库【" + shafttubeivt.getPoint_code() + "】没有气胀轴。"); - judgment1 = false; - } // 获取气涨轴缓存没有任务的点位 - List qzzCache = bstIvtShafttubeivtService.getNotTaskShaftCache(qzzSize, + List qzzCache = bstIvtShafttubeivtService.getNotTaskShaftCache2(qzzSize, shafttubeivt.getQzz_generation(), location); if (qzzCache.size() == 0) { log.warn("未找到气胀轴密集库气涨轴规格「" + qzzSize + "」的暂存位"); judgment2 = false; } + JSONObject data2 = pointStatus.getJSONArray("data").getJSONObject(0); + if (data2.getInteger("qty") == 0) { + log.warn("气胀轴库【" + shafttubeivt.getPoint_code() + "】没有气胀轴。"); + judgment1 = false; + // 预扣除 + if (judgment2) { + BstIvtShafttubeivt waitUsedPoint = qzzCache.get(0); + waitUsedPoint.setPlan("1"); + waitUsedPoint.setTube_name1("预分配给" + empty.getPoint_code()); + waitUsedPoint.setUpdate_time(DateUtil.now()); + bstIvtShafttubeivtService.updateById(waitUsedPoint); + } + } stepStr += ",30"; if (!judgment1 && !judgment2) { log.warn("没有气胀轴，不给ACS写出轴信息"); 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 ca77664b4..3001d9a1f 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 @@ -12,9 +12,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import lombok.Data; -import lombok.Getter; -import lombok.Setter; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.nl.b_lms.bst.ivt.cutpointivt.service.IBstIvtCutpointivtService;