From f4be9312c39457938c4c6f299fe82e014d607365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Fri, 13 Mar 2026 11:24:50 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E9=92=A2=E5=8D=B7=E4=BF=AE=E6=AD=A3):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=92=A2=E5=8D=B7=E7=B1=BB=E5=9E=8B=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=92=8C=E5=BC=BA=E5=88=B6=E5=85=A5=E5=BA=93=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在搜索栏新增钢卷类型下拉选择框，支持按不同类型筛选钢卷
- 为未入库钢卷添加强制入库按钮及处理逻辑
- 根据选择的钢卷类型动态调整查询参数
---
 klp-ui/src/views/wms/coil/do/correct.vue     | 49 +++++++++++++++++++-
 klp-ui/src/views/wms/coil/do/warehousing.vue | 10 ++--
 2 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/do/correct.vue b/klp-ui/src/views/wms/coil/do/correct.vue
index 3722fbcb..87c0daf7 100644
--- a/klp-ui/src/views/wms/coil/do/correct.vue
+++ b/klp-ui/src/views/wms/coil/do/correct.vue
@@ -15,6 +15,16 @@
 
           <!-- 搜索栏 -->
           <el-form :model="materialQueryParams" ref="materialQueryForm" size="small" :inline="true" class="query-form">
+            <el-form-item label="钢卷类型" prop="dataType">
+              <el-select v-model="coilType" placeholder="请选择钢卷类型">
+                <el-option label="全部" value="all" />
+                <el-option label="当前钢卷" value="now" />
+                <el-option label="历史钢卷" value="history" />
+                <el-option label="已发货钢卷" value="trans" />
+                <el-option label="未入库钢卷" value="unIn" />
+              </el-select>
+            </el-form-item>
+            
             <el-form-item label="入场钢卷号" prop="enterCoilNo">
               <el-input v-model="materialQueryParams.enterCoilNo" placeholder="请输入入场钢卷号" clearable
                 @keyup.enter.native="handleMaterialQuery" style="width: 150px;" />
@@ -206,9 +216,13 @@
                   style="position: absolute; bottom: 10px; right: 10px;" type="success" icon="el-icon-refresh"
                   size="mini" @click="handleRestoreMaterial(item)" :loading="item.cancelling"
                   class="action-btn">回滚</el-button>
+                <el-button v-if="item.dataType == 10 && item.status == 0"
+                  style="position: absolute; bottom: 10px; right: 10px;" type="success" icon="el-icon-refresh"
+                  size="mini" @click="handleForceInMaterial(item)" :loading="item.cancelling"
+                  class="action-btn">强制入库</el-button>
               </div>
 
-              <div class="card-footer" v-if="item.dataType != 10">
+              <div class="card-footer">
                 <el-button type="primary" icon="el-icon-check" size="mini" @click="handleCorrectMaterial(item)"
                   :loading="item.picking" class="action-btn">修正</el-button>
                 <el-button type="danger" icon="el-icon-delete" size="mini" @click="hanleDeleteMaterial(item)"
@@ -414,6 +428,7 @@ export default {
   },
   data() {
     return {
+      coilType: 'all',
       title: '钢卷信息修正',
       // 物料列表相关
       materialLoading: false,
@@ -731,9 +746,39 @@ export default {
         })
       })
     },
+    handleForceInMaterial(row) {
+      this.$modal.confirm('是否要强制入库改钢卷？').then(_ => {
+        const loading = this.$loading({
+          lock: true,
+          text: '处理中...',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        updateMaterialCoilSimple({
+          ...row,
+          dataType: 1,
+        }).then(_ => {
+          this.$modal.msgSuccess("强制入库成功");
+          this.getMaterialCoil();
+        }).finally(() => {
+          loading.close()
+        })
+      })
+    },
     getMaterialCoil() {
       this.materialLoading = true
-      listMaterialCoil(this.materialQueryParams).then(response => {
+      const payload = { ...this.materialQueryParams }
+      if (this.coilType == 'now') {
+        payload.dataType = 1;
+        payload.status = 0;
+      } else if (this.coilType == 'history') {
+        payload.dataType = 0;
+      } else if (this.coilType == 'trans') {
+        payload.status = 1;
+      } else if (this.coilType == 'unIn') {
+        payload.dataType = 10;
+      }
+      listMaterialCoil(payload).then(response => {
         this.materialCoilList = response.rows || []
         this.materialTotal = response.total || 0
         this.materialLoading = false
diff --git a/klp-ui/src/views/wms/coil/do/warehousing.vue b/klp-ui/src/views/wms/coil/do/warehousing.vue
index b5438c4d..a83590b4 100644
--- a/klp-ui/src/views/wms/coil/do/warehousing.vue
+++ b/klp-ui/src/views/wms/coil/do/warehousing.vue
@@ -747,11 +747,11 @@ export default {
         }
         delPendingAction(row.actionId).then(response => {
           this.$modal.msgSuccess("删除成功");
-          delCoilWarehouseOperationLogByCoilId({
-            coilId: row.coilId,
-            operationType: 1,
-            inOutType: 1
-          })
+          // delCoilWarehouseOperationLogByCoilId({
+          //  coilId: row.coilId,
+          //  operationType: 1,
+          //  inOutType: 1
+          // })
           this.getList();
         }).finally(() => {
           this.buttonLoading = false;