From 4a3d11af1b15fcd484b4fbf332f2192c9492d29a Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Wed, 8 Jan 2025 17:39:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E4=B8=8A=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderDetailBizController.java | 21 ++++++++++ .../api/dao/inout/IoOrderDetailBizDao.java | 2 + .../inout/FilterOrderDetailBizRequest.java | 5 +++ .../res/inout/IoOrderDetailBizResponse.java | 1 + .../inout/IoOrderDetailBizService.java | 2 + .../impl/IoOrderDetailBizServiceImpl.java | 11 ++++++ .../mapper/inout/IoOrderDetailBizDao.xml | 39 +++++++++++++++++++ 7 files changed, 81 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index fcb5dbed1..db300a299 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -931,5 +931,26 @@ public class IoOrderDetailBizController extends BaseController { IoOrderEntity orderEntity = orderDetailBizService.addWarlockBagProduct(addWarlockBagProductReqeust); return ResultVOUtils.success(orderEntity); } + + + /** + * 获取上货记录 + * @param orderDetailBizRequest + * @param bindingResult + * @return + */ + @GetMapping("/udiwms/inout/bizDetail/orderOutRecordPage") + public BaseResponse orderOutRecordPage(FilterOrderDetailBizRequest orderDetailBizRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List ioOrderDetailBizResponses = orderDetailBizService.orderOutRecordPage(orderDetailBizRequest); + PageInfo pageInfo = new PageInfo<>(ioOrderDetailBizResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(ioOrderDetailBizResponses); + return ResultVOUtils.success(pageSimpleResponse); + } } diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java index 8b89b4f18..403713486 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java @@ -47,4 +47,6 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus orderOutRecordPage(FilterOrderDetailBizRequest orderDetailBizRequest); } diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java index 3938d528e..828b5db7c 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java @@ -32,6 +32,11 @@ public class FilterOrderDetailBizRequest extends ListPageRequest { */ private String productName; private String keyWords; + private String action; + private String nameCode; + private String cpmctymc; + private String ggxh; + private String workPlaceCode; private Long bizIdFk; } diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java index bfdbc3e71..46c004b02 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java @@ -197,5 +197,6 @@ public class IoOrderDetailBizResponse { * 最小包装单位 */ private String leastPackUnit; + private String updateTime; } diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java index d0ee98d5d..0035cee49 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java @@ -65,4 +65,6 @@ public interface IoOrderDetailBizService { IoOrderEntity addWarlockBagProduct(AddWarlockBagProductReqeust addWarlockBagProductReqeust); + + List orderOutRecordPage(FilterOrderDetailBizRequest orderDetailBizRequest); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index e4e5635b1..18ed3d592 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -362,6 +362,17 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { return orderEntity; } + @Override + public List orderOutRecordPage(FilterOrderDetailBizRequest orderDetailBizRequest) { + if (null == orderDetailBizRequest) { + return Collections.emptyList(); + } + if (null != orderDetailBizRequest.getPage() && null != orderDetailBizRequest.getLimit()) { + PageHelper.offsetPage((orderDetailBizRequest.getPage() - 1) * orderDetailBizRequest.getLimit(), orderDetailBizRequest.getLimit()); + } + return ioOrderDetailBizDao.orderOutRecordPage(orderDetailBizRequest); + } + @Override public IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk) { QueryWrapper ew = new QueryWrapper<>(); diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml index 9b0058032..f97fdf76d 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml @@ -181,4 +181,43 @@ group by io_order_detail_result.id + + + +