From 33f905dab172ad25413877524a9b6dfee32beab4 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Wed, 15 Oct 2025 09:36:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=85=A5=E7=83=98=E7=AE=B1=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/b_lms/pda/controller/VehicleTwoController.java | 7 +++++++ .../service/impl/BstIvtPackageinfoivtServiceImpl.java | 3 ++- .../org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java index 0e47b395a..8288017ce 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java @@ -81,6 +81,13 @@ public class VehicleTwoController { return new ResponseEntity<>(bstIvtPackageInfoIvtService.update(whereJson), HttpStatus.OK); } + @PostMapping("/getPointInfo") + @Log("获取装箱区点位子卷信息") + @SaIgnore + public ResponseEntity getPointInfo(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(bstIvtPackageInfoIvtService.getOne(new LambdaQueryWrapper().eq(BstIvtPackageinfoivt::getPoint_code, whereJson.getString("point_code"))), HttpStatus.OK); + } + @PostMapping("/toEndSub") @Log("二期子卷包装解绑") @SaIgnore diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java index bc879e3d5..4206d53eb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java @@ -1053,7 +1053,8 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl 1) { result.put("status", org.springframework.http.HttpStatus.BAD_REQUEST.value()); - result.put("message", "存在多个相同子卷号或点位信息有误，请核对是否存在！"); + String collect = dtoList.stream().map(a -> a.getPoint_code()).collect(Collectors.joining(",")); + result.put("message", "存在多个相同子卷号或点位信息有误，请核对是否存在！重复点位信息【"+collect+"】"); return result; } BstIvtPackageinfoivt packageinfoivt = dtoList.get(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java index 30d9808cb..599493715 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java @@ -79,10 +79,10 @@ public class BakingServiceImpl implements BakingService { String temperature = whereJson.getString("temperature"); // 温度 String hours = whereJson.getString("hours"); // 时间 String point_code1 = whereJson.getString("point_code"); // 点位 - if (SlitterTaskUtil.isNumeric(hours)) { + if (!SlitterTaskUtil.isNumeric(hours)) { throw new BadRequestException("请输入合法的时间!"); } - if (SlitterTaskUtil.isNumeric(temperature)) { + if (!SlitterTaskUtil.isNumeric(temperature)) { throw new BadRequestException("请输入合法的温度!"); } //查询该点位是否存在未完成的任务