From a72410f669128fbe4df3f10c54222308e784458a Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 20 Feb 2025 19:16:27 +0800
Subject: [PATCH] =?UTF-8?q?2/20=20=E4=BC=98=E5=8C=961.0=20=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=AD=A3=E5=9C=A8=E4=B8=8A=E8=B4=A7=E7=9A=84=E8=8D=89?=
 =?UTF-8?q?=E7=A8=BF=E5=8D=95=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/controller/inout/IoOrderController.java   | 2 +-
 .../java/com/glxp/api/req/inout/FilterOrderRequest.java    | 5 +++++
 .../java/com/glxp/api/service/inout/IoOrderService.java    | 2 +-
 .../glxp/api/service/inout/impl/IoOrderServiceImpl.java    | 7 ++++---
 src/main/resources/mybatis/mapper/inout/IoOrderDao.xml     | 3 +++
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
index 4233c4b76..4b0247a58 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
@@ -1384,7 +1384,7 @@ public class IoOrderController extends BaseController {
 
     @GetMapping("/udiwms/inout/order/getProcessingOrder")
     public BaseResponse getProcessingOrder(AddOrderRequest addOrderRequest) {
-        IoOrderResponse order = orderService.findByWorkPlaceCode(addOrderRequest.getWorkPlaceCode() + "", getUserId());
+        IoOrderResponse order = orderService.findByWorkPlaceCode(addOrderRequest.getWorkPlaceCode() + "",addOrderRequest.getWorkPlaceQueueCode(), getUserId());
         return ResultVOUtils.success(order);
     }
 
diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
index 4ed87caeb..5d1d57b10 100644
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
@@ -235,6 +235,11 @@ public class FilterOrderRequest extends ListPageRequest {
 
     private String keyWords;
 
+    /**
+     * 上货货位编码
+     */
+    private String workPlaceQueueCode;
+
 
 
 }
diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderService.java b/src/main/java/com/glxp/api/service/inout/IoOrderService.java
index 13e916479..feefd5406 100644
--- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java
@@ -161,7 +161,7 @@ public interface IoOrderService {
     IoOrderEntity findCorpOrderId(String billNo);
 
 
-    IoOrderResponse findByWorkPlaceCode(String workPlaceCode,Long UserId);
+    IoOrderResponse findByWorkPlaceCode(String workPlaceCode,String getWorkPlaceQueueCode,Long UserId);
 
     String selectAliYljgSearchbillByAliBillNo(String key);
 }
diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
index 7277a0866..39b14ca44 100644
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
@@ -1073,12 +1073,13 @@ public class IoOrderServiceImpl implements IoOrderService {
     }
 
     @Override
-    public IoOrderResponse findByWorkPlaceCode(String workPlaceCode,Long userId) {
+    public IoOrderResponse findByWorkPlaceCode(String workPlaceCode,String getWorkPlaceQueueCode,Long userId) {
         //根据用户和状态查找处理中的订单查询单据表
         FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
         filterOrderRequest.setWorkPlaceCode(workPlaceCode);
-        filterOrderRequest.setStatus(3);//处理中的订单
-        filterOrderRequest.setUpdateUser(userId + "");
+        filterOrderRequest.setStatus(1);//处理中的订单
+//        filterOrderRequest.setUpdateUser(userId + "");
+        filterOrderRequest.setWorkPlaceQueueCode(getWorkPlaceQueueCode);
         List<IoOrderResponse> ioOrderResponses = orderDao.filterList(filterOrderRequest);
 //        QueryWrapper<IoOrderEntity> ew = new QueryWrapper<>();
 //        ew.eq("workPlaceCode", workPlaceCode);
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index a6a660df7..d9e889a61 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -87,6 +87,9 @@
             <if test="workPlaceCode != null and workPlaceCode != ''">
                 AND io.workPlaceCode = #{workPlaceCode}
             </if>
+            <if test="workPlaceQueueCode != null and workPlaceQueueCode != ''">
+                AND io.workPlaceQueueCode = #{workPlaceQueueCode}
+            </if>
             <if test="invoiceEncode != null and invoiceEncode != ''">
                 AND ioi.invoiceEncode like concat('%', #{invoiceEncode}, '%')
             </if>