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 ioOrderResponses = orderDao.filterList(filterOrderRequest); // QueryWrapper 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 @@ AND io.workPlaceCode = #{workPlaceCode} + + AND io.workPlaceQueueCode = #{workPlaceQueueCode} + AND ioi.invoiceEncode like concat('%', #{invoiceEncode}, '%')