From 1e9cc53d4b869009bb405f6a1758d97339f4e87c Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Sat, 8 Feb 2025 17:39:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A7=91=E5=AE=A4=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inv/InvProductController.java | 24 ++++++++ .../api/dao/inout/IoOrderDetailResultDao.java | 4 ++ .../inout/FilterOrderDetailResultRequest.java | 1 + .../inv/FilterInvProductDetailRequest.java | 1 + .../inout/IoOrderDetailResultService.java | 4 ++ .../impl/IoOrderDetailResultServiceImpl.java | 13 ++++ .../mapper/inout/IoOrderDetailResultDao.xml | 60 +++++++++++++++++++ 7 files changed, 107 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/inv/InvProductController.java b/src/main/java/com/glxp/api/controller/inv/InvProductController.java index 96469d0f8..badfdf801 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvProductController.java @@ -1,6 +1,7 @@ package com.glxp.api.controller.inv; import com.glxp.api.entity.auth.InvWarehouseEntity; +import com.glxp.api.service.inout.IoOrderDetailResultService; import com.glxp.api.service.inv.impl.InvProductService; import com.glxp.api.service.inv.impl.InvProductServiceNew; import com.glxp.api.vo.basic.InvProductNewVo; @@ -62,6 +63,8 @@ public class InvProductController extends BaseController { InvWarehouseService invWarehouseService; @Resource private IBasicBussinessTypeService basicBussinessTypeService; + @Resource + private IoOrderDetailResultService ioOrderDetailResultService; /** * 库存列表查询接口 @@ -201,6 +204,27 @@ public class InvProductController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } + + /** + * 查询库存详情 + * + * @param filterInvProductDetailRequest + * @return + */ + @GetMapping("/spms/inv/product/filterDetailOut") + public BaseResponse filterInvProductDetailOut(FilterInvProductDetailRequest filterInvProductDetailRequest) { + if (!"".equals(filterInvProductDetailRequest.getOrderBy())) { + filterInvProductDetailRequest.setOrderBy("updateTime"); + } + List invProductDetailEntities = ioOrderDetailResultService.filterInvProductDetailOutList(filterInvProductDetailRequest); + PageInfo pageInfo = new PageInfo<>(invProductDetailEntities); + + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(invProductDetailEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + /** * 删除库存 * 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 ef222ee6b..b64d9ba3c 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java @@ -4,9 +4,11 @@ import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inout.IoOrderDetailResultEntity; import com.glxp.api.req.inout.CptTraceRequest; import com.glxp.api.req.inout.FilterOrderDetailResultRequest; +import com.glxp.api.req.inv.FilterInvProductDetailRequest; import com.glxp.api.res.inout.CptTraceOrderResponse; import com.glxp.api.res.inout.IoExOrderDetailResultResponse; import com.glxp.api.res.inout.IoOrderDetailResultResponse; +import com.glxp.api.res.inv.InvProductDetailResponse; import com.glxp.api.res.inv.IoOrderDetailStatRsponse; import io.lettuce.core.dynamic.annotation.Param; @@ -46,4 +48,6 @@ public interface IoOrderDetailResultDao extends BaseMapperPlus exFilterOrderDetail(FilterOrderDetailResultRequest orderDetailResultRequest); + + List filterInvProductDetailOutList(FilterInvProductDetailRequest filterInvProductDetailRequest); } diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java index b86974772..8c8806f3f 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java @@ -57,6 +57,7 @@ public class FilterOrderDetailResultRequest extends ListPageRequest { private String action; private String mainAction; private Integer inoutPrintStatus; + private Integer hcType; private String invName; private String employeeName; private String fromInvName; diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvProductDetailRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvProductDetailRequest.java index 453ba399b..02fa8fb9f 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterInvProductDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterInvProductDetailRequest.java @@ -94,4 +94,5 @@ public class FilterInvProductDetailRequest extends ListPageRequest { private String startTime; private String endTime; + private String hcType; } 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 d6d825428..dad073e75 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java @@ -4,14 +4,18 @@ import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.entity.inout.IoOrderDetailResultEntity; import com.glxp.api.req.inout.CptTraceRequest; import com.glxp.api.req.inout.FilterOrderDetailResultRequest; +import com.glxp.api.req.inv.FilterInvProductDetailRequest; import com.glxp.api.res.inout.CptTraceOrderResponse; import com.glxp.api.res.inout.IoExOrderDetailResultResponse; import com.glxp.api.res.inout.IoOrderDetailResultResponse; +import com.glxp.api.res.inv.InvProductDetailResponse; import java.util.List; public interface IoOrderDetailResultService { + List filterInvProductDetailOutList(FilterInvProductDetailRequest filterInvProductDetailRequest); + List findByOrderId(String orderId); 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 cd7e7b812..e893c49af 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 @@ -8,9 +8,11 @@ import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.entity.inout.IoOrderDetailResultEntity; import com.glxp.api.req.inout.CptTraceRequest; import com.glxp.api.req.inout.FilterOrderDetailResultRequest; +import com.glxp.api.req.inv.FilterInvProductDetailRequest; import com.glxp.api.res.inout.CptTraceOrderResponse; import com.glxp.api.res.inout.IoExOrderDetailResultResponse; import com.glxp.api.res.inout.IoOrderDetailResultResponse; +import com.glxp.api.res.inv.InvProductDetailResponse; import com.glxp.api.service.inout.IoOrderDetailResultService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -26,6 +28,17 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic @Resource IoOrderDetailResultDao orderDetailResultDao; + @Override + public List filterInvProductDetailOutList(FilterInvProductDetailRequest filterInvProductDetailRequest) { + if (null == filterInvProductDetailRequest) { + return Collections.emptyList(); + } + if (null != filterInvProductDetailRequest.getPage() && null != filterInvProductDetailRequest.getLimit()) { + PageHelper.offsetPage((filterInvProductDetailRequest.getPage() - 1) * filterInvProductDetailRequest.getLimit(), filterInvProductDetailRequest.getLimit()); + } + return orderDetailResultDao.filterInvProductDetailOutList(filterInvProductDetailRequest); + } + @Override public List findByOrderId(String orderId) { return orderDetailResultDao.selectList(new QueryWrapper().eq("orderIdFk", orderId)); diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml index dfc088a1e..61c234702 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml @@ -146,6 +146,8 @@ a2.spec, a2.measname, a2.bindRlFk, + a2.nameCode, + a1.invCode, SUM( CASE WHEN a1.mainAction = 'WareHouseOut' THEN @@ -159,9 +161,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 a2.bindRlFk = bu.id a1.status = 7 and a2.bindRlFk is not null + + + AND bu.hcType = #{hcType} + + AND a1.invCode = #{invCode} @@ -192,6 +200,58 @@ group by a2.bindRlFk + +