From 78e1def83a27723a579850d92db28f77892ed3b8 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Thu, 10 Oct 2024 15:18:04 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A7=91=E5=AE=A4=E5=BE=80=E6=9D=A5?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderDetailResultController.java | 27 ++++++++ .../api/dao/inout/IoOrderDetailResultDao.java | 2 + .../FilterOrderDetailDeptResultRequest.java | 2 + .../IoOrderDetailDeptResultResponse.java | 1 + .../inout/IoOrderDetailResultService.java | 2 + .../impl/IoOrderDetailResultServiceImpl.java | 11 ++++ .../mapper/inout/IoOrderDetailResultDao.xml | 61 +++++++++++++++++++ 7 files changed, 106 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index 29813c0d3..7ce964b6a 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -132,6 +132,18 @@ public class IoOrderDetailResultController extends BaseController { PageInfo pageInfo = new PageInfo<>(getOrderDeptResult(orderDetailResultRequest)); return ResultVOUtils.page(pageInfo); } + /** + * 查询单据仓库带票出入库明细 + * + * @param orderDetailResultRequest + * @return + */ + @AuthRuleAnnotation("") + @GetMapping("/udiwms/inout/resultDetail/filterOrderDeptSupList") + public BaseResponse filterOrderDeptSupList(FilterOrderDetailDeptResultRequest orderDetailResultRequest) { + PageInfo pageInfo = new PageInfo<>(getOrderDeptSupResult(orderDetailResultRequest)); + return ResultVOUtils.page(pageInfo); + } public List getOrderResult(FilterOrderDetailResultRequest orderDetailResultRequest) { @@ -187,6 +199,21 @@ public class IoOrderDetailResultController extends BaseController { return list; } + public List getOrderDeptSupResult(FilterOrderDetailDeptResultRequest orderDetailResultRequest) { + + FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); + filterOrderRequest.setVueType(orderDetailResultRequest.getActionType()); + List actions = orderService.setActions(filterOrderRequest); + if (CollUtil.isEmpty(actions)) { + return Collections.emptyList(); + } + orderDetailResultRequest.setActions(actions); + + List list = orderDetailResultService.getOrderDeptSupResult(orderDetailResultRequest); + + return list; + } + @GetMapping("/udiwms/inout/resultDetail/exportExcel") public void exportTemplate(FilterOrderDetailResultRequest orderDetailResultRequest, HttpServletResponse response) throws IOException { diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java index 4d34e5618..f65d9be92 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java @@ -48,4 +48,6 @@ public interface IoOrderDetailResultDao extends BaseMapperPlus exFilterOrderDetail(FilterOrderDetailResultRequest orderDetailResultRequest); List filterOrderDeptList(FilterOrderDetailDeptResultRequest orderDetailResultRequest); + + List filterOrderDeptSupList(FilterOrderDetailDeptResultRequest orderDetailResultRequest); } diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailDeptResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailDeptResultRequest.java index 8b36ed91d..2576dac73 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailDeptResultRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailDeptResultRequest.java @@ -40,4 +40,6 @@ public class FilterOrderDetailDeptResultRequest extends ListPageRequest { private Boolean groupBuy; //是否集采产品 + + private Integer hcType; } diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailDeptResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailDeptResultResponse.java index aaa2f1ecc..dca9d432a 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailDeptResultResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailDeptResultResponse.java @@ -24,6 +24,7 @@ public class IoOrderDetailDeptResultResponse { * 部门编码外键 */ private String fromInvName; + private String fromCorpName; private Integer count; private BigDecimal amount; diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java index c4d53ffb0..a561ac359 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java @@ -35,4 +35,6 @@ public interface IoOrderDetailResultService { List exFilterOrderDetail(FilterOrderDetailResultRequest orderDetailResultRequest); List getOrderDeptResult(FilterOrderDetailDeptResultRequest orderDetailResultRequest); + + List getOrderDeptSupResult(FilterOrderDetailDeptResultRequest orderDetailResultRequest); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java index 3274c98ae..5af36471b 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java @@ -106,4 +106,15 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic } return orderDetailResultDao.filterOrderDeptList(orderDetailResultRequest); } + + @Override + public List getOrderDeptSupResult(FilterOrderDetailDeptResultRequest orderDetailResultRequest) { + if (null == orderDetailResultRequest) { + return Collections.emptyList(); + } + if (null != orderDetailResultRequest.getPage() && null != orderDetailResultRequest.getLimit()) { + PageHelper.offsetPage((orderDetailResultRequest.getPage() - 1) * orderDetailResultRequest.getLimit(), orderDetailResultRequest.getLimit()); + } + return orderDetailResultDao.filterOrderDeptSupList(orderDetailResultRequest); + } } diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml index 0e689156a..609bae5d7 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml @@ -134,11 +134,15 @@ FROM auth_warehouse aw LEFT JOIN io_order a1 ON a1.fromInvCode = aw.CODE LEFT JOIN io_order_detail_result a2 ON a1.billNo = a2.orderIdFk + LEFT JOIN basic_udirel bu on bu.id = a2.bindRlFk a1.status = 7 AND a1.invCode = #{invCode} + + AND bu.hcType = #{hcType} + AND a1.mainAction = #{mainAction} @@ -168,6 +172,63 @@ group by a1.fromInvCode + +