From ce5f6af6d96b090026d0152595361789a4c294e7 Mon Sep 17 00:00:00 2001
From: zhaoyf <1783123481@qq.com>
Date: Wed, 15 Jul 2026 19:26:29 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E9=80=9A=E8=BF=87=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inAndOut/service/dao/mapper/IOStorInvMapper.xml      | 8 ++++++++
 .../inAndOut/service/impl/InBillServiceImpl.java         | 1 +
 nladmin-ui/src/views/wms/st/inbill/index.vue             | 9 +++++++++
 nladmin-ui/src/views/wms/st/outbill/index.vue            | 9 +++++++++
 4 files changed, 27 insertions(+)

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}
             </if>
+            <if test="params.material_code != null">
+                AND
+                dis.material_code LIKE  #{params.material_code}
+            </if>
             <if test="params.pcsn_in != null">
                 AND
                 dis.pcsn IN #{params.pcsn_in}
@@ -135,6 +139,10 @@
                 AND
                 ios.bill_code LIKE #{params.bill_code}
             </if>
+            <if test="params.material_code != null">
+                AND
+                dtl.material_code = #{params.material_code}
+            </if>
 
             <if test="params.is_upload != null">
                 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<IOStorInvMapper, IOStorInv> 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"
             />
           </el-form-item>
+          <el-form-item label="物料编码">
+            <el-input
+              v-model="query.material_code"
+              size="mini"
+              clearable
+              placeholder="物料编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item label="所属仓库">
             <el-select
               v-model="query.stor_id"
diff --git a/nladmin-ui/src/views/wms/st/outbill/index.vue b/nladmin-ui/src/views/wms/st/outbill/index.vue
index 41c2a71..6473637 100644
--- a/nladmin-ui/src/views/wms/st/outbill/index.vue
+++ b/nladmin-ui/src/views/wms/st/outbill/index.vue
@@ -20,6 +20,15 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="物料编码">
+            <el-input
+              v-model="query.material_code"
+              size="mini"
+              clearable
+              placeholder="物料编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item label="所属仓库">
             <el-select
               v-model="query.stor_id"