From a76168595065dd8290194781874eb82154ab9e3b Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 28 Nov 2024 10:30:45 +0800 Subject: [PATCH] =?UTF-8?q?11/28=20=E5=86=85=E9=83=A8=E7=A0=81=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inv/InvInnerOrderPrintController.java | 13 +++++++++++++ .../api/dao/inv/InvInnerOrderPdfTempDao.java | 6 +++++- .../api/req/inv/FilterStPrintTempRequest.java | 18 ++++++++++++++++++ .../inv/InvInnerOrderPdfTempService.java | 2 ++ .../impl/InvInnerOrderPdfTempServiceImpl.java | 16 ++++++++++++++++ .../impl/InvInnerOrderPrintServiceImpl.java | 13 +++++++++++++ .../mapper/inv/InvInnerOrderPdfTempDao.xml | 14 +++++++++++++- 7 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/glxp/api/req/inv/FilterStPrintTempRequest.java diff --git a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java index 9b3941591..ed5d5b023 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java @@ -350,4 +350,17 @@ public class InvInnerOrderPrintController { return ResultVOUtils.success(pageSimpleResponse); } + + @AuthRuleAnnotation("") + @GetMapping("/udiwms/invInnerOrderPdfTemp/filter") + public BaseResponse filterTemp(FilterStPrintTempRequest filterStPrintTempRequest){ + List invInnerOrderPdfTempEntities = innerOrderPdfTempService.filterList(filterStPrintTempRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(invInnerOrderPdfTempEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(invInnerOrderPdfTempEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + } diff --git a/src/main/java/com/glxp/api/dao/inv/InvInnerOrderPdfTempDao.java b/src/main/java/com/glxp/api/dao/inv/InvInnerOrderPdfTempDao.java index 4bdf793f4..beb0f591c 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvInnerOrderPdfTempDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvInnerOrderPdfTempDao.java @@ -2,6 +2,10 @@ package com.glxp.api.dao.inv; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity; +import com.glxp.api.req.inv.FilterStPrintTempRequest; + +import java.util.List; public interface InvInnerOrderPdfTempDao extends BaseMapper { -} \ No newline at end of file + List filterList(FilterStPrintTempRequest filterStPrintTempRequest); +} diff --git a/src/main/java/com/glxp/api/req/inv/FilterStPrintTempRequest.java b/src/main/java/com/glxp/api/req/inv/FilterStPrintTempRequest.java new file mode 100644 index 000000000..620f327dc --- /dev/null +++ b/src/main/java/com/glxp/api/req/inv/FilterStPrintTempRequest.java @@ -0,0 +1,18 @@ +package com.glxp.api.req.inv; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +/** + * @author : zhuzhu + * @date : 2024/11/28 9:31 + * @modyified By : + */ + +@Data +public class FilterStPrintTempRequest extends ListPageRequest { + private String printCodeIdFk; + private String stockOrderFk; + private Integer id; + private String genKey; +} diff --git a/src/main/java/com/glxp/api/service/inv/InvInnerOrderPdfTempService.java b/src/main/java/com/glxp/api/service/inv/InvInnerOrderPdfTempService.java index 7ff09351c..d92c4e757 100644 --- a/src/main/java/com/glxp/api/service/inv/InvInnerOrderPdfTempService.java +++ b/src/main/java/com/glxp/api/service/inv/InvInnerOrderPdfTempService.java @@ -2,6 +2,7 @@ package com.glxp.api.service.inv; import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity; import com.glxp.api.req.inv.DeleteStPrintTempRequest; +import com.glxp.api.req.inv.FilterStPrintTempRequest; import java.util.List; @@ -16,4 +17,5 @@ public interface InvInnerOrderPdfTempService { boolean delete(DeleteStPrintTempRequest deleteStPrintTempRequest); + List filterList(FilterStPrintTempRequest filterStPrintTempRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPdfTempServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPdfTempServiceImpl.java index e1b428e6f..64f293bb3 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPdfTempServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPdfTempServiceImpl.java @@ -3,15 +3,19 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.thread.ThreadUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inv.InvInnerOrderPdfTempDao; +import com.glxp.api.entity.inv.InnerOrderEntity; import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity; import com.glxp.api.req.inv.DeleteStPrintTempRequest; +import com.glxp.api.req.inv.FilterStPrintTempRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.inv.InvInnerOrderPdfTempService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Collections; import java.util.List; @Service @@ -68,4 +72,16 @@ public class InvInnerOrderPdfTempServiceImpl implements InvInnerOrderPdfTempServ innerOrderPdfTempDao.delete(ew); return true; } + + @Override + public List filterList(FilterStPrintTempRequest filterStPrintTempRequest) { + if (filterStPrintTempRequest == null) { + return Collections.emptyList(); + } + if (filterStPrintTempRequest.getPage() != null) { + int offset = (filterStPrintTempRequest.getPage() - 1) * filterStPrintTempRequest.getLimit(); + PageHelper.offsetPage(offset, filterStPrintTempRequest.getLimit()); + } + return innerOrderPdfTempDao.filterList(filterStPrintTempRequest); + } } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java index 8be7fd759..cb43900d2 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.inv.impl; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.schema.ValidateResult; import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.util.udi.UdiCalCountUtil; @@ -241,6 +242,18 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService innerOrderPrintEntity.setId(InnerOrderPrintResponse.getId()); invInnerOrderPrintService.updateOrder(innerOrderPrintEntity); } + + FilterStPrintTempRequest filterStPrintTempRequest = new FilterStPrintTempRequest(); + filterStPrintTempRequest.setPage(1); + filterStPrintTempRequest.setLimit(10); + if (StrUtil.isNotEmpty(innerOrderQRCodeTextPDFTemplateRequest.getOrderId())){ + filterStPrintTempRequest.setStockOrderFk(innerOrderQRCodeTextPDFTemplateRequest.getOrderId()); + stockPrintTempEntities = innerOrderPdfTempService.filterList(filterStPrintTempRequest); + } + if (StrUtil.isNotEmpty(innerOrderQRCodeTextPDFTemplateRequest.getQueryId())){ + filterStPrintTempRequest.setPrintCodeIdFk(innerOrderQRCodeTextPDFTemplateRequest.getQueryId()); + stockPrintTempEntities = innerOrderPdfTempService.filterList(filterStPrintTempRequest); + } PageInfo pageInfo; pageInfo = new PageInfo<>(stockPrintTempEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/src/main/resources/mybatis/mapper/inv/InvInnerOrderPdfTempDao.xml b/src/main/resources/mybatis/mapper/inv/InvInnerOrderPdfTempDao.xml index 5768bfb6c..462f423f2 100644 --- a/src/main/resources/mybatis/mapper/inv/InvInnerOrderPdfTempDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvInnerOrderPdfTempDao.xml @@ -16,4 +16,16 @@ id, genkey, fileName, filePath, `status`, printCodeIdFk, stockOrderFk - \ No newline at end of file + +