From 4c5052af94dc7ab408408be58c23bc6405c9689f Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Tue, 2 Sep 2025 18:10:20 +0800
Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E4=BF=AE=E6=94=B9=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增agv入库任务表（instockDetail）
- 调整表格列的显示顺序和可见性
-移除不必要的字段和功能
- 优化表单布局和提示信息
- 统一日期格式的显示
---
 src/views/wms/allocateOrder/index.vue         |   2 +-
 src/views/wms/baseMaterialInfo/index.vue      |   2 +-
 .../wms/baseMeasurementUnitInfo/index.vue     | 107 +++++++++---------
 src/views/wms/baseSupplierInfo/index.vue      |  51 +++++----
 src/views/wms/baseWarehouse/index.vue         |  50 ++++----
 src/views/wms/instockDetail/index.vue         |  96 ++++++++--------
 src/views/wms/instockPrint/index.vue          |  53 +++++----
 src/views/wms/inventory/index.vue             |  21 ++--
 src/views/wms/inventoryAlarm/index.vue        |  22 ++--
 src/views/wms/wmsBaseCustomer/index.vue       |   4 +-
 10 files changed, 208 insertions(+), 200 deletions(-)

diff --git a/src/views/wms/allocateOrder/index.vue b/src/views/wms/allocateOrder/index.vue
index c1f4b02..2e46043 100644
--- a/src/views/wms/allocateOrder/index.vue
+++ b/src/views/wms/allocateOrder/index.vue
@@ -306,7 +306,7 @@ const columns = ref<FieldOption[]>([
         { key: 5, label: `入库仓库`, visible: true },
         { key: 6, label: `审核人`, visible: true },
         { key: 7, label: `审核时间`, visible: true },
-        { key: 8, label: `审核状态(0待审核,1审核通过,2审核未通过)`, visible: true },
+        { key: 8, label: `审核状态`, visible: true },
         { key: 9, label: `审核意见`, visible: true },
         { key: 10, label: `租户号`, visible: true },
         { key: 11, label: `是否创建出库单`, visible: true },
diff --git a/src/views/wms/baseMaterialInfo/index.vue b/src/views/wms/baseMaterialInfo/index.vue
index b6a2e2e..991c0d0 100644
--- a/src/views/wms/baseMaterialInfo/index.vue
+++ b/src/views/wms/baseMaterialInfo/index.vue
@@ -159,7 +159,7 @@
 
         <el-row :gutter="20">
           <el-col :span="8">
-            <el-form-item label="不正确" prop="maxParkingTime">
+            <el-form-item label="保质期" prop="maxParkingTime">
               <el-input-number
                 v-model="form.maxParkingDays"
                 placeholder="请输入天数"
diff --git a/src/views/wms/baseMeasurementUnitInfo/index.vue b/src/views/wms/baseMeasurementUnitInfo/index.vue
index bb2b6cd..27d00f3 100644
--- a/src/views/wms/baseMeasurementUnitInfo/index.vue
+++ b/src/views/wms/baseMeasurementUnitInfo/index.vue
@@ -22,14 +22,14 @@
             <el-form-item label="祖级列表" prop="ancestors">
               <el-input v-model="queryParams.ancestors" placeholder="请输入祖级列表" clearable @keyup.enter="handleQuery" />
             </el-form-item>-->
-            <el-form-item label="单位类型" prop="unitType">
-              <el-select v-model="queryParams.unitType" placeholder="请选择单位类型" clearable>
-                <el-option v-for="dict in unit_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="激活标识" prop="activeFlag">
-              <el-input v-model="queryParams.activeFlag" placeholder="请输入激活标识" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+<!--            <el-form-item label="单位类型" prop="unitType">-->
+<!--              <el-select v-model="queryParams.unitType" placeholder="请选择单位类型" clearable>-->
+<!--                <el-option v-for="dict in unit_type" :key="dict.value" :label="dict.label" :value="dict.value"/>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="激活标识" prop="activeFlag">-->
+<!--              <el-input v-model="queryParams.activeFlag" placeholder="请输入激活标识" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>-->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -63,19 +63,19 @@
 <!--        <el-table-column label="父级标识" prop="parentId" />-->
         <el-table-column label="计量单位编号" align="center" prop="unitCode" />
         <el-table-column label="计量单位名称" align="center" prop="unitName" />
-        <el-table-column label="计量单位转换" align="center" prop="unitConversion" />
+<!--        <el-table-column label="计量单位转换" align="center" prop="unitConversion" />-->
 <!--        <el-table-column label="祖级列表" align="center" prop="ancestors" />-->
-        <el-table-column label="单位类型" align="center" prop="unitType">
-          <template #default="scope">
-            <dict-tag :options="unit_type" :value="scope.row.unitType"/>
-          </template>
-        </el-table-column>
+<!--        <el-table-column label="单位类型" align="center" prop="unitType">-->
+<!--          <template #default="scope">-->
+<!--            <dict-tag :options="unit_type" :value="scope.row.unitType"/>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="激活标识" align="center" prop="activeFlag">
-          <template #default="scope">
-            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
-          </template>
-        </el-table-column>
+<!--        <el-table-column label="激活标识" align="center" prop="activeFlag">-->
+<!--          <template #default="scope">-->
+<!--            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
 <!--        <el-table-column label="创建部门" align="center" prop="createDept" />
         <el-table-column label="创建人" align="center" prop="createBy" />
         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
@@ -110,51 +110,50 @@
 <!--        <el-form-item label="主键标识" prop="unitId">
           <el-input v-model="form.unitId" placeholder="请输入主键标识" />
         </el-form-item>-->
-        <el-form-item label="父级标识" prop="parentId">
-          <el-tree-select
-            v-model="form.parentId"
-            :data="baseMeasurementUnitInfoOptions"
-            :props="{ value: 'unitId', label: 'unitName', children: 'children' }"
-            value-key="unitId"
-            placeholder="请选择父级标识"
-            check-strictly
-          />
-        </el-form-item>
+<!--        <el-form-item label="父级标识" prop="parentId">-->
+<!--          <el-tree-select-->
+<!--            v-model="form.parentId"-->
+<!--            :data="baseMeasurementUnitInfoOptions"-->
+<!--            :props="{ value: 'unitId', label: 'unitName', children: 'children' }"-->
+<!--            value-key="unitId"-->
+<!--            placeholder="请选择父级标识"-->
+<!--            check-strictly-->
+<!--          />-->
+<!--        </el-form-item>-->
         <el-form-item label="计量单位编号" prop="unitCode">
           <el-input v-model="form.unitCode" placeholder="请输入计量单位编号" />
         </el-form-item>
         <el-form-item label="计量单位名称" prop="unitName">
           <el-input v-model="form.unitName" placeholder="请输入计量单位名称" />
         </el-form-item>
-        <el-form-item label="计量单位转换" prop="unitConversion">
-<!--          <el-input v-model="form.unitConversion" placeholder="请输入计量单位转换" />-->
-          <el-input-number v-model="form.unitConversion"   />
-        </el-form-item>
+<!--        <el-form-item label="计量单位转换" prop="unitConversion">-->
+<!--          <el-input-number v-model="form.unitConversion"   />-->
+<!--        </el-form-item>-->
 <!--        <el-form-item label="祖级列表" prop="ancestors">
           <el-input v-model="form.ancestors" placeholder="请输入祖级列表" />
         </el-form-item>-->
-        <el-form-item label="单位类型" prop="unitType">
-          <el-select v-model="form.unitType" placeholder="请选择单位类型">
-            <el-option
-              v-for="dict in unit_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="单位类型" prop="unitType">-->
+<!--          <el-select v-model="form.unitType" placeholder="请选择单位类型">-->
+<!--            <el-option-->
+<!--              v-for="dict in unit_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" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="激活标识" prop="activeFlag">
-          <el-radio-group v-model="form.activeFlag">
-            <el-radio
-              v-for="dict in active_flag"
-              :key="dict.value"
-              :value="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
+<!--        <el-form-item label="激活标识" prop="activeFlag">-->
+<!--          <el-radio-group v-model="form.activeFlag">-->
+<!--            <el-radio-->
+<!--              v-for="dict in active_flag"-->
+<!--              :key="dict.value"-->
+<!--              :value="dict.value"-->
+<!--            >{{dict.label}}</el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -200,7 +199,7 @@ const dialog = reactive<DialogOption>({
 
 const initFormData: BaseMeasurementUnitInfoForm = {
     unitId: undefined,
-    parentId: undefined,
+    parentId: 0,
     unitCode: undefined,
     unitName: undefined,
     unitConversion: undefined,
@@ -214,7 +213,7 @@ const data = reactive<PageData<BaseMeasurementUnitInfoForm, BaseMeasurementUnitI
   form: {...initFormData},
   queryParams: {
     unitId: undefined,
-    parentId: undefined,
+    parentId: 0,
     unitCode: undefined,
     unitName: undefined,
     unitConversion: undefined,
diff --git a/src/views/wms/baseSupplierInfo/index.vue b/src/views/wms/baseSupplierInfo/index.vue
index 00d7edc..097f6e3 100644
--- a/src/views/wms/baseSupplierInfo/index.vue
+++ b/src/views/wms/baseSupplierInfo/index.vue
@@ -4,10 +4,10 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="供应商编码" prop="supplierCode">
+            <el-form-item label="供应商编码" prop="supplierCode" label-width="120px">
               <el-input v-model="queryParams.supplierCode" placeholder="请输入供应商编码" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="供应商名称" prop="supplierName">
+            <el-form-item label="供应商名称" prop="supplierName" label-width="120px">
               <el-input v-model="queryParams.supplierName" placeholder="请输入供应商名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
 <!--            <el-form-item label="联系人" prop="contactPerson">-->
@@ -18,9 +18,10 @@
 <!--                <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 label="合作状态" prop="cooperationStatus">
+            <el-form-item label="合作状态" prop="cooperationStatus" label-width="120px">
               <el-select v-model="queryParams.cooperationStatus" placeholder="请选择合作状态" clearable >
-                <el-option v-for="dict in cooperation_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                <el-option v-for="dict in cooperation_status"
+                           :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item>
 <!--            <el-form-item label="审核状态" prop="auditStatus">-->
@@ -91,17 +92,17 @@
 <!--            <dict-tag :options="audit_status" :value="scope.row.auditStatus"/>-->
 <!--          </template>-->
 <!--        </el-table-column>-->
-        <el-table-column label="资质到期日期" align="center" prop="qualificationExpireDate" width="120" v-if="columns[9].visible">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.qualificationExpireDate, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+<!--        <el-table-column label="资质到期日期" align="center" prop="qualificationExpireDate" width="120" v-if="columns[9].visible">-->
+<!--          <template #default="scope">-->
+<!--            <span>{{ parseTime(scope.row.qualificationExpireDate, '{y}-{m}-{d}') }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
 <!--        <el-table-column label="审核日期" align="center" prop="auditDate" width="120" v-if="columns[11].visible">-->
 <!--          <template #default="scope">-->
 <!--            <span>{{ parseTime(scope.row.auditDate, '{y}-{m}-{d}') }}</span>-->
 <!--          </template>-->
 <!--        </el-table-column>-->
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[10].visible"/>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[9].visible"/>
 <!--        <el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[9].visible"/>
         <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[10].visible"/>
         <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[11].visible">
@@ -182,16 +183,16 @@
               <el-input v-model="form.businessLicenseNo" placeholder="请输入营业执照编号" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="资质到期日期" prop="qualificationExpireDate">
-              <el-date-picker clearable
-                v-model="form.qualificationExpireDate"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择资质到期日期">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="资质到期日期" prop="qualificationExpireDate">-->
+<!--              <el-date-picker clearable-->
+<!--                v-model="form.qualificationExpireDate"-->
+<!--                type="date"-->
+<!--                value-format="YYYY-MM-DD"-->
+<!--                placeholder="请选择资质到期日期">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
@@ -218,7 +219,8 @@
                   v-for="dict in active_flag"
                   :key="dict.value"
                   :value="dict.value"
-                >{{dict.label}}</el-radio>
+                  :label="dict.label"
+                ></el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -231,7 +233,8 @@
                   v-for="dict in cooperation_status"
                   :key="dict.value"
                   :value="dict.value"
-                >{{dict.label}}</el-radio>
+                  :label="dict.label"
+                ></el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -322,9 +325,9 @@ const columns = ref<FieldOption[]>([
         { key: 7, label: `激活状态`, visible: true },
         { key: 8, label: `合作状态`, visible: true },
         // { key: 9, label: `审核状态`, visible: true },
-        { key: 9, label: `资质到期日期`, visible: false },
+        // { key: 9, label: `资质到期日期`, visible: false },
         // { key: 11, label: `审核日期`, visible: false },
-        { key: 10, label: `备注`, visible: true },
+        { key: 9, label: `备注`, visible: true },
 ]);
 
 
diff --git a/src/views/wms/baseWarehouse/index.vue b/src/views/wms/baseWarehouse/index.vue
index afa4fb9..032d687 100644
--- a/src/views/wms/baseWarehouse/index.vue
+++ b/src/views/wms/baseWarehouse/index.vue
@@ -116,30 +116,30 @@
         <el-form-item label="仓库名称" prop="warehouseName">
           <el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
         </el-form-item>
-        <el-form-item label="物料大类" prop="materialCategoryId">
-          <el-select v-model="form.materialCategoryId" placeholder="请选择物料大类">
-            <el-option
-                        v-for="item in mategoryOptions"
-                       :key="item.materialCategoryId"
-                       :label="item.materialCategoryName"
-                       :value="item.materialCategoryId"
-            />
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="物料大类" prop="materialCategoryId">-->
+<!--          <el-select v-model="form.materialCategoryId" placeholder="请选择物料大类">-->
+<!--            <el-option-->
+<!--                        v-for="item in mategoryOptions"-->
+<!--                       :key="item.materialCategoryId"-->
+<!--                       :label="item.materialCategoryName"-->
+<!--                       :value="item.materialCategoryId"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="仓库位置" prop="warehouseLocation">
           <el-input v-model="form.warehouseLocation" placeholder="请输入仓库位置" />
         </el-form-item>
-        <el-form-item label="关联车间" prop="workshopId">
-          <el-select v-model="form.workshopId" placeholder="请选择关联车间">
+<!--        <el-form-item label="关联车间" prop="workshopId">-->
+<!--          <el-select v-model="form.workshopId" placeholder="请选择关联车间">-->
 
-            <el-option
-              v-for="item in workshopInfoList"
-              :key="item.workshopId"
-              :label="item.workshopName"
-              :value="item.workshopId"
-            />
-          </el-select>
-        </el-form-item>
+<!--            <el-option-->
+<!--              v-for="item in workshopInfoList"-->
+<!--              :key="item.workshopId"-->
+<!--              :label="item.workshopName"-->
+<!--              :value="item.workshopId"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="仓库类型" prop="warehouseType">
           <el-select v-model="form.warehouseType" placeholder="请选择仓库类型">
             <el-option
@@ -200,9 +200,9 @@ const columns = ref<FieldOption[]>([
         { key: 0, label: `表主键`, visible: false },
         { key: 1, label: `仓库编码`, visible: true },
         { key: 2, label: `仓库名称`, visible: true },
-        { key: 3, label: `物料大类`, visible: true },
+        { key: 3, label: `物料大类`, visible: false },
         { key: 4, label: `仓库位置`, visible: true },
-        { key: 5, label: `关联车间`, visible: true },
+        { key: 5, label: `关联车间`, visible: false },
         { key: 6, label: `仓库类型`, visible: true },
         { key: 7, label: `租户号`, visible: false },
         { key: 8, label: `创建人`, visible: false },
@@ -250,9 +250,9 @@ const data = reactive<PageData<BaseWarehouseForm, BaseWarehouseQuery>>({
     warehouseName: [
       { required: true, message: "仓库名称不能为空", trigger: "blur" }
     ],
-    materialCategoryId: [
-      { required: true, message: "物料大类不能为空", trigger: "change" }
-    ],
+    // materialCategoryId: [
+    //   { required: true, message: "物料大类不能为空", trigger: "change" }
+    // ],
     warehouseLocation: [
       { required: true, message: "仓库位置不能为空", trigger: "blur" }
     ],
diff --git a/src/views/wms/instockDetail/index.vue b/src/views/wms/instockDetail/index.vue
index c7cc9ff..c4462b9 100644
--- a/src/views/wms/instockDetail/index.vue
+++ b/src/views/wms/instockDetail/index.vue
@@ -13,7 +13,7 @@
             <!-- <el-form-item label="入库单号" prop="instockCode">
               <el-input v-model="queryParams.instockCode" placeholder="请输入入库单号" clearable @keyup.enter="handleQuery" />
             </el-form-item> -->
-            <el-form-item label="送货-物料表主键" prop="dnDId">
+            <!-- <el-form-item label="送货-物料表主键" prop="dnDId">
               <el-input v-model="queryParams.dnDId" placeholder="请输入送货-物料表主键" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="采购-物料表主键" prop="poDId">
@@ -39,7 +39,7 @@
             </el-form-item>
             <el-form-item label="是否有条码" prop="codeYesNo">
               <el-input v-model="queryParams.codeYesNo" placeholder="请输入是否有条码" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item> -->
 <!--            <el-form-item label="物料大类" prop="materialCategoryId">
               <el-input v-model="queryParams.materialCategoryId" placeholder="请输入物料大类" clearable @keyup.enter="handleQuery" />
             </el-form-item>-->
@@ -55,7 +55,7 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:instockDetail:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -63,7 +63,7 @@
           </el-col>
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:instockDetail:remove']">删除</el-button>
-          </el-col>
+          </el-col> -->
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:instockDetail:export']">导出</el-button>
           </el-col>
@@ -75,27 +75,28 @@
         <el-table-column type="selection" width="55" align="center" />
         <!-- <el-table-column label="入库单子表主键" align="center" prop="instockDetailId" v-if="columns[0].visible"/>
         <el-table-column label="入库单 主键" align="center" prop="instockId" v-if="columns[1].visible"/> -->
-        <!-- <el-table-column label="入库单号" align="center" prop="instockCode" v-if="columns[2].visible"/> -->
+        <el-table-column label="入库单号" align="center" prop="instockCode" v-if="columns[0].visible"/>
         <!-- <el-table-column label="送货-物料表主键" align="center" prop="dnDId" v-if="columns[4].visible"/>
         <el-table-column label="采购-物料表主键" align="center" prop="poDId" v-if="columns[5].visible"/> -->
         <!-- <el-table-column label="物料id" align="center" prop="materialId" v-if="columns[6].visible"/> -->
-        <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[7].visible"/>
-        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[8].visible"/>
-        <el-table-column label="入库数量" align="center" prop="instockQty" v-if="columns[9].visible"/>
-        <el-table-column label="已分包数量" align="center" prop="printedNum" />
-        <el-table-column label="物料规格" align="center" prop="materialSpe" v-if="columns[10].visible"/>
-        <el-table-column label="计量单位名称" align="center" prop="unitName" v-if="columns[11].visible"/>
-        <el-table-column label="是否有条码" align="center" prop="codeYesNo" v-if="columns[12].visible">
+        <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[1].visible"/>
+        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[2].visible"/>
+        <el-table-column label="入库数量" align="center" prop="instockQty" v-if="columns[3].visible"/>
+
+        <el-table-column label="物料规格" align="center" prop="materialSpe" 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="codeYesNo" v-if="columns[12].visible">
           <template #default="scope">
             <dict-tag :options="wms_barcode_if" :value="scope.row.codeYesNo"/>
           </template>
         </el-table-column>
         <el-table-column label="物料大类" align="center" prop="materialCategoryId" v-if="columns[13].visible">
-
-        </el-table-column>
+        </el-table-column> -->
+        <el-table-column label="AGv状态" align="center" prop="agvStatus" v-if="columns[6].visible"/>
+        <el-table-column label="完成数量" align="center" prop="completeQty" v-if="columns[7].visible"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-tooltip content="修改" placement="top">
+            <!-- <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:instockDetail:edit']"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
@@ -103,13 +104,14 @@
             </el-tooltip>
             <el-tooltip content="打印" placement="top">
               <el-button link type="primary" icon="Check" @click="handlePrint(scope.row)"></el-button>
-            </el-tooltip>
+            </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="instockDetailFormRef" :model="form" :rules="rules" label-width="80px">
@@ -197,20 +199,14 @@ const printer = reactive<DialogOption>({
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-        { key: 0, label: `入库单子表主键`, visible: true },
-        { key: 1, label: `入库单 主键`, visible: true },
-        { key: 2, label: `入库单号`, visible: true },
-        { key: 3, label: `创建时间`, visible: true },
-        { key: 4, label: `送货-物料表主键`, visible: true },
-        { key: 5, label: `采购-物料表主键`, visible: true },
-        { key: 6, label: `物料id`, visible: true },
-        { key: 7, label: `物料编码`, visible: true },
-        { key: 8, label: `物料名称`, visible: true },
-        { 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: 0, label: `入库单号`, visible: true },
+        { key: 1, label: `物料编码`, visible: true },
+        { key: 2, label: `物料名称`, visible: true },
+        { key: 3, label: `入库数量`, visible: true },
+        { key: 4, label: `物料规格`, visible: true },
+        { key: 5, label: `计量单位名称`, visible: true },
+        { key: 6, label: `AGV状态`, visible: true },
+        { key: 7, label:'完成数量',visible: true}
 ]);
 
 const initFormData: InstockDetailForm = {
@@ -226,7 +222,10 @@ const initFormData: InstockDetailForm = {
   materialSpe: undefined,
   unitName: undefined,
   codeYesNo: undefined,
-  materialCategoryId: undefined
+  materialCategoryId: undefined,
+  isAgv: '0',
+  completeQty: undefined,
+  agvStatus: undefined,
 }
 const data = reactive<PageData<InstockDetailForm, InstockDetailQuery>>({
   form: {...initFormData},
@@ -247,19 +246,22 @@ const data = reactive<PageData<InstockDetailForm, InstockDetailQuery>>({
     codeYesNo: undefined,
     materialCategoryId: undefined,
   materialCategoryName: undefined,//字段映射
+  isAgv: '0',
+  completeQty: undefined,
+  agvStatus: undefined,
     params: {
     }
   },
   rules: {
-    dnDId: [
-      { required: true, message: "送货-物料表主键不能为空", trigger: "blur" }
-    ],
-    poDId: [
-      { required: true, message: "采购-物料表主键不能为空", trigger: "blur" }
-    ],
-    materialId: [
-      { required: true, message: "物料id不能为空", trigger: "blur" }
-    ],
+    // dnDId: [
+    //   { required: true, message: "送货-物料表主键不能为空", trigger: "blur" }
+    // ],
+    // poDId: [
+    //   { required: true, message: "采购-物料表主键不能为空", trigger: "blur" }
+    // ],
+    // materialId: [
+    //   { required: true, message: "物料id不能为空", trigger: "blur" }
+    // ],
     // materialCode: [
     //   { required: true, message: "物料编码不能为空", trigger: "blur" }
     // ],
@@ -296,6 +298,7 @@ const getList = async () => {
   total.value = res.total;
   loading.value = false;
 }
+
 /** 查询入库单大类下物料列表 */
 const getMaterialList = async () => {
   const materialCategoryId = router.query.materialCategoryId
@@ -369,9 +372,9 @@ const handlePrint = async (row?: InstockDetailVO) => {
 /** 提交按钮 */
 const submitForm = () => {
   instockDetailFormRef.value?.validate(async (valid: boolean) => {
-    form.value.materialCategoryId = router.query.materialCategoryId;
-    form.value.instockId = router.query.instockId;
-    form.value.instockCode = router.query.instockCode;
+    // form.value.materialCategoryId = router.query.materialCategoryId;
+    // form.value.instockId = router.query.instockId;
+    // form.value.instockCode = router.query.instockCode;
     if (valid) {
       buttonLoading.value = true;
       if (form.value.instockDetailId) {
@@ -423,10 +426,9 @@ const getMaterialCategorySelect = async () => {
 
 
 onMounted(() => {
-  getMaterialList();
-  const materialCategoryId = router.query.materialCategoryId
-  console.log(materialCategoryId)
+  // getMaterialList();
+  // const materialCategoryId = router.query.materialCategoryId
   getList();
-  getMaterialCategorySelect();
+  // getMaterialCategorySelect();
 });
 </script>
diff --git a/src/views/wms/instockPrint/index.vue b/src/views/wms/instockPrint/index.vue
index 6bd656a..008d8f0 100644
--- a/src/views/wms/instockPrint/index.vue
+++ b/src/views/wms/instockPrint/index.vue
@@ -96,21 +96,23 @@
       <el-table v-loading="loading" :data="instockPrintList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <!-- <el-table-column label="入库单子表主键" align="center" prop="instockPrintId" v-if="columns[0].visible"/> -->
-        <el-table-column label="入库单号" align="center" prop="instockCode" v-if="columns[1].visible"/>
-        <el-table-column label="批次码" align="center" prop="batchCode" v-if="columns[3].visible"/>
-        <el-table-column label="条码数量" align="center" prop="materialQty" v-if="columns[4].visible"/>
-        <el-table-column label="分包数量" align="center" prop="apportionQty" v-if="columns[5].visible"/>
+        <el-table-column label="入库单号" align="center" prop="instockCode" v-if="columns[0].visible"/>
+        <el-table-column label="批次码" align="center" prop="batchCode" v-if="columns[1].visible"/>
+        <el-table-column label="条码数量" align="center" prop="materialQty" v-if="columns[2].visible"/>
+        <el-table-column label="分包数量" align="center" prop="apportionQty" v-if="columns[3].visible"/>
         <!-- <el-table-column label="物料id" align="center" prop="materialId" v-if="columns[6].visible"/> -->
-        <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[7].visible"/>
-        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[8].visible"/>
-        <el-table-column label="物料规格" align="center" prop="materialSpe" v-if="columns[9].visible"/>
-        <el-table-column label="计量单位名称" align="center" prop="unitName" v-if="columns[10].visible"/>
-        <el-table-column label="是否有条码" align="center" prop="codeYesNo" v-if="columns[11].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[5].visible"/>
+        <el-table-column label="物料规格" align="center" prop="materialSpe" v-if="columns[6].visible"/>
+        <el-table-column label="计量单位名称" align="center" prop="unitName" v-if="columns[7].visible"/>
+        <!-- <el-table-column label="是否有条码" align="center" prop="codeYesNo" v-if="columns[11].visible">
           <template #default="scope">
             <dict-tag :options="wms_barcode_if" :value="scope.row.codeYesNo"/>
           </template>
-        </el-table-column>
-        <el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[12].visible">
+        </el-table-column> -->
+        <!-- <el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[12].visible">
+        </el-table-column> -->
+        <el-table-column label="打印时间" align="center" prop="createTime" v-if="columns[8].visible">
         </el-table-column>
         <!-- <el-table-column label="推荐库位id" align="center" prop="recommendWarehouseId" v-if="inboundStatusdVisble.value">
         </el-table-column>
@@ -124,6 +126,7 @@
             <span>{{ parseTime(scope.row.actualInboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
+
         <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
@@ -232,6 +235,7 @@ const initFormData: InstockPrintForm = {
   locationId: undefined,
   inboundStatus: undefined,
   actualInboundTime: undefined,
+  createTime: undefined,
 }
 
 const data = reactive<PageData<InstockPrintForm, InstockPrintQuery>>({
@@ -255,6 +259,7 @@ const data = reactive<PageData<InstockPrintForm, InstockPrintQuery>>({
     locationId: undefined,
     inboundStatus: undefined,
     actualInboundTime: undefined,
+    createTime: undefined,
     params: {
     }
   },
@@ -325,19 +330,19 @@ const dialog = reactive<DialogOption>({
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-  { key: 0, label: `入库单子表主键`, visible: true },
-  { key: 1, label: `入库单号`, visible: true },
-  { key: 2, label: `创建时间`, visible: true },
-  { key: 3, label: `批次码`, visible: true },
-  { key: 4, label: `条码数量`, visible: true },
-  { key: 5, label: `分包数量`, visible: true },
-  { key: 6, label: `物料id`, visible: true },
-  { key: 7, label: `物料编码`, visible: true },
-  { key: 8, label: `物料名称`, visible: true },
-  { key: 9, label: `物料规格`, visible: true },
-  { key: 10, label: `计量单位名称`, visible: true },
-  { key: 11, label: `是否有条码`, visible: true },
-  { key: 12, label: `物料大类`, visible: false },
+  // { key: 0, label: `入库单子表主键`, visible: true },
+  { key: 0, label: `入库单号`, visible: true },
+  { key: 1, label: `批次码`, visible: true },
+  { key: 2, label: `条码数量`, visible: true },
+  { key: 3, label: `分包数量`, visible: true },
+  // { key: 6, label: `物料`, visible: false },
+  { key: 4, label: `物料编码`, visible: true },
+  { key: 5, label: `物料名称`, visible: true },
+  { key: 6, label: `物料规格`, visible: true },
+  { key: 7, label: `计量单位名称`, visible: true },
+  // { key: 9, label: `是否有条码`, visible: false },
+  // { key: 10, label: `物料大类`, visible: false },
+  { key: 8, label: `打印时间`, visible: true },
   // { key: 13, label: `推荐库位id`, visible: inboundStatusdVisble.value },
   // { key: 14, label: `入库状态(0-待入库,1-已入库,2-入库中)`, visible: inboundStatusdVisble.value },
   // { key: 15, label: `实际入库时间`, visible: inboundStatusdVisble.value },
diff --git a/src/views/wms/inventory/index.vue b/src/views/wms/inventory/index.vue
index d4c4599..f1e2188 100644
--- a/src/views/wms/inventory/index.vue
+++ b/src/views/wms/inventory/index.vue
@@ -23,16 +23,15 @@
             <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="materialCategoryId">
-              <el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable >
-<!--                <el-option v-for="dict in material_mategories" :key="dict.value" :label="dict.label" :value="dict.value"/>-->
-                <el-option v-for="item in mategoryOptions"
-                           :key="item.materialCategoryId"
-                           :label="item.materialCategoryName"
-                           :value="item.materialCategoryId"
-                />
-              </el-select>
-            </el-form-item>
+<!--            <el-form-item label="物料大类" prop="materialCategoryId">-->
+<!--              <el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable >-->
+<!--                <el-option v-for="item in mategoryOptions"-->
+<!--                           :key="item.materialCategoryId"-->
+<!--                           :label="item.materialCategoryName"-->
+<!--                           :value="item.materialCategoryId"-->
+<!--                />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
             <!-- <el-form-item label="库存数量" prop="inventoryQty">
               <el-input v-model="queryParams.inventoryQty" placeholder="请输入库存数量" clearable @keyup.enter="handleQuery" />
             </el-form-item> -->
@@ -212,7 +211,7 @@ const columns = ref<FieldOption[]>([
         { key: 2, label: `批次码`, visible: true },
         { key: 3, label: `物料id`, visible: true },
         { key: 4, label: `库位编码`, visible: true },
-        { key: 5, label: `物料大类`, visible: true },
+        { key: 5, label: `物料大类`, visible: false },
         { key: 6, label: `库存数量`, visible: true },
         { key: 7, label: `更新时间`, visible: true },
         { key: 8, label: `锁定状态`, visible: true },
diff --git a/src/views/wms/inventoryAlarm/index.vue b/src/views/wms/inventoryAlarm/index.vue
index 144eae7..d791314 100644
--- a/src/views/wms/inventoryAlarm/index.vue
+++ b/src/views/wms/inventoryAlarm/index.vue
@@ -16,15 +16,15 @@
             <!-- <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="materialCategoryId">
-              <el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable >
-                                   <el-option v-for="item in mategoryOptions"
-                           :key="item.materialCategoryId"
-                           :label="item.materialCategoryName"
-                           :value="item.materialCategoryId"
-                />
-              </el-select>
-            </el-form-item>
+<!--            <el-form-item label="物料大类" prop="materialCategoryId">-->
+<!--              <el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable >-->
+<!--                                   <el-option v-for="item in mategoryOptions"-->
+<!--                           :key="item.materialCategoryId"-->
+<!--                           :label="item.materialCategoryName"-->
+<!--                           :value="item.materialCategoryId"-->
+<!--                />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
             <!-- <el-form-item label="库存数量" prop="inventoryQty">
               <el-input v-model="queryParams.inventoryQty" placeholder="请输入库存数量" clearable @keyup.enter="handleQuery" />
             </el-form-item> -->
@@ -196,12 +196,12 @@ const dialog = reactive<DialogOption>({
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-        { key: 0, label: `表主键`, visible: true },
+        { key: 0, label: `表主键`, visible: false },
         { key: 1, label: `租户号`, visible: true },
         { key: 2, label: `批次码`, visible: true },
         { key: 3, label: `物料id`, visible: true },
         { key: 4, label: `库位编码`, visible: true },
-        { key: 5, label: `物料大类`, visible: true },
+        { key: 5, label: `物料大类`, visible: false },
         { key: 6, label: `库存数量`, visible: true },
         { key: 7, label: `更新时间`, visible: true },
         { key: 8, label: `锁定状态`, visible: true },
diff --git a/src/views/wms/wmsBaseCustomer/index.vue b/src/views/wms/wmsBaseCustomer/index.vue
index 12b510f..696df4c 100644
--- a/src/views/wms/wmsBaseCustomer/index.vue
+++ b/src/views/wms/wmsBaseCustomer/index.vue
@@ -7,10 +7,10 @@
 <!--            <el-form-item label="客户ID" prop="customerId">-->
 <!--              <el-input v-model="queryParams.customerId" placeholder="请输入客户ID" clearable @keyup.enter="handleQuery" />-->
 <!--            </el-form-item>-->
-            <el-form-item label="客户编码" prop="customerCode">
+            <el-form-item label="客户编码" prop="customerCode" label-width="120px">
               <el-input v-model="queryParams.customerCode" placeholder="请输入客户编码" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="客户名称" prop="customerName">
+            <el-form-item label="客户名称" prop="customerName" label-width="120px">
               <el-input v-model="queryParams.customerName" placeholder="请输入客户名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
 <!--            <el-form-item label="联系人" prop="contactPerson">-->