From a86f73fd2e00e33c0d74df8c7eeaf85e232c3e05 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Fri, 6 Jun 2025 16:41:05 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E9=97=AE=E9=A2=98135=EF=BC=9A?=
 =?UTF-8?q?=E5=8E=9F=E6=9D=90=E6=96=99=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8C=E6=AD=A5=E7=8A=B6=E6=80=81=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/wms/WmsRawInstockMapper.xml  |  3 +--
 hw-ui/src/views/wms/info/rawinstock/index.vue     | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawInstockMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawInstockMapper.xml
index 8f9a68a0..231f8e95 100644
--- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawInstockMapper.xml
+++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawInstockMapper.xml
@@ -205,8 +205,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyBy != null  and applyBy != ''"> and wri.apply_by like concat('%', #{applyBy}, '%')</if>
             <if test="materialCode != null  and materialCode != ''"> and mbmi.material_code like concat('%', #{materialCode}, '%')</if>
             <if test="materialName != null  and materialName != ''"> and mbmi.material_name like concat('%', #{materialName}, '%')</if>
-
-
+            <if test="erpStatus != null  and erpStatus != ''"> and wri.erp_status = #{erpStatus}</if>
         </where>
         order by wri.apply_date desc
     </select>
diff --git a/hw-ui/src/views/wms/info/rawinstock/index.vue b/hw-ui/src/views/wms/info/rawinstock/index.vue
index a00a9e30..35c1435f 100644
--- a/hw-ui/src/views/wms/info/rawinstock/index.vue
+++ b/hw-ui/src/views/wms/info/rawinstock/index.vue
@@ -76,6 +76,21 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="同步ERP状态" prop="erpStatus" label-width="100px">
+        <el-select
+          v-model="queryParams.erpStatus"
+          placeholder="请选择同步ERP状态"
+          clearable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in dict.type.wms_erp_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>