From 9594bf6a73a6c50f58c482412b4cecc0e2038c30 Mon Sep 17 00:00:00 2001
From: 86156 <823267011@qq.com>
Date: Tue, 11 Nov 2025 10:01:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E7=BA=A7=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 klp-ui/src/views/wms/coil/actflow.vue           | 16 ++++++++++++++--
 .../impl/WmsCoilPendingActionServiceImpl.java   | 17 +++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/actflow.vue b/klp-ui/src/views/wms/coil/actflow.vue
index fe3d7506..a3ff917c 100644
--- a/klp-ui/src/views/wms/coil/actflow.vue
+++ b/klp-ui/src/views/wms/coil/actflow.vue
@@ -72,7 +72,9 @@
 
       <el-table-column label="操作类型" align="center" prop="actionType" width="100">
         <template slot-scope="scope">
-        <dict-tag :options="dict.type.action_type" :value="scope.row.actionType"/>
+          <span v-if="scope.row.actionType === 4 || scope.row.actionType === '4'">发货操作</span>
+          <span v-else-if="scope.row.actionType === 5 || scope.row.actionType === '5'">移库操作</span>
+          <dict-tag v-else :options="dict.type.action_type" :value="scope.row.actionType"/>
         </template>
       </el-table-column>
 
@@ -396,6 +398,16 @@ export default {
       console.log('操作类型:', row.actionType);
       console.log('钢卷ID:', row.coilId);
 
+      // 特殊处理：发货和移库操作不需要跳转
+      if (row.actionType === 4 || row.actionType === '4') {
+        this.$message.info('发货操作已在移动端完成');
+        return;
+      }
+      if (row.actionType === 5 || row.actionType === '5') {
+        this.$message.info('移库操作已在移动端完成');
+        return;
+      }
+
       // 根据操作类型跳转到不同页面
       let path = '';
       // 注意：action_type字典中 1=合卷, 2=分卷, 3=更新
@@ -405,7 +417,7 @@ export default {
       } else if (row.actionType === 2 || row.actionType === '2') {
         // 分卷
         path = '/wms/split';
-      } else {
+      } else if (row.actionType === 3 || row.actionType === '3') {
         // 更新
         path = '/wms/typing';
       }
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java
index 46f01194..3a448ac4 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java
@@ -159,10 +159,27 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
      */
     @Override
     public Boolean completeAction(Long actionId) {
+        // 先查询原记录，检查操作人是否为空
+        WmsCoilPendingAction oldAction = baseMapper.selectById(actionId);
+        if (oldAction == null) {
+            throw new RuntimeException("待操作记录不存在");
+        }
+        
         WmsCoilPendingAction action = new WmsCoilPendingAction();
         action.setActionId(actionId);
         action.setActionStatus(2); // 已完成
         action.setCompleteTime(new Date());
+        
+        // 如果操作人为空，设置当前登录用户为操作人
+        if (oldAction.getOperatorId() == null || oldAction.getOperatorName() == null) {
+            try {
+                action.setOperatorId(LoginHelper.getUserId());
+                action.setOperatorName(LoginHelper.getUsername());
+            } catch (Exception e) {
+                // 如果获取登录用户失败，不影响主流程
+            }
+        }
+        
         return baseMapper.updateById(action) > 0;
     }