diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/dao/mapper/IOStorInvMapper.xml b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/dao/mapper/IOStorInvMapper.xml index efaf272..e3762ce 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/dao/mapper/IOStorInvMapper.xml +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/dao/mapper/IOStorInvMapper.xml @@ -15,6 +15,10 @@ AND dis.pcsn LIKE #{params.pcsn} + + AND + dis.material_code LIKE #{params.material_code} + AND dis.pcsn IN #{params.pcsn_in} @@ -135,6 +139,10 @@ AND ios.bill_code LIKE #{params.bill_code} + + AND + dtl.material_code = #{params.material_code} + AND diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java index f1b258e..4ca2edd 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java @@ -104,6 +104,7 @@ public class InBillServiceImpl extends ServiceImpl i map.put("bill_type", (String) whereJson.get("bill_type")); map.put("create_mode", (String) whereJson.get("create_mode")); map.put("bill_status", (String) whereJson.get("bill_status")); + map.put("material_code", (String) whereJson.get("material_code")); String bill_code = MapUtil.getStr(whereJson, "bill_code"); String pcsn = MapUtil.getStr(whereJson, "pcsn"); diff --git a/nladmin-ui/src/views/wms/st/inbill/index.vue b/nladmin-ui/src/views/wms/st/inbill/index.vue index af0c2af..3d52e62 100644 --- a/nladmin-ui/src/views/wms/st/inbill/index.vue +++ b/nladmin-ui/src/views/wms/st/inbill/index.vue @@ -20,6 +20,15 @@ @keyup.enter.native="crud.toQuery" /> + + + + + +