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 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}) + + and attr.lock_type = '0' + 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 { private String struct_code; + private String is_lock; + private Boolean is_delete = false;