From 55845bded4b95a95bdc63a8f1a0d2d76465697fa Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 23 Mar 2026 09:58:07 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=86=BB=E7=BB=93=E6=A0=87=E8=AF=86=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=A7=B0=E4=B8=BA=20'frozen'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将库存相关的冻结标识字段从 'frozenFlag' 修改为 'frozen'，以提高代码一致性和可读性。涉及多个数据对象和请求/响应对象的更新。
---
 src/api/mes/wm/stocktaking/plan/index.ts             |  2 +-
 src/api/mes/wm/stocktaking/task/index.ts             |  2 +-
 .../mes/wm/stocktaking/plan/StockTakingPlanForm.vue  |  8 ++++----
 src/views/mes/wm/stocktaking/plan/index.vue          |  4 ++--
 .../mes/wm/stocktaking/task/StockTakingForm.vue      | 12 ++++++------
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/api/mes/wm/stocktaking/plan/index.ts b/src/api/mes/wm/stocktaking/plan/index.ts
index e4c9f8551..68d1021fe 100644
--- a/src/api/mes/wm/stocktaking/plan/index.ts
+++ b/src/api/mes/wm/stocktaking/plan/index.ts
@@ -8,7 +8,7 @@ export interface StockTakingPlanVO {
   startTime?: string
   endTime?: string
   blindFlag?: boolean
-  frozenFlag?: boolean
+  frozen?: boolean
   status?: number
   remark?: string
   createTime?: string
diff --git a/src/api/mes/wm/stocktaking/task/index.ts b/src/api/mes/wm/stocktaking/task/index.ts
index 24b5f6117..133b81538 100644
--- a/src/api/mes/wm/stocktaking/task/index.ts
+++ b/src/api/mes/wm/stocktaking/task/index.ts
@@ -12,7 +12,7 @@ export interface StockTakingTaskVO {
   planCode?: string
   planName?: string
   blindFlag?: boolean
-  frozenFlag?: boolean
+  frozen?: boolean
   startTime?: string
   endTime?: string
   status?: number
diff --git a/src/views/mes/wm/stocktaking/plan/StockTakingPlanForm.vue b/src/views/mes/wm/stocktaking/plan/StockTakingPlanForm.vue
index 1399a2616..a2dff4fd2 100644
--- a/src/views/mes/wm/stocktaking/plan/StockTakingPlanForm.vue
+++ b/src/views/mes/wm/stocktaking/plan/StockTakingPlanForm.vue
@@ -69,8 +69,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="冻结库存" prop="frozenFlag">
-            <el-switch v-model="formData.frozenFlag" :disabled="isDetail" />
+          <el-form-item label="冻结库存" prop="frozen">
+            <el-switch v-model="formData.frozen" :disabled="isDetail" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -135,7 +135,7 @@ const formData = ref<StockTakingPlanVO>({
   startTime: undefined,
   endTime: undefined,
   blindFlag: false,
-  frozenFlag: false,
+  frozen: false,
   remark: undefined
 })
 const formRules = reactive({
@@ -197,7 +197,7 @@ const resetForm = () => {
     startTime: undefined,
     endTime: undefined,
     blindFlag: false,
-    frozenFlag: false,
+    frozen: false,
     remark: undefined
   }
   formRef.value?.resetFields()
diff --git a/src/views/mes/wm/stocktaking/plan/index.vue b/src/views/mes/wm/stocktaking/plan/index.vue
index 649c6f68c..53c9794d4 100644
--- a/src/views/mes/wm/stocktaking/plan/index.vue
+++ b/src/views/mes/wm/stocktaking/plan/index.vue
@@ -98,9 +98,9 @@
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.blindFlag" />
         </template>
       </el-table-column>
-      <el-table-column label="是否冻结库存" align="center" prop="frozenFlag" width="110">
+      <el-table-column label="是否冻结库存" align="center" prop="frozen" width="110">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.frozenFlag" />
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.frozen" />
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status" width="120">
diff --git a/src/views/mes/wm/stocktaking/task/StockTakingForm.vue b/src/views/mes/wm/stocktaking/task/StockTakingForm.vue
index 19284b6d2..e050b8859 100644
--- a/src/views/mes/wm/stocktaking/task/StockTakingForm.vue
+++ b/src/views/mes/wm/stocktaking/task/StockTakingForm.vue
@@ -90,8 +90,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="是否冻结库存" prop="frozenFlag">
-            <el-switch v-model="formData.frozenFlag" :disabled="isDetail" />
+          <el-form-item label="是否冻结库存" prop="frozen">
+            <el-switch v-model="formData.frozen" :disabled="isDetail" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -186,7 +186,7 @@ const formData = ref<StockTakingTaskVO>({
   startTime: undefined,
   endTime: undefined,
   blindFlag: false,
-  frozenFlag: false,
+  frozen: false,
   remark: undefined
 })
 const formRules = reactive({
@@ -196,7 +196,7 @@ const formRules = reactive({
   type: [{ required: true, message: '盘点类型不能为空', trigger: 'change' }],
   takingDate: [{ required: true, message: '盘点日期不能为空', trigger: 'change' }],
   blindFlag: [{ required: true, message: '是否盲盘不能为空', trigger: 'change' }],
-  frozenFlag: [{ required: true, message: '是否冻结库存不能为空', trigger: 'change' }],
+  frozen: [{ required: true, message: '是否冻结库存不能为空', trigger: 'change' }],
   userId: [{ required: true, message: '盘点人不能为空', trigger: 'change' }]
 })
 const formRef = ref() // 表单 Ref
@@ -260,7 +260,7 @@ const resetForm = () => {
     startTime: undefined,
     endTime: undefined,
     blindFlag: false,
-    frozenFlag: false,
+    frozen: false,
     remark: undefined
   }
   formRef.value?.resetFields()
@@ -275,7 +275,7 @@ const handlePlanChange = (plan?: StockTakingPlanVO) => {
   formData.value.startTime = plan.startTime
   formData.value.endTime = plan.endTime
   formData.value.blindFlag = !!plan.blindFlag
-  formData.value.frozenFlag = !!plan.frozenFlag
+  formData.value.frozen = !!plan.frozen
 }
 
 /** 执行盘点 */