From 79518224d3086f7f536fb5320efbbeabb9b68ab3 Mon Sep 17 00:00:00 2001 From: liuxy Date: Sat, 3 Aug 2024 10:46:52 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=89=BE=E7=9B=B8=E5=90=8C?= =?UTF-8?q?=E8=A7=84=E6=A0=BC=E6=9C=A8=E7=AE=B1=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/iostorInv/util/impl/InBoxManageServiceImpl.java | 1 + .../ios/service/iostorInv/util/wql/BST_INBOX.wql | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java index ce889a94d..90f0a97b1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java @@ -463,6 +463,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { && row.getDoubleValue("box_width") == jsonParam.getDoubleValue("box_width") && row.getDoubleValue("box_high") == jsonParam.getDoubleValue("box_high") && row.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定")) + && row.getString("is_packing").equals(IOSEnum.IS_NOTANDYES.code("否")) && ObjectUtil.isNotEmpty(row.getString("storagevehicle_code")) ) .collect(Collectors.toList()); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql index a3c17f1f2..abf164d36 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql @@ -231,10 +231,11 @@ attr.*, box.box_length, box.box_width, - box.box_high + box.box_high, + box.is_packing FROM st_ivt_structattr attr - LEFT JOIN bst_ivt_boxinfo box ON box.box_no = attr.storagevehicle_code AND box.is_packing = '0' + LEFT JOIN bst_ivt_boxinfo box ON box.box_no = attr.storagevehicle_code WHERE attr.is_used = '1' AND attr.is_delete = '0'