From c3bf1f33621a9525d312a33834a55e5f2ca2846b Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Thu, 21 Aug 2025 16:55:38 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E7=89=B9?=
 =?UTF-8?q?=E6=AE=8A=E6=A0=87=E8=AF=86=E5=AD=97=E6=AE=B5=EF=BC=8C=E7=89=B9?=
 =?UTF-8?q?=E6=AE=8A=E6=A0=87=E8=AF=86=E5=AD=97=E6=AE=B5=E7=94=A8=E4=BA=8E?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E8=B0=83=E6=8B=A8=E5=92=8C=E9=80=80=E5=BA=93?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在入库记录和出库记录中添加特殊标识字段，用于区分调拨和退库
- 优化仓库列表获取函数，传递 null 参数以获取完整列表
- 在 WMS 盘点任务中添加物料类型名称和仓库名称字段
---
 src/api/wms/instockRecord/types.ts       | 15 ++++++++++++
 src/api/wms/outstockRecord/types.ts      | 17 ++++++++++++++
 src/api/wms/wmsCheckTask/types.ts        | 30 ++++++++++++++++++++++++
 src/views/wms/instockOrderCopy/index.vue |  2 +-
 src/views/wms/instockRecord/index.vue    | 22 ++++++++++-------
 src/views/wms/outstockRecord/index.vue   | 12 ++++++++--
 6 files changed, 87 insertions(+), 11 deletions(-)

diff --git a/src/api/wms/instockRecord/types.ts b/src/api/wms/instockRecord/types.ts
index be457f7..5658e69 100644
--- a/src/api/wms/instockRecord/types.ts
+++ b/src/api/wms/instockRecord/types.ts
@@ -72,6 +72,11 @@ export interface InstockRecordVO {
    */
   updateTime: string;
 
+  /**
+   * 特殊标识（0调拨，1退库）
+   */
+  specialType: string | number;
+
 }
 
 export interface InstockRecordForm extends BaseEntity {
@@ -142,6 +147,11 @@ export interface InstockRecordForm extends BaseEntity {
    */
   erpSynchronousQty?: number;
 
+  /**
+   * 特殊标识（0调拨，1退库）
+   */
+  specialType?: string | number;
+
 }
 
 export interface InstockRecordQuery extends PageQuery {
@@ -198,6 +208,11 @@ export interface InstockRecordQuery extends PageQuery {
    */
   erpSynchronousQty?: number;
 
+  /**
+   * 特殊标识（0调拨，1退库）
+   */
+  specialType?: string | number;
+
     /**
      * 日期范围参数
      */
diff --git a/src/api/wms/outstockRecord/types.ts b/src/api/wms/outstockRecord/types.ts
index 1807bb4..aa29c28 100644
--- a/src/api/wms/outstockRecord/types.ts
+++ b/src/api/wms/outstockRecord/types.ts
@@ -62,6 +62,12 @@ export interface OutstockRecordVO {
    */
   erpSynchronousQty: number;
 
+
+  /**
+   * 特殊标识（0调拨，1退库）
+   */
+  specialType: string | number;
+
 }
 
 export interface OutstockRecordForm extends BaseEntity {
@@ -122,6 +128,12 @@ export interface OutstockRecordForm extends BaseEntity {
    */
   erpSynchronousQty?: number;
 
+
+  /**
+   * 特殊标识（0调拨，1退库）
+   */
+  specialType?: string | number;
+
 }
 
 export interface OutstockRecordQuery extends PageQuery {
@@ -148,6 +160,11 @@ export interface OutstockRecordQuery extends PageQuery {
    */
   erpSynchronousStatus?: string;
 
+  /**
+   * 特殊标识（0调拨，1退库）
+   */
+  specialType?: string | number;
+
     /**
      * 日期范围参数
      */
diff --git a/src/api/wms/wmsCheckTask/types.ts b/src/api/wms/wmsCheckTask/types.ts
index b8ffcfc..ca1fce6 100644
--- a/src/api/wms/wmsCheckTask/types.ts
+++ b/src/api/wms/wmsCheckTask/types.ts
@@ -59,6 +59,16 @@ export interface WmsCheckTaskVO {
    */
   executeMonth?: number;
 
+  /**
+   * 物料类型名称
+   */
+  matrialTypeName: string;
+
+  /**
+   * 仓库名称
+   */
+  warehouseName: string;
+
 }
 
 export interface WmsCheckTaskForm extends BaseEntity {
@@ -113,6 +123,16 @@ export interface WmsCheckTaskForm extends BaseEntity {
 
   executeMonth?: number;
 
+  /**
+   * 物料类型名称
+   */
+  matrialTypeName?: string;
+
+  /**
+   * 仓库名称
+   */
+  warehouseName?: string;
+
 }
 
 export interface WmsCheckTaskQuery extends PageQuery {
@@ -162,6 +182,16 @@ export interface WmsCheckTaskQuery extends PageQuery {
    */
   wmsCheckTaskFrequency?: string;
 
+  /**
+   * 物料类型名称
+   */
+  matrialTypeName?: string;
+
+  /**
+   * 仓库名称
+   */
+  warehouseName?: string;
+
     /**
      * 日期范围参数
      */
diff --git a/src/views/wms/instockOrderCopy/index.vue b/src/views/wms/instockOrderCopy/index.vue
index b3cf853..dfad3b9 100644
--- a/src/views/wms/instockOrderCopy/index.vue
+++ b/src/views/wms/instockOrderCopy/index.vue
@@ -696,7 +696,7 @@ const state = reactive({
 });
 
 // 获取仓库
-getBaseWarehouseList().then(e => {
+getBaseWarehouseList(null).then(e => {
   baseStoreList.value = e.data
 })
 
diff --git a/src/views/wms/instockRecord/index.vue b/src/views/wms/instockRecord/index.vue
index 440d731..aacb110 100644
--- a/src/views/wms/instockRecord/index.vue
+++ b/src/views/wms/instockRecord/index.vue
@@ -82,7 +82,6 @@
         <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[7].visible"/>
         <el-table-column label="入库数量" align="center" prop="instockQty" v-if="columns[8].visible"/>
         <el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[9].visible">
-
         </el-table-column>
         <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">
@@ -96,11 +95,16 @@
           </template>
         </el-table-column>
         <el-table-column label="erp同步数量" align="center" prop="erpSynchronousQty" v-if="columns[13].visible"/>
-        <el-table-column label="同步时间" align="center" prop="updateTime" width="180" v-if="columns[15].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" prop="specialType" v-if="columns[15].visible">
+          <template #default="scope">
+            <dict-tag :options="wms_special_type" :value="scope.row.specialType"/>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
@@ -185,7 +189,7 @@ import { InstockRecordVO, InstockRecordQuery, InstockRecordForm } from '@/api/wm
 import {getBaseWarehouseList} from "@/api/wms/baseWarehouse";
 import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { material_mategories, sys_common_status } = toRefs<any>(proxy?.useDict('material_mategories', 'sys_common_status'));
+const { material_mategories, sys_common_status, wms_special_type } = toRefs<any>(proxy?.useDict('material_mategories', 'sys_common_status', 'wms_special_type'));
 
 const instockRecordList = ref<InstockRecordVO[]>([]);
 const buttonLoading = ref(false);
@@ -221,10 +225,10 @@ const columns = ref<FieldOption[]>([
   { key: 11, label: `创建时间`, visible: true },
   { key: 12, label: `erp同步状态`, visible: true },
   { key: 13, label: `erp同步数量`, visible: true  },
-  { key: 14, label: `修改人`, visible: true },
-  { key: 15, label: `同步时间`, visible: true },
-  { key: 16, label: `创建部门`, visible: true },
-  { key: 17, label: `租户号`, visible: true },
+  // { key: 14, label: `修改人`, visible: true },
+  { key: 14, label: `同步时间`, visible: true },
+  // { key: 16, label: `创建部门`, visible: true },
+  // { key: 17, label: `租户号`, visible: true },
 ]);
 
 const initFormData: InstockRecordForm = {
@@ -239,6 +243,7 @@ const initFormData: InstockRecordForm = {
   materialCategoryName: undefined,//字段映射
   erpSynchronousStatus: undefined,
   erpSynchronousQty: undefined,
+  specialType: undefined,
 }
 const data = reactive<PageData<InstockRecordForm, InstockRecordQuery>>({
   form: {...initFormData},
@@ -251,9 +256,10 @@ const data = reactive<PageData<InstockRecordForm, InstockRecordQuery>>({
     materialCode: undefined,
     materialName: undefined,
     materialCategoryId: undefined,
-  materialCategoryName: undefined,//字段映射
+    materialCategoryName: undefined,//字段映射
     erpSynchronousStatus: undefined,
     erpSynchronousQty: undefined,
+    specialType: undefined,
     params: {
     }
   },
diff --git a/src/views/wms/outstockRecord/index.vue b/src/views/wms/outstockRecord/index.vue
index fadc4dc..aaa1b69 100644
--- a/src/views/wms/outstockRecord/index.vue
+++ b/src/views/wms/outstockRecord/index.vue
@@ -84,6 +84,11 @@
           </template>
         </el-table-column>
         <el-table-column label="erp同步数量" align="center" prop="erpSynchronousQty" v-if="columns[11].visible"/>
+        <el-table-column label="特殊标识" align="center" prop="specialType" v-if="columns[12].visible">
+          <template #default="scope">
+            <dict-tag :options="wms_special_type" :value="scope.row.specialType"/>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
@@ -187,7 +192,7 @@ import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory
 
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_common_status, wms_return_flag,  } = toRefs<any>(proxy?.useDict('sys_common_status'   ,'wms_return_flag'));
+const { sys_common_status, wms_return_flag, wms_special_type  } = toRefs<any>(proxy?.useDict('sys_common_status'   ,'wms_return_flag', 'wms_special_type'));
 
 const outstockRecordList = ref<OutstockRecordVO[]>([]);
 const buttonLoading = ref(false);
@@ -220,6 +225,7 @@ const columns = ref<FieldOption[]>([
         { key: 9, label: `提交时间`, visible: true },
         { key: 10, label: `erp同步状态`, visible: true },
         { key: 11, label: `erp同步数量`, visible: true },
+        { key: 12, label: `特殊标识`, visible: true },
         // { key: 12, label: `${comment}`, visible: true },
         // { key: 13, label: `${comment}`, visible: true },
         // { key: 14, label: `${comment}`, visible: true },
@@ -239,6 +245,7 @@ const initFormData: OutstockRecordForm = {
   createBy: undefined,
   erpSynchronousStatus: undefined,
   erpSynchronousQty: undefined,
+  specialType: undefined,
 }
 const data = reactive<PageData<OutstockRecordForm, OutstockRecordQuery>>({
   form: {...initFormData},
@@ -248,8 +255,9 @@ const data = reactive<PageData<OutstockRecordForm, OutstockRecordQuery>>({
     outstockCode: undefined,
     locationCode: undefined,
     materialCategoryId: undefined,
-  materialCategoryName: undefined,//字段映射
+    materialCategoryName: undefined,//字段映射
     erpSynchronousStatus: undefined,
+    specialType: undefined,
     params: {
     }
   },