From 80cd8b33bed0357e4db819edf068c57f03a4a28d Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Wed, 12 Nov 2025 10:02:19 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=89=A9=E6=96=99=E8=A1=A8=E5=90=8E=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E3=80=81=E5=BA=93=E5=AD=98=E7=AD=89=E5=8A=9F=E8=83=BD=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/inStockBill/types.ts              |   2 +
 src/api/wms/inventoryDetails/index.ts         |   7 +
 src/api/wms/inventoryDetails/types.ts         |  14 +-
 src/api/wms/warehouseInfo/types.ts            |   1 +
 src/api/wms/wmsBaseProduct/index.ts           |  76 +++++
 src/api/wms/wmsBaseProduct/types.ts           | 154 +++++++++
 src/components/ProductSelect/index.vue        | 265 +++++++++++++++
 src/views/wms/inStockBill/index.vue           | 168 +++++----
 src/views/wms/inventoryDetails/index.vue      |  28 +-
 src/views/wms/inventoryDetails/indexCount.vue | 198 +++++++++++
 src/views/wms/warehouseInfo/index.vue         |  24 +-
 src/views/wms/wmsBaseProduct/index.vue        | 318 ++++++++++++++++++
 12 files changed, 1175 insertions(+), 80 deletions(-)
 create mode 100644 src/api/wms/wmsBaseProduct/index.ts
 create mode 100644 src/api/wms/wmsBaseProduct/types.ts
 create mode 100644 src/components/ProductSelect/index.vue
 create mode 100644 src/views/wms/inventoryDetails/indexCount.vue
 create mode 100644 src/views/wms/wmsBaseProduct/index.vue

diff --git a/src/api/wms/inStockBill/types.ts b/src/api/wms/inStockBill/types.ts
index 0e04ee0..df71cad 100644
--- a/src/api/wms/inStockBill/types.ts
+++ b/src/api/wms/inStockBill/types.ts
@@ -53,6 +53,7 @@ export interface InStockBillVO {
    * 流程状态
    */
   flowStatus: string;
+  wmsStoreType: string;
 
   /**
    * 仓库ID（预留）
@@ -85,6 +86,7 @@ export interface InStockBillForm extends BaseEntity {
    * 入库单号
    */
   inStockCode?: string;
+  wmsStoreType?: string;
 
   /**
    * 入库单类型
diff --git a/src/api/wms/inventoryDetails/index.ts b/src/api/wms/inventoryDetails/index.ts
index d06c637..b5d935f 100644
--- a/src/api/wms/inventoryDetails/index.ts
+++ b/src/api/wms/inventoryDetails/index.ts
@@ -15,6 +15,13 @@ export const listInventoryDetails = (query?: InventoryDetailsQuery): AxiosPromis
     params: query
   });
 };
+export const listCountQuery = (query?: InventoryDetailsQuery): AxiosPromise<InventoryDetailsVO[]> => {
+  return request({
+    url: '/wms/inventoryDetails/listCount',
+    method: 'get',
+    params: query
+  });
+};
 
 /**
  * 查询库存明细详细
diff --git a/src/api/wms/inventoryDetails/types.ts b/src/api/wms/inventoryDetails/types.ts
index e341c3c..c633202 100644
--- a/src/api/wms/inventoryDetails/types.ts
+++ b/src/api/wms/inventoryDetails/types.ts
@@ -28,12 +28,17 @@ export interface InventoryDetailsVO {
    * 库存数量
    */
   inventoryAmount: number;
+  /**
+   * 单价
+   */
+  unitPrice: number;
 
   /**
    * 锁定数量
    */
   lockedAmount: number;
-
+  productCode?: string;
+  productName?: string;
   /**
    * 备注
    */
@@ -62,7 +67,7 @@ export interface InventoryDetailsForm extends BaseEntity {
    * 库存ID
    */
   inventoryDetailsId?: string | number;
-
+  unitPrice: number;
   /**
    * 库位编码
    */
@@ -92,7 +97,8 @@ export interface InventoryDetailsForm extends BaseEntity {
    * 锁定数量
    */
   lockedAmount?: number;
-
+  productCode?: string;
+  productName?: string;
   /**
    * 备注
    */
@@ -104,6 +110,8 @@ export interface InventoryDetailsQuery extends PageQuery {
    * 库位编码
    */
   locationCode?: string;
+  productCode?: string;
+  productName?: string;
 
   /**
    * 仓库ID
diff --git a/src/api/wms/warehouseInfo/types.ts b/src/api/wms/warehouseInfo/types.ts
index 5ee8298..bda574f 100644
--- a/src/api/wms/warehouseInfo/types.ts
+++ b/src/api/wms/warehouseInfo/types.ts
@@ -84,6 +84,7 @@ export interface WarehouseInfoForm extends BaseEntity {
    * 仓库编码
    */
   warehouseCode?: string;
+  wmsStoreType?: string;
 
   /**
    * 仓库名称
diff --git a/src/api/wms/wmsBaseProduct/index.ts b/src/api/wms/wmsBaseProduct/index.ts
new file mode 100644
index 0000000..50cae91
--- /dev/null
+++ b/src/api/wms/wmsBaseProduct/index.ts
@@ -0,0 +1,76 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { WmsBaseProductForm, WmsBaseProductQuery, WmsBaseProductVO } from '@/api/wms/wmsBaseProduct/types';
+
+/**
+ * 查询海威成品信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listWmsBaseProduct = (query?: WmsBaseProductQuery): AxiosPromise<WmsBaseProductVO[]> => {
+  return request({
+    url: '/wms/wmsBaseProduct/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询海威成品信息详细
+ * @param productId
+ */
+export const getWmsBaseProduct = (productId: string | number): AxiosPromise<WmsBaseProductVO> => {
+  return request({
+    url: '/wms/wmsBaseProduct/' + productId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增海威成品信息
+ * @param data
+ */
+export const addWmsBaseProduct = (data: WmsBaseProductForm) => {
+  return request({
+    url: '/wms/wmsBaseProduct',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改海威成品信息
+ * @param data
+ */
+export const updateWmsBaseProduct = (data: WmsBaseProductForm) => {
+  return request({
+    url: '/wms/wmsBaseProduct',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除海威成品信息
+ * @param productId
+ */
+export const delWmsBaseProduct = (productId: string | number | Array<string | number>) => {
+  return request({
+    url: '/wms/wmsBaseProduct/' + productId,
+    method: 'delete'
+  });
+};
+
+/**
+ * 下拉框查询海威成品信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getWmsBaseProductList(query) {
+  return request({
+    url: '/wms/wmsBaseProduct/getWmsBaseProductList',
+    method: 'get',
+    params: query
+  });
+}
diff --git a/src/api/wms/wmsBaseProduct/types.ts b/src/api/wms/wmsBaseProduct/types.ts
new file mode 100644
index 0000000..dfd6f70
--- /dev/null
+++ b/src/api/wms/wmsBaseProduct/types.ts
@@ -0,0 +1,154 @@
+export interface WmsBaseProductVO {
+  /**
+   * 物料ID
+   */
+  productId: string | number;
+
+  /**
+   * 租户编号
+   */
+  tenantId: string | number;
+
+  /**
+   * 成品编码
+   */
+  productCode: string;
+
+  /**
+   * 成品名称
+   */
+  productName: string;
+
+  /**
+   * 成品描述
+   */
+  productSpe: string;
+
+  /**
+   * 单位
+   */
+  unitId: string | number;
+
+  /**
+   * 参考成本
+   */
+  purchasePrice: number;
+
+  /**
+   * 统一报价(参考)
+   */
+  foreignPrice: number;
+
+  /**
+   * 备货期（天）
+   */
+  stockingPeriod: number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag: string;
+
+  /**
+   * 创建部门
+   */
+  createDept: number;
+
+  /**
+   * 创建人
+   */
+  createBy: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 更新人
+   */
+  updateBy: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+  externalBrand: string;
+
+}
+
+export interface WmsBaseProductForm extends BaseEntity {
+  /**
+   * 物料ID
+   */
+  productId?: string | number;
+
+  /**
+   * 成品编码
+   */
+  productCode?: string;
+  externalBrand?: string;
+
+  /**
+   * 成品名称
+   */
+  productName?: string;
+
+  /**
+   * 成品描述
+   */
+  productSpe?: string;
+
+  /**
+   * 单位
+   */
+  unitId?: string | number;
+
+  /**
+   * 参考成本
+   */
+  purchasePrice?: number;
+
+  /**
+   * 统一报价(参考)
+   */
+  foreignPrice?: number;
+
+  /**
+   * 备货期（天）
+   */
+  stockingPeriod?: number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+}
+
+export interface WmsBaseProductQuery extends PageQuery {
+
+  /**
+   * 成品编码
+   */
+  productCode?: string;
+
+  /**
+   * 成品名称
+   */
+  productName?: string;
+  externalBrand?: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
+
+
+
diff --git a/src/components/ProductSelect/index.vue b/src/components/ProductSelect/index.vue
new file mode 100644
index 0000000..8f3d1d3
--- /dev/null
+++ b/src/components/ProductSelect/index.vue
@@ -0,0 +1,265 @@
+<template>
+  <div>
+    <el-dialog v-model="productDialog.visible.value" :title="productDialog.title.value" width="80%" append-to-body>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+            <div v-show="showSearch" class="mb-[10px]">
+              <el-card shadow="hover">
+                <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
+                  <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="productName">
+                    <el-input v-model="queryParams.productName" placeholder="请输入成品名称" clearable @keyup.enter="handleQuery" />
+                  </el-form-item>
+                  <el-form-item label="激活标识" prop="activeFlag">
+                    <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable>
+                      <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value" />
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item>
+                    <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                    <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                  </el-form-item>
+                </el-form>
+              </el-card>
+            </div>
+          </transition>
+
+          <el-card shadow="hover">
+            <template v-if="prop.multiple" #header>
+              <el-tag v-for="product in selectProductList" :key="product.productId" closable style="margin: 2px" @close="handleCloseTag(product)">
+                {{ product.productName }}
+              </el-tag>
+            </template>
+
+            <vxe-table
+              ref="tableRef"
+              height="400px"
+              border
+              show-overflow
+              :data="wmsBaseProductList"
+              :loading="loading"
+              :row-config="{ keyField: 'productId', isHover: true }"
+              :checkbox-config="{ reserve: true, trigger: 'row', highlight: true, showHeader: prop.multiple }"
+              @checkbox-all="handleCheckboxAll"
+              @checkbox-change="handleCheckboxChange"
+            >
+              <vxe-column type="checkbox" width="50" align="center" />
+              <vxe-column key="productCode" title="成品编码" align="center" field="productCode" />
+              <vxe-column key="productName" title="成品名称" align="center" field="productName" />
+              <vxe-column key="productSpe" title="成品描述" align="center" field="productSpe" />
+              <vxe-column key="unitName" title="单位" align="center" field="unitName" />
+              <vxe-column key="purchasePrice" title="参考成本" align="center" field="purchasePrice" />
+              <vxe-column key="foreignPrice" title="统一报价(参考)" align="center" field="foreignPrice" />
+              <vxe-column key="stockingPeriod" title="备货期(天)" align="center" field="stockingPeriod" />
+              <vxe-column key="activeFlag" title="激活标识" align="center">
+                <template #default="scope">
+                  <dict-tag :options="active_flag" :value="scope.row.activeFlag"></dict-tag>
+                </template>
+              </vxe-column>
+            </vxe-table>
+
+            <pagination
+              v-show="total > 0"
+              v-model:page="queryParams.pageNum"
+              v-model:limit="queryParams.pageSize"
+              :total="total"
+              @pagination="pageList"
+            />
+          </el-card>
+        </el-col>
+      </el-row>
+
+      <template #footer>
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">确定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { listWmsBaseProduct } from '@/api/wms/wmsBaseProduct';
+import { WmsBaseProductQuery, WmsBaseProductVO } from '@/api/wms/wmsBaseProduct/types';
+import { VxeTableInstance } from 'vxe-table';
+import useDialog from '@/hooks/useDialog';
+import { getCurrentInstance, nextTick, onMounted, reactive, ref, toRefs, watch, computed } from 'vue';
+
+interface PropType {
+  modelValue?: WmsBaseProductVO[] | WmsBaseProductVO | undefined;
+  multiple?: boolean;
+  data?: string | number | (string | number)[] | undefined;
+}
+
+const prop = withDefaults(defineProps<PropType>(), {
+  multiple: true,
+  modelValue: undefined,
+  data: undefined
+});
+const emit = defineEmits(['update:modelValue', 'confirmCallBack']);
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
+
+const wmsBaseProductList = ref<WmsBaseProductVO[]>([]);
+const loading = ref(true);
+const showSearch = ref(true);
+const total = ref(0);
+const selectProductList = ref<WmsBaseProductVO[]>([]);
+
+const queryFormRef = ref<ElFormInstance>();
+const tableRef = ref<VxeTableInstance<WmsBaseProductVO>>();
+
+const productDialog = useDialog({
+  title: '成品选择'
+});
+
+const queryParams = ref<WmsBaseProductQuery>({
+  pageNum: 1,
+  pageSize: 10,
+  productCode: undefined,
+  productName: undefined,
+  activeFlag: undefined,
+  params: {}
+});
+
+const defaultSelectProductIds = computed(() => computedIds(prop.data));
+
+const confirm = () => {
+  emit('update:modelValue', selectProductList.value);
+  emit('confirmCallBack', selectProductList.value);
+  productDialog.closeDialog();
+};
+
+const computedIds = (data) => {
+  if (data === '' || data === null || data === undefined) {
+    return [];
+  }
+  if (data instanceof Array) {
+    return data.map((item) => String(item));
+  } else if (typeof data === 'string') {
+    return data.split(',');
+  } else if (typeof data === 'number') {
+    return [String(data)];
+  } else {
+    console.warn('<ProductSelect> 未支持的数据类型');
+    return [];
+  }
+};
+
+/** 查询成品信息列表 */
+const getList = async () => {
+  loading.value = true;
+  try {
+    const res = await listWmsBaseProduct(queryParams.value);
+    wmsBaseProductList.value = res.rows;
+    total.value = res.total;
+  } catch (error) {
+    console.error('查询成品列表失败:', error);
+  } finally {
+    loading.value = false;
+  }
+};
+
+const pageList = async () => {
+  await getList();
+  const products = wmsBaseProductList.value.filter((item) => {
+    return selectProductList.value.some((product) => product.productId === item.productId);
+  });
+  await tableRef.value?.setCheckboxRow(products, true);
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  queryParams.value.pageNum = 1;
+  queryParams.value.productCode = undefined;
+  queryParams.value.productName = undefined;
+  queryParams.value.activeFlag = undefined;
+  handleQuery();
+};
+
+const handleCheckboxChange = (checked) => {
+  if (!prop.multiple && checked.checked) {
+    tableRef.value?.setCheckboxRow(selectProductList.value, false);
+    selectProductList.value = [];
+  }
+  const row = checked.row;
+  if (checked.checked) {
+    selectProductList.value.push(row);
+  } else {
+    selectProductList.value = selectProductList.value.filter((item) => {
+      return item.productId !== row.productId;
+    });
+  }
+};
+
+const handleCheckboxAll = (checked) => {
+  const rows = wmsBaseProductList.value;
+  if (checked.checked) {
+    rows.forEach((row) => {
+      if (!selectProductList.value.some((item) => item.productId === row.productId)) {
+        selectProductList.value.push(row);
+      }
+    });
+  } else {
+    selectProductList.value = selectProductList.value.filter((item) => {
+      return !rows.some((row) => row.productId === item.productId);
+    });
+  }
+};
+
+const handleCloseTag = (product: WmsBaseProductVO) => {
+  const productId = product.productId;
+  const index = selectProductList.value.findIndex((item) => item.productId === productId);
+  if (index > -1) {
+    const row = selectProductList.value[index];
+    tableRef.value?.setCheckboxRow(row, false);
+    selectProductList.value.splice(index, 1);
+  }
+};
+
+const initSelectProduct = async () => {
+  if (defaultSelectProductIds.value.length > 0) {
+    const products = wmsBaseProductList.value.filter((item) => {
+      return defaultSelectProductIds.value.includes(String(item.productId));
+    });
+    selectProductList.value = products;
+    await nextTick(() => {
+      tableRef.value?.setCheckboxRow(products, true);
+    });
+  }
+};
+
+const close = () => {
+  productDialog.closeDialog();
+};
+
+watch(
+  () => productDialog.visible.value,
+  async (newValue: boolean) => {
+    if (newValue) {
+      await getList();
+      await initSelectProduct();
+    } else {
+      tableRef.value?.clearCheckboxReserve();
+      tableRef.value?.clearCheckboxRow();
+      resetQuery();
+      selectProductList.value = [];
+    }
+  }
+);
+
+defineExpose({
+  open: productDialog.openDialog,
+  close: productDialog.closeDialog
+});
+</script>
diff --git a/src/views/wms/inStockBill/index.vue b/src/views/wms/inStockBill/index.vue
index e29325f..62853c2 100644
--- a/src/views/wms/inStockBill/index.vue
+++ b/src/views/wms/inStockBill/index.vue
@@ -15,14 +15,14 @@
             <el-form-item label="供应商" prop="supplier">
               <el-input v-model="queryParams.supplierName" placeholder="请输入供应商" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="入库单状态" prop="inStockBillStatus">
-              <el-select v-model="queryParams.inStockBillStatus" placeholder="请选择入库单状态" clearable>
-                <el-option v-for="dict in wms_in_stock_bill_status" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="流程状态" prop="flowStatus">
-              <el-input v-model="queryParams.flowStatus" placeholder="请输入流程状态" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            <!--            <el-form-item label="入库单状态" prop="inStockBillStatus">-->
+            <!--              <el-select v-model="queryParams.inStockBillStatus" placeholder="请选择入库单状态" clearable>-->
+            <!--                <el-option v-for="dict in wms_in_stock_bill_status" :key="dict.value" :label="dict.label" :value="dict.value" />-->
+            <!--              </el-select>-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label="流程状态" prop="flowStatus">-->
+            <!--              <el-input v-model="queryParams.flowStatus" placeholder="请输入流程状态" clearable @keyup.enter="handleQuery" />-->
+            <!--            </el-form-item>-->
             <el-form-item label="创建时间" style="width: 308px">
               <el-date-picker
                 v-model="dateRangeCreateTime"
@@ -79,13 +79,13 @@
         <el-table-column type="expand">
           <template #default="{ row }">
             <el-table :data="row.data" v-loading="row.loading" border style="width: 95%; margin: 0 auto">
-              <el-table-column prop="materialCode" align="center" label="物料编码" />
-              <el-table-column prop="materialName" align="center" label="物料名称" />
+              <el-table-column prop="productCode" align="center" label="物料编码" />
+              <el-table-column prop="productName" align="center" label="物料名称" />
               <el-table-column prop="batchNumber" align="center" label="批次号" />
               <el-table-column prop="unitPrice" align="center" label="单价" />
               <el-table-column prop="inStockAmount" align="center" label="入库数量" />
               <el-table-column prop="unitName" align="center" label="单位" />
-              <el-table-column prop="totalPrice" align="center" label="总价" />
+              <el-table-column prop="totalPrice" align="center" label="总价(元)" />
               <el-table-column prop="warehouseName" align="center" label="仓库名称" />
             </el-table>
           </template>
@@ -105,16 +105,16 @@
         <el-table-column label="联系人" align="center" prop="contactUser" v-if="columns[7].visible" />
         <el-table-column label="联系电话" align="center" prop="contactNumber" v-if="columns[8].visible" />
         <el-table-column label="入库说明" align="center" prop="directions" v-if="columns[9].visible" />
-        <el-table-column label="入库单状态" align="center" prop="inStockBillStatus" v-if="columns[10].visible">
-          <template #default="scope">
-            <dict-tag :options="wms_in_stock_bill_status" :value="scope.row.inStockBillStatus" />
-          </template>
-        </el-table-column>
-        <el-table-column label="流程状态" align="center" prop="flowStatus" v-if="columns[11].visible">
-          <template #default="scope">
-            <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
-          </template>
-        </el-table-column>
+        <!--        <el-table-column label="入库单状态" align="center" prop="inStockBillStatus" v-if="columns[10].visible">-->
+        <!--          <template #default="scope">-->
+        <!--            <dict-tag :options="wms_in_stock_bill_status" :value="scope.row.inStockBillStatus" />-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="流程状态" align="center" prop="flowStatus" v-if="columns[11].visible">-->
+        <!--          <template #default="scope">-->
+        <!--            <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <el-table-column label="备注" align="center" prop="remark" v-if="columns[13].visible" />
         <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[17].visible">
           <template #default="scope">
@@ -129,9 +129,9 @@
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="auto">
           <template #default="scope">
             <div style="display: flex; justify-content: center">
-              <el-tooltip content="查看" placement="top">
-                <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['wms:inStockBill:edit']"></el-button>
-              </el-tooltip>
+              <!--              <el-tooltip content="查看" placement="top">-->
+              <!--                <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['wms:inStockBill:edit']"></el-button>-->
+              <!--              </el-tooltip>-->
               <el-tooltip content="修改" placement="top">
                 <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:inStockBill:edit']"></el-button>
               </el-tooltip>
@@ -149,11 +149,11 @@
     <el-dialog :title="addDialog.title" v-model="addDialog.visible" width="auto" min-width="1500px" append-to-body>
       <el-form ref="addFormRef" :model="form" :rules="rules" label-width="120px">
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="入库单号" prop="inStockCode">
-              <el-input v-model="form.inStockCode" placeholder="请输入入库单号" />
-            </el-form-item>
-          </el-col>
+          <!--          <el-col :span="12">
+                      <el-form-item label="入库单号" prop="inStockCode">
+                        <el-input v-model="form.inStockCode" placeholder="入库单号自动生成" disabled />
+                      </el-form-item>
+                    </el-col>-->
           <el-col :span="12">
             <el-form-item label="入库单类型" prop="inStockType">
               <el-select v-model="form.inStockType" placeholder="请选择入库单类型">
@@ -161,13 +161,26 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="关联单号" prop="inventoryAmount">
               <el-input v-model="form.inventoryAmount" placeholder="请输入关联单号" />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="关联项目" prop="projectId">
+              <el-select v-model="form.projectId" placeholder="请选择项目" filterable clearable>
+                <el-option
+                  v-for="dict in projectInfoList"
+                  :key="dict.projectId"
+                  :label="`${dict.projectCode} - ${dict.projectName}`"
+                  :value="dict.projectId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="12">
             <el-form-item label="供应商" prop="supplier">
               <el-input v-model="form.supplierName" placeholder="请输入供应商" />
@@ -202,16 +215,15 @@
             <div>添加入库物料</div>
           </template>
 
-          <el-button type="primary" @click="openMaterialSelect">选择物料</el-button>
+          <el-button type="primary" @click="openProductSelect">选择物料</el-button>
 
-          <div v-if="selectedMaterials.length > 0" style="margin-top: 20px">
+          <div v-if="selectedProducts.length > 0" style="margin-top: 20px">
             <h4>已选择的物料：</h4>
-            <el-table :data="selectedMaterials" border>
+            <el-table :data="selectedProducts" border>
               <!--              <el-table-column prop="materialId" label="物料编码" width="120"  header/>-->
-              <el-table-column prop="materialCode" label="物料编码" width="120" />
-              <el-table-column prop="materialName" label="物料名称" width="120" />
-              <el-table-column prop="materialBrand" label="品牌" width="120" />
-              <el-table-column prop="materialModel" label="型号" width="120" />
+              <el-table-column prop="productCode" label="成品编码" width="120" />
+              <el-table-column prop="productName" label="成品名称" width="120" />
+              <el-table-column prop="productSpe" label="成品描述" width="120" />
               <el-table-column prop="batchNumber" label="批次号" width="150">
                 <template #default="scope">
                   <el-input v-model="scope.row.batchNumber" placeholder="自动生成批次号" :readonly="true" size="small" />
@@ -273,7 +285,8 @@
           </div>
         </el-card>
 
-        <MaterialSelect ref="materialSelectRef" v-model="selectedMaterials" :multiple="true" @confirmCallBack="handleMaterialConfirm" />
+        <!--        <MaterialSelect ref="materialSelectRef" v-model="selectedMaterials" :multiple="true" @confirmCallBack="handleMaterialConfirm" />-->
+        <product-select ref="productSelectRef" :multiple="true" @confirmCallBack="handleProductSelect" />
       </div>
 
       <template #footer>
@@ -292,11 +305,21 @@ import { InStockBillForm, InStockBillQuery, InStockBillVO } from '@/api/wms/inSt
 import { ref } from 'vue'; // 存储选中的物料信息
 import { useRouter } from 'vue-router'; // 存储选中的物料信息
 import { getWmsInStockDetailsList } from '@/api/wms/inStockDetails';
-import { getWmsWarehouseInfoList } from '@/api/wms/warehouseInfo'; // 添加展开行处理函数
+import { getWmsWarehouseInfoList } from '@/api/wms/warehouseInfo';
+import { getErpProjectInfoList } from '@/api/oa/erp/projectInfo'; // 添加展开行处理函数
+import ProductSelect from '@/components/ProductSelect/index.vue';
+import { parseTime } from '@/utils/ruoyi';
 
+const projectInfoList = ref([]); // 项目列表
+
+/** 获取项目列表 */
+const getProjectInfoList = async () => {
+  const res = await getErpProjectInfoList({});
+  projectInfoList.value = res.data || [];
+};
 // 添加展开行处理函数
 const handleExpandChange = async (row, expandedRows) => {
-  if (expandedRows.length && !row.children) {
+  if (expandedRows.length && !row.data) {
     try {
       row.loading = true;
       const res = await getWmsInStockDetailsList({ inStockBillId: row.inStockBillId });
@@ -307,6 +330,35 @@ const handleExpandChange = async (row, expandedRows) => {
   }
 };
 
+// 成品选择
+const productSelectRef = ref();
+
+// 定义选中的成品列表
+const selectedProducts = ref([]);
+
+// 打开成品选择弹窗的方法
+const openProductSelect = () => {
+  productSelectRef.value.open();
+};
+
+// 处理成品选择回调
+const handleProductSelect = (products) => {
+  selectedProducts.value = products;
+  // 为每个成品添加批次号
+  const timestamp = parseTime(new Date(), '{y}{m}{d}');
+  products.forEach((material) => {
+    // 生成批次号：供应商代码 + 时间戳
+    // const supplierCode = form.value.supplierName ? form.value.supplier.substring(0, 4) : 'SUPP';
+    // const timestamp = new Date().getTime();
+    material.batchNumber = `${timestamp}`;
+
+    // 设置默认单价为采购单价
+    material.unitPrice = material.purchasePrice || 0;
+    material.inStockAmount = 1; // 默认数量为1
+    material.totalPrice = (material.unitPrice * material.inStockAmount).toFixed(2);
+  });
+};
+
 // 存储选中的物料信息
 const selectedMaterials = ref([]);
 const materialSelectRef = ref();
@@ -356,7 +408,8 @@ const calculateTotalPrice = (material) => {
 
 // 删除物料行
 const removeMaterial = (index) => {
-  selectedMaterials.value.splice(index, 1);
+  // selectedMaterials.value.splice(index, 1);
+  selectedProducts.value.splice(index, 1);
 };
 
 // 打开物料选择对话框
@@ -430,7 +483,7 @@ const data = reactive<PageData<InStockBillForm, InStockBillQuery>>({
     }
   },
   rules: {
-    inStockBillId: [{ required: true, message: '入库单ID不能为空', trigger: 'blur' }]
+    // inStockBillId: [{ required: true, message: '入库单ID不能为空', trigger: 'blur' }]
   }
 });
 
@@ -501,7 +554,8 @@ const getWarehouseList = async () => {
 const handleAdd = () => {
   reset();
   addFormRef.value?.resetFields();
-  selectedMaterials.value = [];
+  selectedProducts.value = [];
+  // selectedMaterials.value = [];
   addDialog.title = '添加物料入库';
   addDialog.visible = true;
   // getWarehouseList();
@@ -515,13 +569,13 @@ const handleAddSubmit = () => {
   addFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       // 验证是否选择了物料
-      if (selectedMaterials.value.length === 0) {
+      if (selectedProducts.value.length === 0) {
         proxy?.$modal.msgError('请至少选择一个物料');
         return;
       }
 
       // 验证物料信息的完整性
-      const invalidMaterials = selectedMaterials.value.filter((material) => {
+      const invalidMaterials = selectedProducts.value.filter((material) => {
         return !material.unitPrice || material.unitPrice <= 0 || !material.inStockAmount || material.inStockAmount <= 0;
       });
 
@@ -536,9 +590,9 @@ const handleAddSubmit = () => {
         const submitData = {
           ...form.value,
           // 添加物料明细信息
-          inStockDetailsList: selectedMaterials.value.map((material) => ({
+          inStockDetailsList: selectedProducts.value.map((material) => ({
             inStockDetailsId: material.inStockDetailsId, // 物料ID
-            materialId: material.materialId, // 物料ID
+            materialId: material.productId, // 物料ID
             batchNumber: material.batchNumber, // 批次号
             unitPrice: material.unitPrice, // 单价
             inStockAmount: material.inStockAmount, // 数量
@@ -563,7 +617,7 @@ const handleAddSubmit = () => {
         addDialog.visible = false;
 
         // 清空已选择的物料
-        selectedMaterials.value = [];
+        selectedProducts.value = [];
         await getList();
       } catch (error) {
         console.error('操作失败:', error);
@@ -571,19 +625,6 @@ const handleAddSubmit = () => {
       } finally {
         buttonLoading.value = false;
       }
-      //   await addInStockBill(submitData);
-      //   proxy?.$modal.msgSuccess('添加成功');
-      //   addDialog.visible = false;
-      //
-      //   // 清空已选择的物料
-      //   selectedMaterials.value = [];
-      //   await getList();
-      // } catch (error) {
-      //   console.error('添加入库单失败:', error);
-      //   proxy?.$modal.msgError('添加失败，请重试');
-      // } finally {
-      //   buttonLoading.value = false;
-      // }
     }
   });
 };
@@ -602,7 +643,7 @@ const handleUpdate = async (row?: InStockBillVO) => {
   Object.assign(form.value, res.data);
 
   const childList = await getWmsInStockDetailsList({ inStockBillId: row.inStockBillId });
-  selectedMaterials.value = childList.data;
+  selectedProducts.value = childList.data;
 
   addDialog.title = '修改物料入库';
   addDialog.visible = true;
@@ -658,5 +699,6 @@ const handleView = (row?: InStockBillVO) => {
 onMounted(() => {
   getList();
   getWarehouseList();
+  getProjectInfoList(); // 获取项目 列表
 });
 </script>
diff --git a/src/views/wms/inventoryDetails/index.vue b/src/views/wms/inventoryDetails/index.vue
index cc72861..c3fcfbd 100644
--- a/src/views/wms/inventoryDetails/index.vue
+++ b/src/views/wms/inventoryDetails/index.vue
@@ -6,11 +6,13 @@
           <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
             <!--            <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>-->
+            <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="productName">
+              <el-input v-model="queryParams.productName" placeholder="请输入成品名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
 
             <el-form-item label="选择仓库" prop="warehouseId">
               <!--              <el-input v-model="queryParams.warehouseId" placeholder="请输入仓库ID" clearable @keyup.enter="handleQuery" />-->
@@ -57,21 +59,19 @@
       <el-table v-loading="loading" border :data="inventoryDetailsList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="库存ID" align="center" prop="inventoryDetailsId" v-if="columns[0].visible" />
-
         <el-table-column label="库位编码" align="center" prop="locationCode" v-if="columns[2].visible" />
         <!--        <el-table-column label="仓库ID" align="center" prop="warehouseId" v-if="columns[3].visible" />-->
         <el-table-column label="所属仓库" align="center" prop="warehouseName" v-if="columns[3].visible" />
-
         <!--        <el-table-column label="物料ID" align="center" prop="materielId" v-if="columns[4].visible" />-->
-        <el-table-column label="物料名称" align="center" prop="materialCode" v-if="columns[4].visible" />
-        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[4].visible" />
-        <el-table-column label="物料品牌" align="center" prop="materialBrand" v-if="columns[4].visible" />
-        <el-table-column label="物料型号" align="center" prop="materialModel" v-if="columns[4].visible" />
-
+        <el-table-column label="成品编码" align="center" prop="productCode" v-if="columns[4].visible" />
+        <el-table-column label="成品名称" align="center" prop="productName" v-if="columns[4].visible" />
+        <el-table-column label="成品描述" align="center" prop="productSpe" v-if="columns[4].visible" />
+        <el-table-column label="外部品牌" align="center" prop="externalBrand" v-if="columns[4].visible" />
         <el-table-column label="批次号" align="center" prop="batchNumber" v-if="columns[5].visible" />
         <el-table-column label="库存数量" align="center" prop="inventoryAmount" v-if="columns[6].visible" />
-        <el-table-column label="锁定数量" align="center" prop="lockedAmount" v-if="columns[7].visible" />
-        <el-table-column label="可用数量" align="center" prop="useAmount" v-if="columns[7].visible" />
+        <el-table-column label="单价" align="center" prop="unitPrice" v-if="columns[6].visible" />
+        <!--        <el-table-column label="锁定数量" align="center" prop="lockedAmount" v-if="columns[7].visible" />-->
+        <!--        <el-table-column label="可用数量" align="center" prop="useAmount" v-if="columns[7].visible" />-->
         <el-table-column label="备注" align="center" prop="remark" v-if="columns[8].visible" />
         <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[12].visible">
           <template #default="scope">
@@ -203,6 +203,8 @@ const data = reactive<PageData<InventoryDetailsForm, InventoryDetailsQuery>>({
     pageNum: 1,
     pageSize: 10,
     locationCode: undefined,
+    productCode: undefined,
+    productName: undefined,
     warehouseId: undefined,
     materielId: undefined,
     batchNumber: undefined,
diff --git a/src/views/wms/inventoryDetails/indexCount.vue b/src/views/wms/inventoryDetails/indexCount.vue
new file mode 100644
index 0000000..8c570cc
--- /dev/null
+++ b/src/views/wms/inventoryDetails/indexCount.vue
@@ -0,0 +1,198 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
+            <!--            <el-form-item label="库位编码" prop="locationCode">
+                <el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" />
+              </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="productName">
+              <el-input v-model="queryParams.productName" placeholder="请输入成品名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+
+            <el-form-item label="选择仓库" prop="warehouseId">
+              <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable>
+                <el-option v-for="item in warehouseList" :key="item.warehouseId" :label="item.warehouseName" :value="item.warehouseId" />
+              </el-select>
+            </el-form-item>
+
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <el-table
+        ref="childTable"
+        v-loading="loading"
+        border
+        :data="inventoryDetailsList"
+        @expand-change="selectChildList"
+        :row-key="(row) => row.materielId"
+      >
+        <!-- 添加展开列 -->
+        <el-table-column type="expand" width="55">
+          <template #default="{ row }">
+            <el-table border :data="row.data" v-loading="row.loading" style="width: 95%; margin: 0 auto">
+              <el-table-column label="库位编码" align="center" prop="locationCode" />
+              <el-table-column label="批次号" align="center" prop="batchNumber" />
+              <el-table-column label="库存数量" align="center" prop="inventoryAmount" />
+              <el-table-column label="库存数量" align="center" prop="inventoryAmount" />
+              <!--              <el-table-column label="锁定数量" align="center" prop="lockedAmount" />-->
+
+              <el-table-column label="创建时间" align="center" prop="createTime" />
+            </el-table>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="所属仓库" align="center" prop="warehouseName" v-if="columns[3].visible" />
+        <el-table-column label="成品编码" align="center" prop="productCode" v-if="columns[4].visible" />
+        <el-table-column label="成品名称" align="center" prop="productName" v-if="columns[4].visible" />
+        <el-table-column label="成品描述" align="center" prop="productSpe" v-if="columns[4].visible" />
+        <el-table-column label="外部品牌" align="center" prop="externalBrand" v-if="columns[4].visible" />
+        <el-table-column label="库存数量" align="center" prop="inventoryAmount" v-if="columns[6].visible" />
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+  </div>
+</template>
+
+<script setup name="InventoryDetails" lang="ts">
+import { getWmsInventoryDetailsList, listCountQuery } from '@/api/wms/inventoryDetails';
+import { InventoryDetailsForm, InventoryDetailsQuery, InventoryDetailsVO } from '@/api/wms/inventoryDetails/types';
+import { getWmsWarehouseInfoList } from '@/api/wms/warehouseInfo';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { use_state } = toRefs<any>(proxy?.useDict('use_state'));
+
+const inventoryDetailsList = ref<InventoryDetailsVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const warehouseList = ref([]);
+const childTable = ref([]);
+const queryFormRef = ref<ElFormInstance>();
+const inventoryDetailsFormRef = ref<ElFormInstance>();
+
+const getWarehouseList = async () => {
+  const res = await getWmsWarehouseInfoList();
+  warehouseList.value = res.data;
+};
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `库存ID`, visible: false },
+  { key: 1, label: `租户编号`, visible: false },
+  { key: 2, label: `库位编码`, visible: false },
+  { key: 3, label: `仓库ID`, visible: true },
+  { key: 4, label: `物料ID`, visible: true },
+  { key: 5, label: `批次号`, visible: true },
+  { key: 6, label: `库存数量`, visible: true },
+  { key: 7, label: `锁定数量`, visible: true },
+  { key: 8, label: `备注`, visible: false },
+  { key: 9, label: `删除标志`, visible: true },
+  { key: 10, label: `创建部门`, visible: true },
+  { key: 11, label: `创建人`, visible: true },
+  { key: 12, label: `创建时间`, visible: true },
+  { key: 13, label: `更新人`, visible: true },
+  { key: 14, label: `更新时间`, visible: true }
+]);
+
+const initFormData: InventoryDetailsForm = {
+  inventoryDetailsId: undefined,
+  locationCode: undefined,
+  warehouseId: undefined,
+  materielId: undefined,
+  batchNumber: undefined,
+  inventoryAmount: undefined,
+  lockedAmount: undefined,
+  remark: undefined
+};
+const data = reactive<PageData<InventoryDetailsForm, InventoryDetailsQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    locationCode: undefined,
+    productCode: undefined,
+    productName: undefined,
+    warehouseId: undefined,
+    materielId: undefined,
+    batchNumber: undefined,
+    inventoryAmount: undefined,
+    lockedAmount: undefined,
+    params: {}
+  },
+  rules: {}
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+// 展开行的处理
+const selectChildList = async (row, expandedRows) => {
+  if (expandedRows.length && !row.data) {
+    row.loading = true;
+    const res = await getWmsInventoryDetailsList({
+      materielId: row.materielId,
+      warehouseId: row.warehouseId
+    });
+    row.data = res.data;
+    row.loading = false;
+  }
+};
+
+/** 查询库存明细列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listCountQuery(queryParams.value);
+  inventoryDetailsList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  inventoryDetailsFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+onMounted(() => {
+  getList();
+  getWarehouseList();
+});
+</script>
diff --git a/src/views/wms/warehouseInfo/index.vue b/src/views/wms/warehouseInfo/index.vue
index 69e394f..a66977c 100644
--- a/src/views/wms/warehouseInfo/index.vue
+++ b/src/views/wms/warehouseInfo/index.vue
@@ -56,7 +56,13 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="所属部门ID" align="center" prop="deptName" v-if="columns[5].visible" />
+        <!--        <el-table-column label="仓库存储类型" align="center" prop="wmsStoreType" v-if="columns[4].visible">-->
+        <!--          <template #default="scope">-->
+        <!--            <dict-tag :options="wms_store_type" :value="scope.row.wmsStoreType" />-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+
+        <el-table-column label="所属部门" align="center" prop="deptName" v-if="columns[5].visible" />
         <el-table-column label="仓库负责人" align="center" prop="warehouseManager" v-if="columns[6].visible" />
         <el-table-column label="备注" align="center" prop="remark" v-if="columns[7].visible" />
         <el-table-column label="仓库状态" align="center" prop="activeFlag" v-if="columns[8].visible">
@@ -119,6 +125,12 @@
         <el-form-item label="仓库负责人" prop="warehouseManager">
           <el-input v-model="form.warehouseManager" placeholder="请输入仓库负责人" />
         </el-form-item>
+        <el-form-item label="仓库存储类型" prop="wmsStoreType">
+          <el-select v-model="form.wmsStoreType" placeholder="请选择仓库存储类型" clearable filterable>
+            <el-option v-for="dict in wms_store_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -142,13 +154,21 @@
 import { addWarehouseInfo, delWarehouseInfo, getWarehouseInfo, listWarehouseInfo, updateWarehouseInfo } from '@/api/wms/warehouseInfo';
 import { WarehouseInfoForm, WarehouseInfoQuery, WarehouseInfoVO } from '@/api/wms/warehouseInfo/types';
 import { listDept } from '@/api/system/dept';
+import { getErpProjectInfoList } from '@/api/oa/erp/projectInfo';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
 const { use_state } = toRefs<any>(proxy?.useDict('use_state'));
 const { warehouse_type } = toRefs<any>(proxy?.useDict('warehouse_type'));
+const { wms_store_type } = toRefs<any>(proxy?.useDict('wms_store_type'));
 
 const warehouseInfoList = ref<WarehouseInfoVO[]>([]);
+const projectLsit = ref<[]>([]); //项目列表
+
+const wmsGetErpProjectInfoList = async () => {
+  const res = await getErpProjectInfoList({});
+  projectLsit.value = res.data || [];
+};
 const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
@@ -191,6 +211,7 @@ const initFormData: WarehouseInfoForm = {
   warehouseCode: undefined,
   warehouseName: undefined,
   warehouseType: undefined,
+  wmsStoreType: undefined,
   deptId: undefined,
   warehouseManager: undefined,
   remark: undefined,
@@ -317,5 +338,6 @@ const handleExport = () => {
 onMounted(() => {
   getList();
   getDeptInfoListSelect(); // 新增的调用
+  // wmsGetErpProjectInfoList(); // 获取项目 列表
 });
 </script>
diff --git a/src/views/wms/wmsBaseProduct/index.vue b/src/views/wms/wmsBaseProduct/index.vue
new file mode 100644
index 0000000..fb09f8a
--- /dev/null
+++ b/src/views/wms/wmsBaseProduct/index.vue
@@ -0,0 +1,318 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
+            <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="productName">
+              <el-input v-model="queryParams.productName" placeholder="请输入成品名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+
+            <el-form-item label="激活标识" prop="activeFlag">
+              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable>
+                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['wms:wmsBaseProduct:add']"> 新增 </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['wms:wmsBaseProduct:edit']"
+              >修改
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['wms:wmsBaseProduct:remove']"
+              >删除
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['wms:wmsBaseProduct:export']">导出 </el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="wmsBaseProductList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="物料ID" align="center" prop="productId" v-if="columns[0].visible" />
+        <el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible" />
+        <el-table-column label="成品编码" align="center" prop="productCode" v-if="columns[2].visible" />
+        <el-table-column label="成品名称" align="center" prop="productName" v-if="columns[3].visible" />
+        <el-table-column label="外部品牌规格" align="center" prop="externalBrand" v-if="columns[3].visible" />
+        <el-table-column label="成品描述" align="center" prop="productSpe" v-if="columns[4].visible" />
+        <el-table-column label="单位" align="center" prop="unitName" v-if="columns[5].visible" />
+        <el-table-column label="参考成本" align="center" prop="purchasePrice" v-if="columns[6].visible" />
+        <el-table-column label="统一报价(参考)" align="center" prop="foreignPrice" v-if="columns[7].visible" />
+        <el-table-column label="备货期(天)" align="center" prop="stockingPeriod" v-if="columns[8].visible" />
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[9].visible">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag" />
+          </template>
+        </el-table-column>
+        <el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[10].visible" />
+        <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[11].visible" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[12].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[13].visible" />
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[14].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:wmsBaseProduct:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:wmsBaseProduct:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改海威成品信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="wmsBaseProductFormRef" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="成品编码" prop="productCode">
+          <el-input v-model="form.productCode" placeholder="请输入成品编码" />
+        </el-form-item>
+        <el-form-item label="成品名称" prop="productName">
+          <el-input v-model="form.productName" placeholder="请输入成品名称" />
+        </el-form-item>
+        <el-form-item label="成品描述" prop="productSpe">
+          <el-input v-model="form.productSpe" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+
+        <el-form-item label="外部品牌规格" prop="externalBrand">
+          <el-input v-model="form.externalBrand" placeholder="请输入外部品牌规格" />
+        </el-form-item>
+        <el-form-item label="单位" prop="unitId">
+          <el-select v-model="form.unitId" placeholder="请选择单位">
+            <el-option v-for="dict in unitInfoList" :key="dict.unitId" :label="dict.unitName" :value="dict.unitId"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="参考成本" prop="purchasePrice">
+          <el-input v-model="form.purchasePrice" placeholder="请输入参考成本" />
+        </el-form-item>
+        <el-form-item label="统一报价(参考)" prop="foreignPrice">
+          <el-input v-model="form.foreignPrice" placeholder="请输入统一报价(参考)" />
+        </el-form-item>
+        <el-form-item label="备货期" prop="stockingPeriod">
+          <el-input v-model="form.stockingPeriod" placeholder="请输入备货期" />
+        </el-form-item>
+        <el-form-item label="激活标识" prop="activeFlag">
+          <el-select v-model="form.activeFlag" placeholder="请选择激活标识">
+            <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="WmsBaseProduct" lang="ts">
+import { addWmsBaseProduct, delWmsBaseProduct, getWmsBaseProduct, listWmsBaseProduct, updateWmsBaseProduct } from '@/api/wms/wmsBaseProduct';
+import { WmsBaseProductForm, WmsBaseProductQuery, WmsBaseProductVO } from '@/api/wms/wmsBaseProduct/types';
+import { getBaseUnitInfoList } from '@/api/oa/base/unitInfo';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
+
+const wmsBaseProductList = ref<WmsBaseProductVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const wmsBaseProductFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `物料ID`, visible: false },
+  { key: 1, label: `租户编号`, visible: false },
+  { key: 2, label: `成品编码`, visible: true },
+  { key: 3, label: `成品名称`, visible: true },
+  { key: 4, label: `成品描述`, visible: true },
+  { key: 5, label: `单位`, visible: true },
+  { key: 6, label: `参考成本`, visible: true },
+  { key: 7, label: `统一报价(参考)`, visible: true },
+  { key: 8, label: `备货期`, visible: true },
+  { key: 9, label: `激活标识`, visible: true },
+  { key: 10, label: `创建部门`, visible: false },
+  { key: 11, label: `创建人`, visible: false },
+  { key: 12, label: `创建时间`, visible: true },
+  { key: 13, label: `更新人`, visible: false },
+  { key: 14, label: `更新时间`, visible: true }
+]);
+
+const initFormData: WmsBaseProductForm = {
+  productId: undefined,
+  productCode: undefined,
+  productName: undefined,
+  productSpe: undefined,
+  unitId: undefined,
+  purchasePrice: undefined,
+  foreignPrice: undefined,
+  stockingPeriod: undefined,
+  activeFlag: undefined
+};
+const data = reactive<PageData<WmsBaseProductForm, WmsBaseProductQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    productCode: undefined,
+    productName: undefined,
+    activeFlag: undefined,
+    params: {}
+  },
+  rules: {
+    // productId: [{ required: true, message: '物料ID不能为空', trigger: 'blur' }],
+    productName: [{ required: true, message: '成品名称不能为空', trigger: 'blur' }],
+    unitId: [{ required: true, message: '单位不能为空', trigger: 'change' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+/** 查询单位信息下拉框结构 */
+const unitInfoList = ref([]);
+const getUnitInfoListSelect = async () => {
+  const res = await getBaseUnitInfoList(null);
+  unitInfoList.value = res.data;
+};
+/** 查询海威成品信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listWmsBaseProduct(queryParams.value);
+  wmsBaseProductList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  wmsBaseProductFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: WmsBaseProductVO[]) => {
+  ids.value = selection.map((item) => item.productId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加仓库物料信息';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: WmsBaseProductVO) => {
+  reset();
+  const _productId = row?.productId || ids.value[0];
+  const res = await getWmsBaseProduct(_productId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改仓库物料信息';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  wmsBaseProductFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.productId) {
+        await updateWmsBaseProduct(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addWmsBaseProduct(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: WmsBaseProductVO) => {
+  const _productIds = row?.productId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除仓库物料信息编号为"' + _productIds + '"的数据项？').finally(() => (loading.value = false));
+  await delWmsBaseProduct(_productIds);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'wms/wmsBaseProduct/export',
+    {
+      ...queryParams.value
+    },
+    `wmsBaseProduct_${new Date().getTime()}.xlsx`
+  );
+};
+
+onMounted(() => {
+  getList();
+  getUnitInfoListSelect();
+});
+</script>