root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
liyongde
2025-10-16 15:54:40 +08:00
parent c6788bd3a7 33f905dab1
commit 967920c3ba
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java
View File

@@ -81,6 +81,13 @@ public class VehicleTwoController {
return new ResponseEntity<>(bstIvtPackageInfoIvtService.update(whereJson), HttpStatus.OK); 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") @PostMapping("/toEndSub")
@Log("二期子卷包装解绑") @Log("二期子卷包装解绑")
@SaIgnore @SaIgnore

3
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
View File

@@ -1053,7 +1053,8 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
} }
if (dtoList.size() > 1) { if (dtoList.size() > 1) {
result.put("status", org.springframework.http.HttpStatus.BAD_REQUEST.value()); 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; return result;
} }
BstIvtPackageinfoivt packageinfoivt = dtoList.get(0); BstIvtPackageinfoivt packageinfoivt = dtoList.get(0);

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
View File

@@ -79,10 +79,10 @@ public class BakingServiceImpl implements BakingService {
String temperature = whereJson.getString("temperature"); // 温度 String temperature = whereJson.getString("temperature"); // 温度
String hours = whereJson.getString("hours"); // 时间 String hours = whereJson.getString("hours"); // 时间
String point_code1 = whereJson.getString("point_code"); // 点位 String point_code1 = whereJson.getString("point_code"); // 点位
if (SlitterTaskUtil.isNumeric(hours)) { if (!SlitterTaskUtil.isNumeric(hours)) {
throw new BadRequestException("请输入合法的时间!"); throw new BadRequestException("请输入合法的时间!");
} }
if (SlitterTaskUtil.isNumeric(temperature)) { if (!SlitterTaskUtil.isNumeric(temperature)) {
throw new BadRequestException("请输入合法的温度!"); throw new BadRequestException("请输入合法的温度!");
} }
//查询该点位是否存在未完成的任务 //查询该点位是否存在未完成的任务

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

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