From a1608963e20b629330b29dd9289c9b1bbe6d8745 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Mon, 25 Aug 2025 14:35:14 +0800
Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E4=BC=98=E5=8C=96=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E7=BB=84=E4=BB=B6=E7=9A=84=E4=BB=A3=E7=A0=81=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E5=92=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 调整字典项循环中的变量命名，提高代码可读性
- 优化客户信息获取和展示逻辑
- 改进仓库列表获取方法
-调整表格列的显示逻辑- 优化表单结构和字段
---
 src/api/wms/instockRecord/types.ts           |   5 +
 src/views/wms/baseMaterialInfo/index.vue     |  19 +--
 src/views/wms/instockRecord/index.vue        |  18 ++-
 src/views/wms/outstockOrderCopy/index.vue    |  57 +++++---
 src/views/wms/outstockRecord/index.vue       |   4 +-
 src/views/wms/wmsCheckTask/index.vue         |  13 +-
 src/views/wms/wmsPurchaseOrderCopy/index.vue | 140 +++++++++----------
 7 files changed, 150 insertions(+), 106 deletions(-)

diff --git a/src/api/wms/instockRecord/types.ts b/src/api/wms/instockRecord/types.ts
index 5658e69..f889155 100644
--- a/src/api/wms/instockRecord/types.ts
+++ b/src/api/wms/instockRecord/types.ts
@@ -80,6 +80,11 @@ export interface InstockRecordVO {
 }
 
 export interface InstockRecordForm extends BaseEntity {
+  /**
+   * 入库记录ID
+   */
+  instockRecordId?: string | number;
+  
   /**
    * 入库单号
    */
diff --git a/src/views/wms/baseMaterialInfo/index.vue b/src/views/wms/baseMaterialInfo/index.vue
index e1743af..0d2432e 100644
--- a/src/views/wms/baseMaterialInfo/index.vue
+++ b/src/views/wms/baseMaterialInfo/index.vue
@@ -212,10 +212,10 @@
             <el-form-item label="质检要求" prop="inspectionRequest">
               <el-select v-model="form.inspectionRequest" placeholder="请选择质检要求">
                 <el-option
-                    v-for="item in inspection_request"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
+                    v-for="dict in inspection_request"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -224,10 +224,10 @@
             <el-form-item label="是否高价值" prop="isHighValue" >
               <el-select v-model="form.isHighValue" placeholder="请选择是否高价值">
                 <el-option
-                    v-for="item in is_high_value"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
+                    v-for="dict in is_high_value"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -267,7 +267,8 @@ const { apply_flag, inner_tube_flag,
   auto_outstock_flag, mes_batch_flag, active_flag, sale_type, deleted_flag, tire_markings,
   material_classfication, mes_low_value_consumable_flag,
   is_high_value,inspection_request
-} = toRefs<any>(proxy?.useDict('apply_flag', 'inner_tube_flag',   'always_flag', 'mes_accessories_flag', 'auto_outstock_flag', 'mes_batch_flag', 'active_flag', 'sale_type', 'deleted_flag', 'tire_markings', 'material_classfication', 'mes_low_value_consumable_flag',
+} = toRefs<any>(proxy?.useDict('apply_flag', 'inner_tube_flag',   'always_flag', 'mes_accessories_flag',
+  'auto_outstock_flag', 'mes_batch_flag', 'active_flag', 'sale_type', 'deleted_flag', 'tire_markings', 'material_classfication', 'mes_low_value_consumable_flag',
   'is_high_value', 'inspection_request'
 ));
 
diff --git a/src/views/wms/instockRecord/index.vue b/src/views/wms/instockRecord/index.vue
index aacb110..57f9165 100644
--- a/src/views/wms/instockRecord/index.vue
+++ b/src/views/wms/instockRecord/index.vue
@@ -223,15 +223,17 @@ const columns = ref<FieldOption[]>([
   { key: 9, label: `物料大类`, visible: true },
   { key: 10, label: `入库人`, visible: true },
   { key: 11, label: `创建时间`, visible: true },
-  { key: 12, label: `erp同步状态`, visible: true },
-  { key: 13, label: `erp同步数量`, visible: true  },
+  { key: 12, label: `erp同步状态`, visible: false },
+  { key: 13, label: `erp同步数量`, visible: false  },
   // { key: 14, label: `修改人`, visible: true },
   { key: 14, label: `同步时间`, visible: true },
+  { key: 15, label: `特殊标识`, visible: true },
   // { key: 16, label: `创建部门`, visible: true },
   // { key: 17, label: `租户号`, visible: true },
 ]);
 
 const initFormData: InstockRecordForm = {
+  instockRecordId: undefined,
   instockCode: undefined,
   batchCode: undefined,
   materialId: undefined,
@@ -303,10 +305,7 @@ const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
 }
-// 获取仓库
-getBaseWarehouseList().then(e => {
-  baseStoreList.value = e.data
-})
+
 /** 重置按钮操作 */
 const resetQuery = () => {
   dateRangeCreateTime.value = ['', ''];
@@ -378,8 +377,15 @@ const getMaterialCategorySelect = async () => {
   mategoryOptions.value = res.data;
 };
 
+// 获取仓库列表
+const getBaseWarehouseData = async () => {
+  const res = await getBaseWarehouseList(null);
+  baseStoreList.value = res.data;
+};
+
 onMounted(() => {
   getMaterialCategorySelect();
+  getBaseWarehouseData();
   getList();
 });
 </script>
diff --git a/src/views/wms/outstockOrderCopy/index.vue b/src/views/wms/outstockOrderCopy/index.vue
index c79989c..dab1c32 100644
--- a/src/views/wms/outstockOrderCopy/index.vue
+++ b/src/views/wms/outstockOrderCopy/index.vue
@@ -75,6 +75,7 @@
           </template>
         </el-table-column>
         <el-table-column label="审核意见" align="center" prop="auditComments"/>
+        <el-table-column label="客户" align="center" prop="customerId" v-if ="routeOutstockTypeValue == 1 "/>
         <!-- <el-table-column label="入库方式" align="center" prop="inMethod">
           <template #default="scope">
             <dict-tag :options="wms_allocate_way" :value="scope.row.inMethod"/>
@@ -376,6 +377,18 @@
             ></el-option>
           </el-select>
         </el-form-item>
+
+        <el-form-item label="销售客户" prop="customerId">
+          <el-select v-model="parentTableInfoForm.customerId" placeholder="请选择客户" v-if="parentTableInfoForm.outstockType == 1">
+            <el-option
+              v-for="item in baseCustomerList"
+              :key="item.customerId"
+              :label="item.customerName"
+              :value="item.customerId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
         <el-form-item label="物料大类" prop="materialCategoryId">
           <el-select v-model="parentTableInfoForm.materialCategoryId" placeholder="请选择物料大类">
                                    <el-option v-for="item in mategoryOptions"
@@ -516,6 +529,7 @@ import {
 import MaterialSelectInWMS from "@/views/wms/baseMaterialInfo/addMaterialInWMS.vue";
 
 import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
+import { getWmsBaseCustomerList } from '@/api/wms/wmsBaseCustomer';
 
 
 
@@ -550,22 +564,10 @@ const approveForm = ref<Partial<OutstockOrderForm>>({ outstockId: undefined, aud
 // const childrenTableInfoSubmit = ref(false)
 const updateDialog = ref(false)
 const dialogTitle = ref('添加')
-// Initialize dialogForm with properties
-const dialogForm = ref<OutstockOrderForm>({});
 
-// Similarly for parentTableInfoForm
-const parentTableInfoForm = ref<OutstockOrderForm>({});
-
-// For childrenTableInfoForm
-const childrenTableInfoForm = ref({
-  materialId: undefined,
-  instockQty: undefined,
-  codeYesNo: undefined,
-  printedNum: undefined,
-  printNum: undefined,
-  barcodeNum: undefined,
-  isHighValue : undefined,
-})
+const dialogForm = ref({})
+const parentTableInfoForm = ref({})
+const childrenTableInfoForm = ref({})
 
 const queryForm = ref({
   outstockCode: '',
@@ -573,6 +575,7 @@ const queryForm = ref({
   materialCategoryName: '',
   warehouseId: '',
   outstockType: '',
+  customerId: undefined,
   pageNum: 1,
   pageSize: 10
 })
@@ -592,7 +595,16 @@ const childrenTableLoad = ref(false)
 const isView = ref(false)
 const partntTableSelectCell = ref({})
 let supplierList = ref([]);
+
 /** 查询出库单大类下物料数量接口 */
+// const getMaterialCount = async () => {
+//   const materialId = form.value.materialId
+//   console.log(materialId)
+//   const res = await getMaterailCount({ 'materialId': materialId });
+//   console.log(res.data);
+//   form.value.stockQty = res.data;
+//   console.log(form.stockQty)
+// }
 
 
 // 获取路由实例
@@ -609,7 +621,7 @@ if (route.query.outstockType) {
 }
 
 // 获取仓库
-getBaseWarehouseList().then(e => {
+getBaseWarehouseList(null).then(e => {
   baseStoreList.value = e.data
 })
 listUser().then(e => {
@@ -684,6 +696,7 @@ const reset = () => {
   queryForm.value.materialCategoryName = '';
   queryForm.value.warehouseId = '';
   queryForm.value.outstockType = routeOutstockTypeValue;
+  queryForm.value.customerId = undefined;
   queryForm.value.pageNum = 1;
   queryForm.value.pageSize = 10;
 }
@@ -702,12 +715,14 @@ const selectionChange = (e) => {
 
 // 父表格新增
 const parentTableAdd = () => {
+  getBaseCustomerList();
   dialogVisible.value = true
   dialogForm.value = {}
   dialogtable.value = []
 }
 // 父表格修改
 const parentTableUpdate = async (e) => {
+  getBaseCustomerList();
   let id = ref(null)
   if (e) {
     id.value = e.outstockId
@@ -799,7 +814,7 @@ const parentTableInfoSubmit = () =>{
 
 // 子表格修改
 const childrenTableUpdate = async (e) => {
-  const res = (await getOutstockDetail(e.outstockDetailId));
+  const res = await getOutstockDetail(e.outstockDetailId);
   childrenTableInfoForm.value = res.data;
   childrenTableInfoVisible.value = true
 }
@@ -941,6 +956,14 @@ const submitApprove = async () => {
 }
 
 
+//获取客户信息
+let baseCustomerList = ref([]);
+ const getBaseCustomerList = async () => {
+   const res = await getWmsBaseCustomerList(null);
+   baseCustomerList.value = res.data;
+ }
+
+
 </script>
 <style>
 .demo-form-inline .el-input {
diff --git a/src/views/wms/outstockRecord/index.vue b/src/views/wms/outstockRecord/index.vue
index aaa1b69..0424024 100644
--- a/src/views/wms/outstockRecord/index.vue
+++ b/src/views/wms/outstockRecord/index.vue
@@ -223,8 +223,8 @@ const columns = ref<FieldOption[]>([
         { key: 7, label: `物料大类`, visible: true },
         { key: 8, label: `出库人`, visible: true },
         { key: 9, label: `提交时间`, visible: true },
-        { key: 10, label: `erp同步状态`, visible: true },
-        { key: 11, label: `erp同步数量`, visible: true },
+        { key: 10, label: `erp同步状态`, visible: false },
+        { key: 11, label: `erp同步数量`, visible: false },
         { key: 12, label: `特殊标识`, visible: true },
         // { key: 12, label: `${comment}`, visible: true },
         // { key: 13, label: `${comment}`, visible: true },
diff --git a/src/views/wms/wmsCheckTask/index.vue b/src/views/wms/wmsCheckTask/index.vue
index 9f789a9..ddc6613 100644
--- a/src/views/wms/wmsCheckTask/index.vue
+++ b/src/views/wms/wmsCheckTask/index.vue
@@ -179,7 +179,16 @@
         <el-dialog title="Cron表达式生成器" v-model="dialogCron.visible" append-to-body destroy-on-close class="scrollbar">
           <Crontab @hide="dialogCron.visible = false" @fill="crontabFill" :expression="expression"></Crontab>
         </el-dialog>
-
+        <el-form-item label="抽检物料类型" prop="materialTypeId" v-if="form.wmsCheckTaskType == 0">
+          <el-select v-model="form.materialTypeId" placeholder="请选择抽检物料类型">
+            <el-option
+              v-for="item in materialTypeList"
+              :key="item.matrialTypeId"
+              :label="item.matrialTypeName"
+              :value="item.matrialTypeId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="抽检率（%）" prop="checkRate" v-if="form.wmsCheckTaskType == 0">
           <el-input-number v-model="form.checkRate" :precision="2" :step="0.01" :min="0" :max="100" placeholder="请输入抽检率" />
         </el-form-item>
@@ -218,7 +227,7 @@ import { getBaseWarehouseList } from '@/api/wms/baseWarehouse';
 
 import Crontab from '@/components/Crontab/index.vue';
 import CrontabResult from '@/components/Crontab/result.vue';
-import { getBaseMaterialTypeList } from '@/api/mes/baseMaterialType';
+import { getBaseMaterialTypeList } from '@/api/wms/baseMaterialType';
 
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
diff --git a/src/views/wms/wmsPurchaseOrderCopy/index.vue b/src/views/wms/wmsPurchaseOrderCopy/index.vue
index 2496cc1..4bdbea0 100644
--- a/src/views/wms/wmsPurchaseOrderCopy/index.vue
+++ b/src/views/wms/wmsPurchaseOrderCopy/index.vue
@@ -63,11 +63,11 @@
         <el-table-column type="selection" width="55"/>
         <el-table-column type="selection" width="55" align="center"/>
         <el-table-column label="订单编号" align="center" prop="poNo"/>
-        <el-table-column label="订单状态" align="center" prop="poStatus">
-          <template #default="scope">
-            <dict-tag :options="wms_po_status" :value="scope.row.poStatus"/>
-          </template>
-        </el-table-column>
+<!--        <el-table-column label="订单状态" align="center" prop="poStatus">-->
+<!--          <template #default="scope">-->
+<!--            <dict-tag :options="wms_po_status" :value="scope.row.poStatus"/>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column label="计划交货日期" align="center" prop="planDeliveryDate" width="180">
           <template #default="scope">
             <span>{{ parseTime(scope.row.planDeliveryDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -94,21 +94,21 @@
           <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column> -->
-        <el-table-column label="物料大类" align="center" prop="materialCategoryId">
+<!--        <el-table-column label="物料大类" align="center" prop="materialCategoryId">-->
 
-        </el-table-column>
-        <el-table-column label="审核人" align="center" prop="auditBy"/>
-        <el-table-column label="审核时间" align="center" prop="auditTime" width="180">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.auditTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="审核状态" align="center" prop="auditStatus">
-          <template #default="scope">
-            <dict-tag :options="wms_audit_status" :value="scope.row.auditStatus"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="审核意见" align="center" prop="auditComments"/>
+<!--        </el-table-column>-->
+<!--        <el-table-column label="审核人" align="center" prop="auditBy"/>-->
+<!--        <el-table-column label="审核时间" align="center" prop="auditTime" width="180">-->
+<!--          <template #default="scope">-->
+<!--            <span>{{ parseTime(scope.row.auditTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="审核状态" align="center" prop="auditStatus">-->
+<!--          <template #default="scope">-->
+<!--            <dict-tag :options="wms_audit_status" :value="scope.row.auditStatus"/>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="审核意见" align="center" prop="auditComments"/>-->
         <!-- <el-table-column label="入库方式" align="center" prop="inMethod">
           <template #default="scope">
             <dict-tag :options="wms_allocate_way" :value="scope.row.inMethod"/>
@@ -206,41 +206,41 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="订单类型" prop="poType">
-            <el-select v-model="dialogForm.poType" placeholder="请选择订单类型">
-              <el-option
-                v-for="dict in wms_po_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item label="订单类型" prop="poType">-->
+<!--            <el-select v-model="dialogForm.poType" placeholder="请选择订单类型">-->
+<!--              <el-option-->
+<!--                v-for="dict in wms_po_type"-->
+<!--                :key="dict.value"-->
+<!--                :label="dict.label"-->
+<!--                :value="dict.value"-->
+<!--              ></el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
           <!--        <el-form-item label="单据的ID，连表扩充" prop="erpId">
                     <el-input v-model="form.erpId" placeholder="请输入单据的ID，连表扩充" />
                   </el-form-item>-->
           <el-form-item label="备注" prop="remark">
             <el-input v-model="dialogForm.remark" placeholder="请输入备注"/>
           </el-form-item>
-          <el-form-item label="物料大类" prop="materialCategoryId">
-            <el-select v-model="dialogForm.materialCategoryId" placeholder="请选择物料大类" @change="setMaterialList">
-              <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="auditBy">
-            <el-select v-model="dialogForm.auditBy" placeholder="请选择审核人">
-              <el-option
-                v-for="item in userList"
-                :key="item.userId"
-                :label="item.userName"
-                :value="item.userName"
-              />
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item label="物料大类" prop="materialCategoryId">-->
+<!--            <el-select v-model="dialogForm.materialCategoryId" placeholder="请选择物料大类" @change="setMaterialList">-->
+<!--              <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="auditBy">-->
+<!--            <el-select v-model="dialogForm.auditBy" placeholder="请选择审核人">-->
+<!--              <el-option-->
+<!--                v-for="item in userList"-->
+<!--                :key="item.userId"-->
+<!--                :label="item.userName"-->
+<!--                :value="item.userName"-->
+<!--              />-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
         </el-form>
       </el-card>
       <el-card style="margin-top: 8px" shadow="never">
@@ -382,17 +382,17 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="订单类型" prop="poType">
-          <el-select v-model="parentTableInfoForm.poType" placeholder="请选择订单类型">
-            <el-option
-              v-for="dict in wms_po_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="物料大类" prop="materialCategoryId">
+<!--        <el-form-item label="订单类型" prop="poType">-->
+<!--          <el-select v-model="parentTableInfoForm.poType" placeholder="请选择订单类型">-->
+<!--            <el-option-->
+<!--              v-for="dict in wms_po_type"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="dict.value"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="物料大类" prop="materialCategoryId">
           <el-select v-model="parentTableInfoForm.materialCategoryId" placeholder="请选择物料大类">
             <el-option v-for="item in mategoryOptions"
                        :key="item.materialCategoryId"
@@ -400,17 +400,17 @@
                        :value="item.materialCategoryId"
             />
           </el-select>
-        </el-form-item>
-        <el-form-item label="审核人" prop="auditBy">
-          <el-select v-model="parentTableInfoForm.auditBy" placeholder="请选择审核人">
-            <el-option
-              v-for="item in userList"
-              :key="item.userId"
-              :label="item.userName"
-              :value="item.userName"
-            />
-          </el-select>
-        </el-form-item>
+        </el-form-item>-->
+<!--        <el-form-item label="审核人" prop="auditBy">-->
+<!--          <el-select v-model="parentTableInfoForm.auditBy" placeholder="请选择审核人">-->
+<!--            <el-option-->
+<!--              v-for="item in userList"-->
+<!--              :key="item.userId"-->
+<!--              :label="item.userName"-->
+<!--              :value="item.userName"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
       </el-form>
       <template #footer>
         <div class="dialog-footer">