From 01b71b73b62aba16d0e45d6a0df8368c41a27cb9 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 10 Feb 2026 10:41:51 +0800
Subject: [PATCH] =?UTF-8?q?2026-02-10=20=E5=B7=A5=E5=8D=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=B1=87=E6=80=BB=E3=80=90=E5=B7=A5=E5=8D=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=B1=87=E6=80=BB=E3=80=91=E3=80=90=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=9B=9E=E4=BC=A0=E3=80=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shopOrder/controller/WorkOrderAllocController.java |  3 ++-
 .../service/Impl/WorkOrderAllocServiceImpl.java        |  8 ++++----
 .../shopOrder/service/WorkOrderAllocService.java       |  2 +-
 .../mapper/shopOrder/WorkOrderAllocMapper.xml          | 10 +++++-----
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/shopOrder/controller/WorkOrderAllocController.java b/src/main/java/com/gaotao/modules/shopOrder/controller/WorkOrderAllocController.java
index 0442826..c653ff7 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/controller/WorkOrderAllocController.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/controller/WorkOrderAllocController.java
@@ -92,7 +92,7 @@ public class WorkOrderAllocController extends AbstractController {
      */
     @PostMapping("/executeSync")
     public R executeSync(@RequestBody WorkOrderSyncRequest request) {
-        ResponseData response = workOrderAllocService.executeWorkOrderSync(request.getSite(), request.getOrderList());
+        ResponseData response = workOrderAllocService.executeWorkOrderSync(request.getSite(), request.getUserName(), request.getOrderList());
         if (response.isSuccess()) {
             return R.ok(response.getMsg());
         } else {
@@ -116,6 +116,7 @@ public class WorkOrderAllocController extends AbstractController {
     @lombok.Data
     public static class WorkOrderSyncRequest {
         private String site;
+        private String userName;
         private List<OrderSiteItem> orderList;  // 包含orderNo和site的列表
     }
     
diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/WorkOrderAllocServiceImpl.java b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/WorkOrderAllocServiceImpl.java
index b52a8ab..8d1be01 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/WorkOrderAllocServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/WorkOrderAllocServiceImpl.java
@@ -94,10 +94,10 @@ public class WorkOrderAllocServiceImpl implements WorkOrderAllocService {
                 log.info("已插入{}条选中的工单到临时表", orderList.size());
             }
             
-            // 2. 调用存储过程，orderNo传空字符串
+            // 2. 调用存储过程，orderNo传*
             List<Object> params = new ArrayList<>();
             params.add(query.getSite() != null ? query.getSite() : "");
-            params.add("");  // orderNo传空字符串
+            params.add("*");  // orderNo传"*"表示存储过程内不再过滤订单号，直接使用临时表数据
             params.add(currentUser);
             
             List<Map<String, Object>> resultList = procedureDao.getProcedureData("UspInsertWorkOrderAlloc", params);
@@ -135,7 +135,7 @@ public class WorkOrderAllocServiceImpl implements WorkOrderAllocService {
     
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseData executeWorkOrderSync(String site, List<OrderSiteItem> orderList) {
+    public ResponseData executeWorkOrderSync(String site, String userName, List<OrderSiteItem> orderList) {
         ResponseData responseData = new ResponseData();
         try {
             log.info("开始执行工单数据回传");
@@ -156,7 +156,7 @@ public class WorkOrderAllocServiceImpl implements WorkOrderAllocService {
             } else {
                 // 没有选中行时，使用默认site查询
                 UspWorkOrderAllocData queryData = new UspWorkOrderAllocData();
-                queryData.setSite(site);
+                queryData.setCurrentUser(userName);
                 unSyncedList = workOrderAllocMapper.selectUnSyncedData(queryData);
             }
             
diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/WorkOrderAllocService.java b/src/main/java/com/gaotao/modules/shopOrder/service/WorkOrderAllocService.java
index 7bfb242..6756fb6 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/service/WorkOrderAllocService.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/service/WorkOrderAllocService.java
@@ -45,5 +45,5 @@ public interface WorkOrderAllocService {
      * @param orderList 工单列表（包含orderNo和site）
      * @return 执行结果
      */
-    ResponseData executeWorkOrderSync(String site, List<OrderSiteItem> orderList);
+    ResponseData executeWorkOrderSync(String site, String userName, List<OrderSiteItem> orderList);
 }
diff --git a/src/main/resources/mapper/shopOrder/WorkOrderAllocMapper.xml b/src/main/resources/mapper/shopOrder/WorkOrderAllocMapper.xml
index bf38e8e..a1ae7d8 100644
--- a/src/main/resources/mapper/shopOrder/WorkOrderAllocMapper.xml
+++ b/src/main/resources/mapper/shopOrder/WorkOrderAllocMapper.xml
@@ -187,11 +187,11 @@
             <if test="site != null and site != ''">
                 AND site = #{site}
             </if>
-            <if test="orderNoList != null and orderNoList.size() > 0">
-                AND orderNo IN
-                <foreach collection="orderNoList" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
+            <if test="site == null or site == ''">
+                AND site in (select site from AccessSite where userID = #{currentUser})
+            </if>
+            <if test="orderNo != null and orderNo != ''">
+                AND orderNo = #{orderNo}
             </if>
         </where>
         ORDER BY allocDate ASC