From 772e026aa5bb701a2dbf7da1af32e6231679aa4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Wed, 17 Dec 2025 11:41:41 +0800
Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E7=A7=BB=E9=99=A4=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=AD=97=E6=AE=B5=E5=B9=B6=E4=BC=98=E5=8C=96=E9=A2=86?=
 =?UTF-8?q?=E6=96=99=E7=A1=AE=E8=AE=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除交付计划中的绑定订单字段和接收导入中的类型、逻辑库区列
为导入数据添加默认类型和逻辑库区值
在领料操作前添加确认弹窗提示
---
 klp-ui/src/views/wms/coil/panels/do.vue          | 16 ++++++----------
 klp-ui/src/views/wms/delivery/plan/index.vue     |  4 ++--
 .../views/wms/receive/components/ImportGuide.vue |  8 ++++++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue
index 85e47487..09ff9b21 100644
--- a/klp-ui/src/views/wms/coil/panels/do.vue
+++ b/klp-ui/src/views/wms/coil/panels/do.vue
@@ -506,16 +506,12 @@ export default {
         remark: `PC端领料创建-${this.label}`
       }
 
-      addPendingAction(pendingData).then(response => {
-        if (response.code === 200) {
-          this.$message.success('领料成功，已创建待操作任务')
-          this.getPendingAction() // 刷新待操作列表
-        } else {
-          this.$message.error(response.msg || '领料失败')
-        }
-      }).catch(error => {
-        console.error('领料失败：', error)
-        this.$message.error('领料失败，请重试')
+      this.$modal.confirm(`是否确认从${row.warehouseName || '仓库'}领料${row.currentCoilNo || '物料'}？`).then(() => {
+        // 用户点击确认后执行的操作
+        return addPendingAction(pendingData)
+      }).then(response => {
+        this.$message.success('领料成功，已创建待操作任务')
+        this.getPendingAction() // 刷新待操作列表
       }).finally(() => {
         this.$set(row, 'picking', false)
       })
diff --git a/klp-ui/src/views/wms/delivery/plan/index.vue b/klp-ui/src/views/wms/delivery/plan/index.vue
index 5894247a..8dab44f0 100644
--- a/klp-ui/src/views/wms/delivery/plan/index.vue
+++ b/klp-ui/src/views/wms/delivery/plan/index.vue
@@ -126,9 +126,9 @@
             placeholder="请选择计划日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="绑定订单" prop="orderId">
+        <!-- <el-form-item label="绑定订单" prop="orderId">
           <el-input v-model="form.orderId" placeholder="请输入订单号" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
diff --git a/klp-ui/src/views/wms/receive/components/ImportGuide.vue b/klp-ui/src/views/wms/receive/components/ImportGuide.vue
index a9751c48..3031697f 100644
--- a/klp-ui/src/views/wms/receive/components/ImportGuide.vue
+++ b/klp-ui/src/views/wms/receive/components/ImportGuide.vue
@@ -166,8 +166,8 @@ const ErrorType = Object.freeze({
  * 表格列配置枚举
  */
 const TableColumnEnum = Object.freeze([
-  { prop: 'type', label: '类型', width: 80 },
-  { prop: 'logicWarehouse', label: '逻辑库区', width: 120 },
+  // { prop: 'type', label: '类型', width: 80 },
+  // { prop: 'logicWarehouse', label: '逻辑库区', width: 120 },
   { prop: 'inboundCoilNo', label: '入场卷号', width: 150 },
   { prop: 'factoryCoilNo', label: '厂家卷号', width: 150 },
   { prop: 'weight', label: '重量（吨）', width: 120 },
@@ -440,6 +440,10 @@ export default {
       // 增加行号
       rowObj.rowNum = rowNum;
 
+      // 模版中移除原料列和逻辑库区列，默认值为原料和酸连轧原料库
+      rowObj.type = '原料'
+      rowObj.logicWarehouse = '酸连轧原料库'
+
       return rowObj;
     },