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

rev：刻字上料半成品库存过滤

Browse Source
This commit is contained in:
zhangzhiqiang
2023-08-11 17:14:47 +08:00
parent b345ea5757
commit 7824c459be
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java
View File

@@ -53,7 +53,9 @@ public class StIvtStructivtBcpController {
//("半成品库存查询") //("半成品库存查询")
public ResponseEntity<Object> bypdaQuery(@RequestBody PageQuery query) { public ResponseEntity<Object> bypdaQuery(@RequestBody PageQuery query) {
query.setPage(0); 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") @GetMapping("/getBcpIvt")

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml
View File

@@ -155,6 +155,9 @@
(mater.material_name LIKE #{query.material_code}) or (mater.material_name LIKE #{query.material_code}) or
(mater.material_spec LIKE #{query.material_code}) (mater.material_spec LIKE #{query.material_code})
</if> </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 != ''"> <if test="query.struct_code!= null and query.struct_code != ''">
and attr.struct_code LIKE #{query.struct_code} or and attr.struct_code LIKE #{query.struct_code} or
(attr.struct_name LIKE #{query.struct_code}) (attr.struct_name LIKE #{query.struct_code})

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dto/StructIvtBcpQuery.java
View File

@@ -24,6 +24,8 @@ public class StructIvtBcpQuery extends BaseQuery<StIvtStructivtBcp> {
private String struct_code; private String struct_code;
private String is_lock;
private Boolean is_delete = false; private Boolean is_delete = false;