From 4852b4496a84e68a8f7344a14ddceea78590efc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Fri, 10 Jul 2026 16:30:49 +0800
Subject: [PATCH] =?UTF-8?q?pda=E4=BB=BB=E5=8A=A1=E6=8E=A5=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stockInOrder/StockInOrderApplicationService.java | 12 ++++++++++++
 .../facadeApi/stockInOrder/StockInOrderApi.java      |  9 +++++++++
 .../mapper/stockInOrder/StockInOrderMapper.xml       |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
index db327932a..d73789cfa 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
@@ -572,6 +572,18 @@ public class StockInOrderApplicationService {
         stockInOrderDomainService.omsOrderAdd(stockInOrder);
     }
 
+    public void acceptTask(StockInOrder stockInOrder){
+        Long workUserId = stockInOrder.getWorkUserId();
+        String workUserName = stockInOrder.getWorkUserName();
+        if (workUserId == null || workUserName == null) {
+            throw new ServiceException("作业人员id或名称为空!");
+        }
+        stockInOrderService.update(null, new LambdaUpdateWrapper<StockInOrder>()
+                .set(StockInOrder::getWorkUserId, workUserId)
+                .set(StockInOrder::getWorkUserName, workUserName)
+                .eq(StockInOrder::getInOrderId, stockInOrder.getInOrderId()));
+    }
+
     public void omsOrderAddDetail(List<InMaterialDetail> inMaterialDetails){
         stockInOrderDomainService.omsOrderAddDetail(inMaterialDetails);
     }
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java
index 2b7de4d42..3971d66cc 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java
@@ -172,6 +172,15 @@ public class StockInOrderApi extends BaseController {
         stockInOrderApplicationService.omsOrderAdd(stockInOrder);
     }
 
+    /**
+     * oms下发单保存
+     */
+    @ApiOperation("pda接收任务")
+    @PostMapping(value = "/acceptTask")
+    public void acceptTask(@RequestBody StockInOrder stockInOrder) {
+        stockInOrderApplicationService.acceptTask(stockInOrder);
+    }
+
     /**
      * oms下发单明细保存
      */
diff --git a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml
index d28c83d03..b981cb8d4 100644
--- a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml
@@ -589,7 +589,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND in_order_number = #{inOrderNumber}
     </select>
 
-    <select id="queryWarehouseUserId" resultMap="java.lang.String" resultType="java.lang.String">
+    <select id="queryWarehouseUserId" resultType="java.lang.String">
         SELECT WM_CONCAT(CORRELATION_ID) AS userIds
         FROM ASSOCIATION_WAREHOUSE
         WHERE warehouse_id = #{warehouseId} AND del_flag = 1 AND organization_id = #{organizationId} AND top_organization_id = #{topOrganizationId}