From 89bf436ef9911e58b968f6dd4b6bde517f8ccad2 Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Wed, 3 Dec 2025 14:32:52 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E5=BA=93=E5=AD=98=E5=8F=98?=
 =?UTF-8?q?=E5=8A=A8=E4=BB=93=E5=BA=93=E3=80=81=E7=89=A9=E6=96=99=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/inventoryLedger/types.ts    | 19 ++++++++++++------
 src/views/wms/inventoryLedger/index.vue | 26 +++++++++++++++++++++++--
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/api/wms/inventoryLedger/types.ts b/src/api/wms/inventoryLedger/types.ts
index 9f3de36..8088505 100644
--- a/src/api/wms/inventoryLedger/types.ts
+++ b/src/api/wms/inventoryLedger/types.ts
@@ -73,7 +73,6 @@ export interface InventoryLedgerVO {
    * 更新时间
    */
   updateTime: string;
-
 }
 
 export interface InventoryLedgerForm extends BaseEntity {
@@ -121,11 +120,9 @@ export interface InventoryLedgerForm extends BaseEntity {
    * 变动数量
    */
   changeAmount?: number;
-
 }
 
 export interface InventoryLedgerQuery extends PageQuery {
-
   /**
    * 库位编码
    */
@@ -160,7 +157,17 @@ export interface InventoryLedgerQuery extends PageQuery {
    * 日期范围参数
    */
   params?: any;
+
+  /**
+   * 产品编码
+   */
+  productCode?: string;
+
+  /**
+   * 产品名称
+   */
+  productName?: string;
+
+  orderByColumn?: string;
+  isAsc?: string;
 }
-
-
-
diff --git a/src/views/wms/inventoryLedger/index.vue b/src/views/wms/inventoryLedger/index.vue
index a967afa..a058940 100644
--- a/src/views/wms/inventoryLedger/index.vue
+++ b/src/views/wms/inventoryLedger/index.vue
@@ -7,8 +7,19 @@
             <!--<el-form-item label="库位编码" prop="locationCode">
               <el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" />
             </el-form-item>-->
-            <el-form-item label="物料ID" prop="materielId">
-              <el-input v-model="queryParams.materielId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />
+            <!--<el-form-item label="物料ID" prop="materielId">-->
+            <!--  <el-input v-model="queryParams.materielId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />-->
+            <!--</el-form-item>-->
+            <el-form-item label="仓库" prop="warehouseId">
+              <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable filterable>
+                <el-option v-for="item in warehouseInfoList" :key="item.warehouseId" :label="item.warehouseName" :value="item.warehouseId" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="物料编码" prop="productCode">
+              <el-input v-model="queryParams.productCode" placeholder="请输入产品编码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="物料名称" prop="materielName">
+              <el-input v-model="queryParams.productName" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="批次号" prop="batchNumber">
               <el-input v-model="queryParams.batchNumber" placeholder="请输入批次号" clearable @keyup.enter="handleQuery" />
@@ -146,6 +157,7 @@
 <script setup name="InventoryLedger" lang="ts">
 import { addInventoryLedger, delInventoryLedger, getInventoryLedger, listInventoryLedger, updateInventoryLedger } from '@/api/wms/inventoryLedger';
 import { InventoryLedgerForm, InventoryLedgerQuery, InventoryLedgerVO } from '@/api/wms/inventoryLedger/types';
+import {getWmsWarehouseInfoList} from "@/api/wms/warehouseInfo";
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { wms_ledger_change_type, wms_ledger_state } = toRefs<any>(proxy?.useDict('wms_ledger_change_type', 'wms_ledger_state'));
@@ -161,6 +173,13 @@ const total = ref(0);
 
 const queryFormRef = ref<ElFormInstance>();
 const inventoryLedgerFormRef = ref<ElFormInstance>();
+// 仓库列表
+const warehouseInfoList = ref([]);
+/** 获取仓库列表 */
+const getWarehouseInfoList = async () => {
+  const res = await getWmsWarehouseInfoList();
+  warehouseInfoList.value = res.data || [];
+};
 
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -208,6 +227,8 @@ const data = reactive<PageData<InventoryLedgerForm, InventoryLedgerQuery>>({
     batchNumber: undefined,
     changeType: undefined,
     ledgerState: undefined,
+    productCode: undefined,
+    productName: undefined,
     orderByColumn: 'createTime',
     isAsc: 'desc',
     params: {}
@@ -315,5 +336,6 @@ const handleExport = () => {
 
 onMounted(() => {
   getList();
+  getWarehouseInfoList();
 });
 </script>