From 576d4d0a003b2efdb20b8c3a91bc7a9653818d17 Mon Sep 17 00:00:00 2001
From: Yxq <2290299376@qq.com>
Date: Fri, 26 Sep 2025 12:16:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E9=A6=88=E6=8E=A5=E5=8F=A3=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dev_wms_client/src/api/task.js                             | 6 ++++--
 dev_wms_client/src/layout/pda.vue                          | 7 ++++++-
 .../dto/request/ewm/SendWarehouseOutCompletedRequest.java  | 2 +-
 .../controller/serviceImpl/TaskControllerServiceImpl.java  | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/dev_wms_client/src/api/task.js b/dev_wms_client/src/api/task.js
index 39d0006..3f7f1d8 100644
--- a/dev_wms_client/src/api/task.js
+++ b/dev_wms_client/src/api/task.js
@@ -56,14 +56,16 @@ export const getPdaData = (params) => {
   })
 }
 
-export const confirmCurrentTask = (params) => {
+export const confirmCurrentTask = (params, config = {}) => {
   return request({
     url: '/task/confirmCurrentTask',
     method: 'post',
-    data: params
+    data: params,
+    ...config
   })
 }
 
+
 export const confirmCurrentTaskByPDA = (params) => {
   return request({
     url: '/task/confirmCurrentTaskByPDA',
diff --git a/dev_wms_client/src/layout/pda.vue b/dev_wms_client/src/layout/pda.vue
index c0a4dcf..db633e6 100644
--- a/dev_wms_client/src/layout/pda.vue
+++ b/dev_wms_client/src/layout/pda.vue
@@ -206,7 +206,7 @@ export default {
         // 显示全局加载动画
         this.showLoading = true;
 
-        confirmCurrentTask(request).then(res => {
+        confirmCurrentTask(request, { timeout: 10000 }).then(res => {
           const responseData = res.data;
           if (responseData.code === 0) {
             ElMessage({
@@ -243,6 +243,11 @@ export default {
       this.bindingData.planPickQty = '';
       this.bindingData.realRemainQty = '';
       this.bindingData.containerNo = '';
+
+      // 重置完成后聚焦到箱号输入框
+      this.$nextTick(() => {
+        this.$refs.sourceBoxInput.focus();
+      });
     },
 
     // 查询
diff --git a/dev_wms_serve/src/main/java/com/wms_main/model/dto/request/ewm/SendWarehouseOutCompletedRequest.java b/dev_wms_serve/src/main/java/com/wms_main/model/dto/request/ewm/SendWarehouseOutCompletedRequest.java
index 76b918a..8d47fa5 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/model/dto/request/ewm/SendWarehouseOutCompletedRequest.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/model/dto/request/ewm/SendWarehouseOutCompletedRequest.java
@@ -21,7 +21,7 @@ public class SendWarehouseOutCompletedRequest {
     /**
      * 拣料明细
      */
-    private List<PickingDetail> pickingDetailParams;
+    private List<PickingDetail> PickingDetail;
 
 
     @Data
diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskControllerServiceImpl.java b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskControllerServiceImpl.java
index 33c50a3..fd50732 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskControllerServiceImpl.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskControllerServiceImpl.java
@@ -1482,7 +1482,7 @@ public class TaskControllerServiceImpl implements ITaskControllerService {
             pickingDetail.setUnit(thisOut.getUnit());
             pickingDetail.setContainerNo(confirmTaskRequest.getTaskConfirm().getContainerNo());
             pickingDetails.add(pickingDetail);
-            request.setPickingDetailParams(pickingDetails);
+            request.setPickingDetail(pickingDetails);
             request.setWaveNo(thisOut.getWaveNo());
             request.setPickingType(thisOut.getPickingType());