From 30deb1c465ac5dec6b67f1b0072626fda9536bc9 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 12 Mar 2025 10:18:03 +0800 Subject: [PATCH] =?UTF-8?q?3/12=20=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=20?= =?UTF-8?q?=E8=8D=89=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 +- src/main/java/com/glxp/api/req/inout/AddOrderRequest.java | 1 + src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java | 2 ++ src/main/java/com/glxp/api/service/inout/IoOrderService.java | 2 +- .../com/glxp/api/service/inout/impl/IoOrderServiceImpl.java | 5 ++++- src/main/resources/mybatis/mapper/inout/IoOrderDao.xml | 3 +++ 6 files changed, 12 insertions(+), 3 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 52e6b87ab..ba5eb7a2d 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -1344,7 +1344,7 @@ public class IoOrderController extends BaseController { @GetMapping("/udiwms/inout/order/getProcessingOrder") public BaseResponse getProcessingOrder(AddOrderRequest addOrderRequest) { - IoOrderResponse order = orderService.findByWorkPlaceCode(addOrderRequest.getWorkPlaceCode() + "", addOrderRequest.getWorkPlaceQueueCode(), getUserId()); + IoOrderResponse order = orderService.findByWorkPlaceCode(addOrderRequest.getWorkPlaceCode() + "", addOrderRequest.getWorkPlaceQueueCode(), getUserId(),addOrderRequest.getAction(),addOrderRequest.getFifoSplitTag()); return ResultVOUtils.success(order); } diff --git a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java index 4d7062b16..732cfe2f5 100644 --- a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java @@ -77,4 +77,5 @@ public class AddOrderRequest { private Integer scanActCount; + } 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 a5f58f7b9..b02389455 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java @@ -245,5 +245,7 @@ public class FilterOrderRequest extends ListPageRequest { */ private String workPlaceQueueCode; + private Integer fifoSplitTag; + } 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 c61b0c66c..7637c5c3e 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java @@ -151,7 +151,7 @@ public interface IoOrderService { IoOrderEntity findCorpOrderId(String billNo); - IoOrderResponse findByWorkPlaceCode(String workPlaceCode,String getWorkPlaceQueueCode,Long UserId); + IoOrderResponse findByWorkPlaceCode(String workPlaceCode,String getWorkPlaceQueueCode,Long UserId,String action,Integer fifoSplitTag); 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 94e101608..8c819b6f8 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 @@ -1040,12 +1040,15 @@ public class IoOrderServiceImpl implements IoOrderService { } @Override - public IoOrderResponse findByWorkPlaceCode(String workPlaceCode,String getWorkPlaceQueueCode,Long userId) { + public IoOrderResponse findByWorkPlaceCode(String workPlaceCode,String getWorkPlaceQueueCode,Long userId,String action,Integer fifoSplitTag) { //根据用户和状态查找处理中的订单查询单据表 FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); filterOrderRequest.setWorkPlaceCode(workPlaceCode); filterOrderRequest.setStatus(1);//处理中的订单 filterOrderRequest.setWorkPlaceQueueCode(getWorkPlaceQueueCode); + filterOrderRequest.setAction(action); + filterOrderRequest.setFifoSplitTag(fifoSplitTag); + List ioOrderResponses = orderDao.filterList(filterOrderRequest); if (ioOrderResponses.size() > 0){ IoOrderResponse ioOrderResponse = ioOrderResponses.get(0); diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index ad838e05e..8eb8480c8 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -63,6 +63,9 @@ AND io.productType = #{productType} + + AND io.fifoSplitTag = #{fifoSplitTag} + AND id = #{id}