From c86ee18d3a0eaf664f5d38b862e70e12ccb74dc9 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sun, 23 Jun 2024 14:50:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=86=85=E5=8C=85=E9=97=B4=E4=B8=8D?= =?UTF-8?q?=E5=A5=97=E8=BD=B4=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tasks/slitter/service/impl/SlitterServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 8b9841694..426e320d2 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 @@ -117,9 +117,17 @@ public class SlitterServiceImpl implements SlitterService { throw new BadRequestException("设备：{ " + deviceCode + " }对应的气胀轴尺寸不批对" + "，需要气胀轴尺寸：{ " + point.getQzz_size() + " }，实际尺寸：{ " + size + " }"); } + List tubes = Stream.of(point.getTube_code1(), point.getTube_code2()) + .filter(ObjectUtil::isNotEmpty) + .collect(Collectors.toList()); + // 判断是否存在纸管 + List list = papervehicleService.list(new LambdaQueryWrapper() + .in(MdPbPapervehicle::getMaterial_code, tubes) + .gt(MdPbPapervehicle::getQty, 0)); // point.getTube_code1() 编码 ， getTube_name1() ： 纸制筒管|纸管|6英寸|1300 or 纸制筒管|纸管|3英寸|12|650 res.put("device_code", deviceCode); res.put("data", con); + con.put("is_bushing", list.size() > 0 ? SlitterConstant.SLITTER_YES : SlitterConstant.SLITTER_NO); con.put("left", point.getTube_code1()); con.put("leftSize", ObjectUtil.isNotEmpty(point.getTube_name1()) ? point.getTube_name1().split("\\|")[2].charAt(0) : "");