From 7824c459beec3a535cd6d36fa32b095058de637b Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Fri, 11 Aug 2023 17:14:47 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=88=BB=E5=AD=97=E4=B8=8A?=
 =?UTF-8?q?=E6=96=99=E5=8D=8A=E6=88=90=E5=93=81=E5=BA=93=E5=AD=98=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/structLvt/StIvtStructivtBcpController.java     | 4 +++-
 .../structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml      | 3 +++
 .../semimanage/service/structIvt/dto/StructIvtBcpQuery.java   | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java
index b9ee55c3..90c06c92 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java
@@ -53,7 +53,9 @@ public class StIvtStructivtBcpController {
     //("半成品库存查询")
     public ResponseEntity<Object> bypdaQuery(@RequestBody PageQuery query) {
         query.setPage(0);
-        return new ResponseEntity<>(bcpService.packageQuery(new StructIvtBcpQuery(),query), HttpStatus.OK);
+        StructIvtBcpQuery bcpQuery = new StructIvtBcpQuery();
+        bcpQuery.setIs_lock("0");
+        return new ResponseEntity<>(bcpService.packageQuery(bcpQuery,query), HttpStatus.OK);
     }
 
     @GetMapping("/getBcpIvt")
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml
index c0326a84..1b42d1ba 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml
@@ -155,6 +155,9 @@
                 (mater.material_name LIKE #{query.material_code}) or
                 (mater.material_spec LIKE #{query.material_code})
             </if>
+            <if test="query.is_lock!= null and query.is_lock != ''">
+                and attr.lock_type = '0'
+            </if>
             <if test="query.struct_code!= null and query.struct_code != ''">
                 and attr.struct_code LIKE #{query.struct_code} or
                 (attr.struct_name LIKE #{query.struct_code})
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dto/StructIvtBcpQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dto/StructIvtBcpQuery.java
index de0219ba..9739a485 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dto/StructIvtBcpQuery.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dto/StructIvtBcpQuery.java
@@ -24,6 +24,8 @@ public class StructIvtBcpQuery extends BaseQuery<StIvtStructivtBcp> {
 
     private String struct_code;
 
+    private String is_lock;
+
     private Boolean is_delete = false;