From f5257700943c5de27d1ab171e5e447c7da7a1672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com>
Date: Tue, 16 Jun 2026 11:52:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms/coil):=20=E8=B0=83=E6=95=B4=E9=85=B8?=
 =?UTF-8?q?=E6=B4=97=E8=BD=A7=E5=88=B6=E5=8A=A8=E4=BD=9C=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=8C=BA=E9=97=B4=E8=8C=83=E5=9B=B4=E5=B9=B6=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=BE=85=E5=8A=9E=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 将acidRollingActionType判断区间从200-299修正为200-210
2. 注释掉stepSplit.vue中调用completeAction完成待办的代码逻辑
---
 klp-ui/src/api/wms/materialWarning.js          |  9 +++++++++
 klp-ui/src/views/wms/coil/panels/do.vue        |  2 +-
 klp-ui/src/views/wms/coil/panels/stepSplit.vue | 12 ++++++------
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/klp-ui/src/api/wms/materialWarning.js b/klp-ui/src/api/wms/materialWarning.js
index d19def3d..920fc0f7 100644
--- a/klp-ui/src/api/wms/materialWarning.js
+++ b/klp-ui/src/api/wms/materialWarning.js
@@ -35,6 +35,15 @@ export function updateMaterialWarning(data) {
   })
 }
 
+// 批量处理钢卷通用维度告警（长度/厚度/宽度）
+export function batchHandleMaterial(data) {
+  return request({
+    url: '/wms/materialWarning/batchHandle',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除钢卷通用维度告警（长度/厚度/宽度）
 export function delMaterialWarning(warningId) {
   return request({
diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue
index 47bdaff1..0ddc5e4a 100644
--- a/klp-ui/src/views/wms/coil/panels/do.vue
+++ b/klp-ui/src/views/wms/coil/panels/do.vue
@@ -665,7 +665,7 @@ export default {
         lockValue = 3
       } else if (this.acidRollingActionType == 120) {
         lockValue = 4
-      } else if (this.acidRollingActionType >= 200 && this.acidRollingActionType <= 299) {
+      } else if (this.acidRollingActionType >= 200 && this.acidRollingActionType <= 210) {
         lockValue = 5
       }
 
diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
index 1bfcb71b..683e9027 100644
--- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue
+++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
@@ -379,7 +379,7 @@
 <script>
 import { getMaterialCoil, listMaterialCoil, createSpecialChild, completeSpecialSplit, updateMaterialCoilSimple, delMaterialCoil, getFirstHeatCoilMaterial } from '@/api/wms/coil'
 import { listCoilAbnormal } from '@/api/wms/coilAbnormal'
-import { completeAction, getPendingAction, updatePendingAction } from '@/api/wms/pendingAction'
+import { getPendingAction, updatePendingAction } from '@/api/wms/pendingAction'
 import { saveCoilCache, getCoilCacheByCoilId, delCoilCache } from '@/api/wms/coilCache'
 import { getGalvanize1TypingPrefill } from '@/api/pocket/acidTyping'
 import ProductSelect from '@/components/KLPService/ProductSelect'
@@ -939,11 +939,11 @@ export default {
           }
 
           // 2. 完成待办动作（根据业务逻辑调整）
-          const actionRes = await completeAction(this.actionId, splitRes.data.childCoilIds.join(','))
-          if (actionRes.code !== 200) {
-            this.$message.error('完成待办动作失败：' + actionRes.msg)
-            return
-          }
+          // const actionRes = await completeAction(this.actionId, splitRes.data.childCoilIds.join(','))
+          // if (actionRes.code !== 200) {
+          //   this.$message.error('完成待办动作失败：' + actionRes.msg)
+          //   return
+          // }
           this.buttonLoading = false
 
           this.$message.success('分条操作已完成')