From 0cf72dd9a6c02443f9539ef6533c2d4a6597cef7 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Fri, 15 Aug 2025 16:33:41 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E4=BC=98=E5=8C=96=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=EF=BC=8C=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=8D=E5=86=8D=E8=B0=83=E7=94=A8=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E5=92=8C=E5=AD=90=E8=A1=A8=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=80=8C=E6=98=AF=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=B0=86=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=AD=90=E8=A1=A8=E4=BD=9C=E4=B8=BA=E4=B8=BB?=
 =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5=E6=8F=92=E5=85=A5=EF=BC=8C=E6=9B=B4?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=96=B0=E5=A2=9E=E7=9A=84=E5=8D=B3=E5=85=A5?=
 =?UTF-8?q?=E5=8D=B3=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 为 baseMaterialInfo 表格添加质检要求和是否高价值物料字段
- 更新 instockOrderCopy 和 wmsPurchaseOrderCopy 中的物料选择逻辑
- 在 allocateOrder添加调拨原因字段
---
 src/api/wms/allocateOrder/types.ts           | 15 ++++++
 src/api/wms/baseMaterialInfo/types.ts        | 32 ++++++++++++
 src/api/wms/instockOrder/types.ts            |  7 +++
 src/views/wms/baseMaterialInfo/index.vue     | 55 ++++++++++++++++++--
 src/views/wms/instockOrderCopy/index.vue     | 49 +++++++++++------
 src/views/wms/wmsPurchaseOrderCopy/index.vue |  4 +-
 6 files changed, 141 insertions(+), 21 deletions(-)

diff --git a/src/api/wms/allocateOrder/types.ts b/src/api/wms/allocateOrder/types.ts
index 5356fa9..745f7dc 100644
--- a/src/api/wms/allocateOrder/types.ts
+++ b/src/api/wms/allocateOrder/types.ts
@@ -76,6 +76,11 @@ export interface AllocateOrderVO {
    */
   inMethod: string;
 
+  /**
+   * 调拨原因
+   */
+  allocateReason: string;
+
 }
 
 export interface AllocateOrderForm extends BaseEntity {
@@ -156,6 +161,11 @@ export interface AllocateOrderForm extends BaseEntity {
    */
   inMethod?: string;
 
+  /**
+   * 调拨原因
+   */
+  allocateReason?: string;
+
 }
 
 export interface AllocateOrderQuery extends PageQuery {
@@ -237,6 +247,11 @@ export interface AllocateOrderQuery extends PageQuery {
    */
   inMethod?: string;
 
+  /**
+   * 调拨原因
+   */
+  allocateReason?: string;
+
     /**
      * 日期范围参数
      */
diff --git a/src/api/wms/baseMaterialInfo/types.ts b/src/api/wms/baseMaterialInfo/types.ts
index 56a69cd..7c29d20 100644
--- a/src/api/wms/baseMaterialInfo/types.ts
+++ b/src/api/wms/baseMaterialInfo/types.ts
@@ -293,6 +293,17 @@ export interface BaseMaterialInfoVO {
    */
   materialCategoryName: string;
 
+
+  /**
+   * 质检要求(0必检,1免检)
+   */
+  inspectionRequest: string;
+
+  /**
+   * 是否高价值物料(0否,1是)
+   */
+  isHighValue: string;
+
 }
 
 export interface BaseMaterialInfoForm extends BaseEntity {
@@ -550,6 +561,16 @@ export interface BaseMaterialInfoForm extends BaseEntity {
    */
   materialCategoryName: string;
 
+  /**
+   * 质检要求(0必检,1免检)
+   */
+  inspectionRequest?: string;
+
+  /**
+   * 是否高价值物料(0否,1是)
+   */
+  isHighValue?: string;
+
 }
 
 export interface BaseMaterialInfoQuery extends PageQuery {
@@ -790,6 +811,17 @@ export interface BaseMaterialInfoQuery extends PageQuery {
    */
   saleType?: string;
 
+  /**
+   * 质检要求(0必检,1免检)
+   */
+  inspectionRequest?: string;
+
+  /**
+   * 是否高价值物料(0否,1是)
+   */
+  isHighValue?: string;
+
+
     /**
      * 日期范围参数
      */
diff --git a/src/api/wms/instockOrder/types.ts b/src/api/wms/instockOrder/types.ts
index 46c932c..a9dea86 100644
--- a/src/api/wms/instockOrder/types.ts
+++ b/src/api/wms/instockOrder/types.ts
@@ -1,3 +1,5 @@
+import { InstockDetailForm } from '@/api/wms/instockDetail/types';
+
 export interface InstockOrderVO {
   /**
    * 入库单 主键
@@ -116,6 +118,11 @@ export interface InstockOrderForm extends BaseEntity {
    */
     instockMethond?: string;
 
+  /**
+   * 入库单子表（与后端 WmsInstockOrderBo.detailListBo 对齐）
+   */
+  detailListBo?: InstockDetailForm[];
+
 }
 
 export interface InstockOrderQuery extends PageQuery {
diff --git a/src/views/wms/baseMaterialInfo/index.vue b/src/views/wms/baseMaterialInfo/index.vue
index 47262e7..e1743af 100644
--- a/src/views/wms/baseMaterialInfo/index.vue
+++ b/src/views/wms/baseMaterialInfo/index.vue
@@ -83,7 +83,16 @@
             <span>{{ formatDayHourMinutes(scope.row.maxParkingTime) }}</span>
           </template>
         </el-table-column>
-
+        <el-table-column label="质检要求" align="center" prop="inspectionRequest" v-if="columns[10].visible">
+          <template #default="scope">
+            <dict-tag :options="inspection_request" :value="scope.row.auditStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否高价值物料" align="center" prop="isHighValue" v-if="columns[9].visible">
+          <template #default="scope">
+            <dict-tag :options="is_high_value" :value="scope.row.isHighValue"/>
+          </template>
+        </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" v-if="columns[8].visible"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
@@ -198,6 +207,33 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <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"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <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"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
 
 
         <el-row :gutter="20">
@@ -229,7 +265,11 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { 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'));
+  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',
+  'is_high_value', 'inspection_request'
+));
 
 const baseMaterialInfoList = ref<BaseMaterialInfoVO[]>([]);
 const buttonLoading = ref(false);
@@ -266,8 +306,10 @@ const columns = ref<FieldOption[]>([
 
           { key: 5, label: `物料规格`, visible: true },
             { key: 6, label: `最小停放时间`, visible: false },
-            { key: 7, label: `最大停放时间`, visible: false },
+            { key: 7, label: `最大停放时间`, visible: true },
             { key: 8, label: `备注`, visible: false },
+            { key: 9, label: `"是否高价值`, visible: true },
+            { key: 10, label: `质检要求`, visible: true },
 ]);
 
 const initFormData: BaseMaterialInfoForm = {
@@ -329,6 +371,9 @@ const initFormData: BaseMaterialInfoForm = {
   maxParkingHours:0,
   maxParkingMinutes:0,
 
+  isHighValue: undefined,
+  inspectionRequest: undefined,
+
 }
 const data = reactive<PageData<BaseMaterialInfoForm, BaseMaterialInfoQuery>>({
   form: {...initFormData},
@@ -384,6 +429,10 @@ const data = reactive<PageData<BaseMaterialInfoForm, BaseMaterialInfoQuery>>({
     weightLowerLimit: undefined,
     innerTubeFlag: undefined,
     saleType: undefined,
+
+    isHighValue: undefined,
+    inspectionRequest: undefined,
+
     params: {
       approveDate: undefined,
     }
diff --git a/src/views/wms/instockOrderCopy/index.vue b/src/views/wms/instockOrderCopy/index.vue
index 0707085..33fe20a 100644
--- a/src/views/wms/instockOrderCopy/index.vue
+++ b/src/views/wms/instockOrderCopy/index.vue
@@ -6,7 +6,7 @@
           <el-input v-model="queryForm.instockCode" placeholder="输入调拨单号" clearable/>
         </el-form-item>
         <el-form-item label="工单类型" prop="instockType">
-          <el-select v-model="queryForm.instockType" placeholder="请选择工单类型(1采购订单,2生产订单,3手工,4系统生成)" clearable >
+          <el-select v-model="queryForm.instockType" placeholder="请选择工单类型" clearable >
             <el-option v-for="dict in wms_instock_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
           </el-select>
         </el-form-item>
@@ -426,7 +426,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="工单类型" prop="instockType">
-          <el-select v-model="parentTableInfoForm.instockType" placeholder="请选择工单类型(1采购订单,2生产订单,3手工,4系统生成)">
+          <el-select v-model="parentTableInfoForm.instockType" placeholder="请选择工单类型">
             <el-option
               v-for="dict in wms_instock_type"
               :key="dict.value"
@@ -448,7 +448,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="仓库ID" prop="warehouseId">
+        <el-form-item label="仓库" prop="warehouseId">
           <el-select v-model="parentTableInfoForm.warehouseCode" placeholder="请选择所属仓库" :disabled="true">
             <el-option
               v-for="item in baseStoreList"
@@ -577,7 +577,7 @@ import {ElMessage, ElMessageBox} from 'element-plus'
 import {getBaseWarehouseList} from "@/api/wms/baseWarehouse";
 import {UserVO} from "@/api/system/user/types";
 import {listUser} from "@/api/system/user";
-import { listInstockDetail, getInstockDetail, delInstockDetail, addInstockDetail, updateInstockDetail, getMaterialListVo } from '@/api/wms/instockDetail';
+import { listInstockDetail, getInstockDetail, delInstockDetail, updateInstockDetail, addInstockDetail } from '@/api/wms/instockDetail';
 import { InstockDetailVO, InstockDetailQuery, InstockDetailForm } from '@/api/wms/instockDetail/types';
 import {
   getMaterialList, getInstockMaterialList
@@ -887,18 +887,35 @@ const addDialogTableCell = () => {
 
 // 新增提交
 const dialogSubmit = () => {
+  // 将前端行映射为后端明细字段，并进行基本校验与过滤
+  const detailList = (dialogtable.value || [])
+    .map((item: any) => ({
+      materialId: item.materialId,
+      materialCode: item.materialCode,
+      materialName: item.materialName,
+      materialSpe: item.materialSpec, // 前端 materialSpec -> 后端 materialSpe
+      unitName: item.materialUnit,   // 前端 materialUnit -> 后端 unitName
+      instockQty: item.instockQty,
+      codeYesNo: item.codeYesNo || '0',
+      materialCategoryId: dialogForm.value.materialCategoryId
+    }))
+    .filter(d => d.materialId && d.materialCode && Number(d.instockQty) > 0);
 
-  addInstockOrder(dialogForm.value).then(e => {
-    addInstockDetail(dialogtable.value.map(item => {
-          return {...item, instockCode: e.data.instockCode,instockId: e.data.instockId, materialCategoryId: e.data.materialCategoryId}
-        }
-      )
-    ).then(v => {
-      dialogVisible.value = false
-      getParentTable()
-    })
+  if (!detailList.length) {
+    ElMessage.error('请添加至少一条入库明细且数量>0');
+    return;
+  }
 
-  })
+  const payload: InstockOrderForm = {
+    ...dialogForm.value,
+    detailListBo: detailList
+  };
+
+  addInstockOrder(payload).then(() => {
+    ElMessage.success('保存成功');
+    dialogVisible.value = false;
+    getParentTable();
+  });
 }
 /**
  * 入库单审批
@@ -1017,8 +1034,8 @@ const submitMaterialForm = () => {
         dialogtable.value[currentRowIndex.value].materialId = selectedMaterial.value.materialId;
         dialogtable.value[currentRowIndex.value].materialName = selectedMaterial.value.materialName;
         dialogtable.value[currentRowIndex.value].materialCode = selectedMaterial.value.materialCode;
-        dialogtable.value[currentRowIndex.value].materialUnit = selectedMaterial.value.materialUnit;
-        dialogtable.value[currentRowIndex.value].materialSpec = selectedMaterial.value.materialSpec;
+        dialogtable.value[currentRowIndex.value].unitName = selectedMaterial.value.materialUnit;
+        dialogtable.value[currentRowIndex.value].materialSpe = selectedMaterial.value.materialSpec;
         // 可以根据需要添加更多字段
       }
     }
diff --git a/src/views/wms/wmsPurchaseOrderCopy/index.vue b/src/views/wms/wmsPurchaseOrderCopy/index.vue
index b5b07de..2496cc1 100644
--- a/src/views/wms/wmsPurchaseOrderCopy/index.vue
+++ b/src/views/wms/wmsPurchaseOrderCopy/index.vue
@@ -853,8 +853,8 @@ const submitMaterialForm = () => {
         dialogtable.value[currentRowIndex.value].materialId = selectedMaterial.value.materialId;
         dialogtable.value[currentRowIndex.value].materialName = selectedMaterial.value.materialName;
         dialogtable.value[currentRowIndex.value].materialCode = selectedMaterial.value.materialCode;
-        dialogtable.value[currentRowIndex.value].materialUnit = selectedMaterial.value.materialUnit;
-        dialogtable.value[currentRowIndex.value].materialSpec = selectedMaterial.value.materialSpec;
+        dialogtable.value[currentRowIndex.value].unitName = selectedMaterial.value.materialUnit;
+        dialogtable.value[currentRowIndex.value].materialSpe = selectedMaterial.value.materialSpec;
         // 可以根据需要添加更多字段
       }
     }