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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Administrator
2025-11-24 09:17:20 +08:00
parent 4e5992604c 0fe840bbf2
commit 772309fab6
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java
View File

@@ -205,14 +205,17 @@ public class StIvtStructattrController {
public ResponseEntity<Object> unlock(@RequestBody JSONObject form) { public ResponseEntity<Object> unlock(@RequestBody JSONObject form) {
String vehicleCode = form.getString("vehicle_code"); String vehicleCode = form.getString("vehicle_code");
StIvtStructattr struct = iStIvtStructattrService.getOne(new LambdaQueryWrapper<StIvtStructattr>().eq(StIvtStructattr::getVehicle_code, vehicleCode)); StIvtStructattr struct = iStIvtStructattrService.getOne(new LambdaQueryWrapper<StIvtStructattr>().eq(StIvtStructattr::getVehicle_code, vehicleCode));
if (struct.getLock_type().equals(StatusEnum.LOCK.code("禁分配锁"))) { if (struct.getLock_type().equals(StatusEnum.LOCK.code("禁分配锁"))||struct.getLock_type().equals(StatusEnum.LOCK.code("技改锁"))||!struct.getIs_used()) {
String originalCode = struct.getStruct_code(); // "L03-26-41" String originalCode = struct.getStruct_code(); // "L03-26-41"
String parentCode = originalCode.substring(0, originalCode.lastIndexOf("-")); String parentCode = originalCode.substring(0, originalCode.lastIndexOf("-"));
vehicleCode = "L02-03,L02-04,L02-05,L02-05"; vehicleCode = "L02-03,L02-04,L02-05,L02-05";
QueryWrapper<StIvtStructattr> query1 = new QueryWrapper<StIvtStructattr>() QueryWrapper<StIvtStructattr> query1 = new QueryWrapper<StIvtStructattr>()
.likeRight("struct_code", parentCode) .likeRight("struct_code", parentCode)
.isNotNull("vehicle_code") .isNotNull("vehicle_code")
.eq("lock_type", StatusEnum.LOCK.code("禁分配锁")); .and(wrapper -> wrapper.eq("lock_type", StatusEnum.LOCK.code("禁分配锁"))
.or()
.eq("lock_type", StatusEnum.LOCK.code("技改锁")) .or()
.eq("is_used", "0"));
List<StIvtStructattr> list = iStIvtStructattrService.list(query1); List<StIvtStructattr> list = iStIvtStructattrService.list(query1);
List<String> structCodes = list.stream() List<String> structCodes = list.stream()
.map(StIvtStructattr::getStruct_code) .map(StIvtStructattr::getStruct_code)