From f413bfeb8214d4622704e10c1d1f72eab695fcf1 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 9 Jun 2025 15:23:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=9D=E5=A7=8B=E5=8C=96=E7=A9=BF?= =?UTF-8?q?=E6=8B=94=E8=BD=B4=E5=B0=86=E9=A2=84=E5=88=86=E9=85=8D=E6=B8=85?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IBstIvtShafttubeivtService.java | 9 +++++++++ .../dao/mapper/BstIvtShafttubeivtMapper.java | 4 ++++ .../dao/mapper/BstIvtShafttubeivtMapper.xml | 17 +++++++++++++++++ .../impl/BstIvtShafttubeivtServiceImpl.java | 5 +++++ .../service/impl/SlitterServiceImpl.java | 14 +++++++++++--- 5 files changed, 46 insertions(+), 3 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 84550d7ad..2709db055 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 @@ -113,4 +113,13 @@ public interface IBstIvtShafttubeivtService extends IService List getOtherCBJData(String pointCode, String location); List getNotTaskEmptyShaftCache(String size, String qzz_generation, String location); + + /** + * 获取预分配的点位 + * @param qzzSize + * @param qzzGen + * @param location + * @return + */ + BstIvtShafttubeivt getNeedInitPoint(String qzzSize, String qzzGen, 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 80995005c..38c47b65e 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 @@ -50,4 +50,8 @@ public interface BstIvtShafttubeivtMapper extends BaseMapper List getNotTaskShaftCache2(@Param("qzzSize") String qzzSize, @Param("specification") String specification, @Param("location") String location); + + BstIvtShafttubeivt getNeedInitPoint(@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 8d2842d02..4619ec858 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 @@ -98,4 +98,21 @@ AND (b.plan ]]> '1' OR b.plan IS NULL) ORDER BY b.sort_seq DESC + 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 03a3a67eb..b5e7f8beb 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 @@ -159,4 +159,9 @@ public class BstIvtShafttubeivtServiceImpl extends ServiceImpl value != null && !value.isEmpty()).collect(Collectors.toList()); if (collect.size() == 0) { log.error("找不到[{}]对应的分切计划!", deviceCode); - stepTipLogs.add("套轴完成->找不到[" + deviceCode + "]点位记录的分切计划!"); + stepTipLogs.add("套轴完成->找不到[" + deviceCode + "]点位记录的分切计划!分切计划可能被删除或者拼接!"); redisUtils.set("ERROR" + deviceCode, stepTipLogs); throw new BadRequestException("找不到[" + deviceCode + "]对应的分切计划!"); } @@ -361,7 +361,7 @@ public class SlitterServiceImpl implements SlitterService { } } } else { - stepTipLogs.add("套轴完成->[" + collect + "]对应的分切计划状态已更改，创建任务失败!"); + stepTipLogs.add("套轴完成->[" + collect + "]对应的分切计划状态已更改，异常处理位没位置，创建任务失败!"); redisUtils.set("ERROR" + deviceCode, stepTipLogs); throw new BadRequestException("[" + collect + "]对应的分切计划状态已更改，异常处理位没位置!"); } @@ -1019,6 +1019,8 @@ public class SlitterServiceImpl implements SlitterService { if (SlitterConstant.SLITTER_NO.equals(shaftPoint.getHave_qzz())) { throw new BadRequestException("点位不存在气胀轴信息，无需初始化!"); } + String qzzSize = shaftPoint.getQzz_size(); + String qzzGen = shaftPoint.getQzz_generation(); if (SlitterConstant.SLITTER_YES.equals(isAgainTz)) { //2、把当前点位上子卷号对应的is_paper_ok改为1 List containers = Stream.of(shaftPoint.getContainer_name1(), shaftPoint.getContainer_name2()) @@ -1042,7 +1044,13 @@ public class SlitterServiceImpl implements SlitterService { shaftPoint.setQzz_size(""); TaskUtils.updateOptMessageByBShaftPoint(shaftPoint); shafttubeivtService.update(shaftPoint); - // todo: 初始化 预分配点位 + // 初始化 预分配点位 + BstIvtShafttubeivt shafttubeivt = shafttubeivtService.getNeedInitPoint(qzzSize, qzzGen, shaftPoint.getPoint_location()); + if (ObjectUtil.isNotEmpty(shafttubeivt)) { + shafttubeivt.setPlan(""); + shafttubeivt.setTube_name1(""); + shafttubeivtService.updateById(shafttubeivt); + } JSONObject res = new JSONObject(); res.put("status", HttpStatus.HTTP_OK); res.put("message", "请求成功!");