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 cf21d08b3..bf7733c7f 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -657,6 +657,19 @@ public class IoOrderDetailBizController extends BaseController { return ResultVOUtils.page(pageInfo); } + /** + * 直接查询单据业务详情列表 + * + * @param finishBizRequest + * @return + */ + @GetMapping("/udiwms/inout/finishbizDetail/filterList") + public BaseResponse finishBizDetail(FilterOrderDetailFinishBizRequest finishBizRequest) { + List orderDetailCodeEntities = orderDetailCodeService.finishBizDetail(finishBizRequest); + PageInfo pageInfo = new PageInfo<>(orderDetailCodeEntities); + return ResultVOUtils.page(pageInfo); + } + // @GetMapping("/udiwms/inout/bizDetail/filterListInv") // public BaseResponse filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest) { // List list = orderDetailBizService.getfilterList(orderDetailBizRequest); diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailFinishBizRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailFinishBizRequest.java new file mode 100644 index 000000000..410442b1b --- /dev/null +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailFinishBizRequest.java @@ -0,0 +1,20 @@ +package com.glxp.api.req.inout; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +/** + * 单据业务详情查询参数 + */ +@Data +public class FilterOrderDetailFinishBizRequest extends ListPageRequest { + + private String keyWords;//产品通用名/规格/批次号 + + private String billNo; + + private String action; + private String startTime; + private String endTime; + +} diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java index 7249d4fa9..ef6e2b6dc 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java @@ -2,6 +2,7 @@ package com.glxp.api.service.inout; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; +import com.glxp.api.req.inout.FilterOrderDetailFinishBizRequest; import com.glxp.api.res.inout.IoOrderDetailCodeResponse; import java.math.BigDecimal; @@ -57,4 +58,5 @@ public interface IoOrderDetailCodeService { Boolean updateOrderDetailBiz(IoOrderDetailCodeEntity orderDetailCodeEntity); + List finishBizDetail(FilterOrderDetailFinishBizRequest finishBizRequest); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java index 549582a70..af3576eff 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java @@ -1,7 +1,9 @@ package com.glxp.api.service.inout.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.glxp.api.dao.basic.UdiProductDao; import com.glxp.api.entity.basic.UdiProductEntity; +import com.glxp.api.req.inout.FilterOrderDetailFinishBizRequest; import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; @@ -23,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; +import java.time.LocalDate; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -157,4 +160,22 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService { return ioOrderDetailCodeDao.updateById(orderDetailCodeEntity) > 0; } + @Override + public List finishBizDetail(FilterOrderDetailFinishBizRequest finishBizRequest) { + + if (null == finishBizRequest) { + return Collections.emptyList(); + } + if (null != finishBizRequest.getPage() && null != finishBizRequest.getLimit()) { + PageHelper.offsetPage((finishBizRequest.getPage() - 1) * finishBizRequest.getLimit(), finishBizRequest.getLimit()); + } + LambdaQueryWrapper lw = new LambdaQueryWrapper<>(); + String keyWords = finishBizRequest.getKeyWords(); + lw.apply(StrUtil.isNotBlank(keyWords),"( coName LIKE concat('%', {0}, '%') or spec LIKE concat('%', {0}, '%') or batchNo LIKE concat('%', {0}, '%')) ",keyWords); + lw.like(StrUtil.isNotBlank(finishBizRequest.getBillNo()),IoOrderDetailCodeEntity::getOrderIdFk,finishBizRequest.getBillNo()); + + return ioOrderDetailCodeDao.selectList(lw); + + } + }