Merge remote-tracking branch 'origin/master_merge' into master_merge

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<Object> getPointInfo(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(bstIvtPackageInfoIvtService.getOne(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_code, whereJson.getString("point_code"))), HttpStatus.OK);
+    }
+
     @PostMapping("/toEndSub")
     @Log("二期子卷包装解绑")
     @SaIgnore

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<BstIvtPackagein
                         }
                         if (dtoList.size() > 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);

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("请输入合法的温度!");
             }
             //查询该点位是否存在未完成的任务

lms/nladmin-system/src/main/java/org/nl/wms/util/IdUtil.java

@@ -2,7 +2,7 @@ package org.nl.wms.util;
 
 public class IdUtil {
     public static Long getLongId() {
-        return IdUtil.getLongId();
+        return cn.hutool.core.util.IdUtil.getSnowflake(1, 1).nextId();
     }
 
     public static String getStringId() {