From 0fe840bbf2ad39d9023d37c8c335c3ad6e092c72 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Sun, 23 Nov 2025 10:54:43 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E7=8E=B0=E5=9C=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E4=BA=9B=E5=A4=84=E7=90=86=E4=B8=8E=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../struct/controller/StIvtStructattrController.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java index 747a9e56..b5f6c9b9 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java @@ -205,14 +205,17 @@ public class StIvtStructattrController { public ResponseEntity unlock(@RequestBody JSONObject form) { String vehicleCode = form.getString("vehicle_code"); StIvtStructattr struct = iStIvtStructattrService.getOne(new LambdaQueryWrapper().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 parentCode = originalCode.substring(0, originalCode.lastIndexOf("-")); vehicleCode = "L02-03,L02-04,L02-05,L02-05"; QueryWrapper query1 = new QueryWrapper() .likeRight("struct_code", parentCode) .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 list = iStIvtStructattrService.list(query1); List structCodes = list.stream() .map(StIvtStructattr::getStruct_code)