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 7bf24527..b067b26b 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java @@ -1,13 +1,10 @@ package com.glxp.api.controller.inv; -import cn.hutool.core.thread.ThreadUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.dao.inv.InvInnerOrderPdfTempDao; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inv.InvInnerOrderPrintEntity; import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity; @@ -16,11 +13,8 @@ import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.req.inout.InspectionPDFTemplateRequest; import com.glxp.api.req.inv.*; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.inv.innerOrderPrintRequest; -import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.basic.UdiProductService; +import com.glxp.api.res.inv.InnerOrderPrintResponse; import com.glxp.api.service.inout.IoOrderService; -import com.glxp.api.service.inv.InnerOrderDetailService; import com.glxp.api.service.inv.InvInnerOrderPdfTempService; import com.glxp.api.service.inv.InvInnerOrderPrintService; import com.glxp.api.service.inv.JaspaperService; @@ -31,7 +25,6 @@ import com.glxp.api.util.FileUtils; import com.glxp.api.util.JasperUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; -import org.springframework.scheduling.annotation.Async; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -66,9 +59,9 @@ public class InvInnerOrderPrintController { @GetMapping("/udiwms/innerOrderPrint/filter") public BaseResponse filterList(FilterinnerOrderprintRequest filterinnerOrderprintRequest) { - List list = invInnerOrderPrintService.filterOrderPrintList(filterinnerOrderprintRequest); - PageInfo pageInfo = new PageInfo<>(list); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + List list = invInnerOrderPrintService.filterJoinInnerPrint(filterinnerOrderprintRequest); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(pageInfo.getList()); return ResultVOUtils.success(pageSimpleResponse); @@ -117,28 +110,28 @@ public class InvInnerOrderPrintController { SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId())); if (systemPDFTemplateEntity == null) return null; - List printEntities = new ArrayList<>(); - List mStockPrintEntities = new ArrayList<>(); + List printEntities = new ArrayList<>(); + List mStockPrintEntities = new ArrayList<>(); FilterinnerOrderprintRequest filterinnerOrderprintRequest = new FilterinnerOrderprintRequest(); if (stockQRCodeTextPDFTemplateRequest.getOrderId() != null) { filterinnerOrderprintRequest.setSOrderId(stockQRCodeTextPDFTemplateRequest.getOrderId()); } else { filterinnerOrderprintRequest.setId(stockQRCodeTextPDFTemplateRequest.getQueryId()); } - List stockPrintEntities = invInnerOrderPrintService.filterJoinInnerPrint(filterinnerOrderprintRequest); + List stockPrintEntities = invInnerOrderPrintService.filterJoinInnerPrint(filterinnerOrderprintRequest); if (stockPrintEntities != null && stockPrintEntities.size() > 0) { mStockPrintEntities.addAll(stockPrintEntities); } - for (innerOrderPrintRequest innerOrderPrintRequest : mStockPrintEntities) { - PdfPrintCountEntity pdfPrintCount = getCount(stockQRCodeTextPDFTemplateRequest.getCountList(), innerOrderPrintRequest); + for (InnerOrderPrintResponse InnerOrderPrintResponse : mStockPrintEntities) { + PdfPrintCountEntity pdfPrintCount = getCount(stockQRCodeTextPDFTemplateRequest.getCountList(), InnerOrderPrintResponse); if (pdfPrintCount != null && pdfPrintCount.getRowCount() > 0) { for (int i = 0; i < pdfPrintCount.getRowCount(); i++) { - innerOrderPrintRequest clone = new innerOrderPrintRequest(); - BeanUtils.copyProperties(innerOrderPrintRequest, clone); + InnerOrderPrintResponse clone = new InnerOrderPrintResponse(); + BeanUtils.copyProperties(InnerOrderPrintResponse, clone); printEntities.add(clone); } } else { - printEntities.add(innerOrderPrintRequest); + printEntities.add(InnerOrderPrintResponse); } } @@ -146,7 +139,7 @@ public class InvInnerOrderPrintController { if (!FileUtils.isFileExist(dirPath + "/pdfprint")) { new File(dirPath + "/pdfprint").mkdirs(); } - List> splits = CustomUtil.splitList(printEntities, 100); + List> splits = CustomUtil.splitList(printEntities, 100); int index = 0; List stockPrintTempEntities = new ArrayList<>(); for (int i = 0; i < splits.size(); i++) { @@ -185,10 +178,10 @@ public class InvInnerOrderPrintController { } - for (innerOrderPrintRequest innerOrderPrintRequest : mStockPrintEntities) { + for (InnerOrderPrintResponse InnerOrderPrintResponse : mStockPrintEntities) { InvInnerOrderPrintEntity innerOrderPrintEntity = new InvInnerOrderPrintEntity(); innerOrderPrintEntity.setStatus(1); - innerOrderPrintEntity.setId(innerOrderPrintRequest.getId()); + innerOrderPrintEntity.setId(InnerOrderPrintResponse.getId()); invInnerOrderPrintService.updateOrder(innerOrderPrintEntity); } IoOrderEntity ioOrderEntity=new IoOrderEntity(); @@ -198,9 +191,9 @@ public class InvInnerOrderPrintController { } - public PdfPrintCountEntity getCount(List countList, innerOrderPrintRequest innerOrderPrintRequest) { + public PdfPrintCountEntity getCount(List countList, InnerOrderPrintResponse InnerOrderPrintResponse) { for (PdfPrintCountEntity pdfPrintCount : countList) { - if (pdfPrintCount.getQueryId().equals(innerOrderPrintRequest.getId() + "")) { + if (pdfPrintCount.getQueryId().equals(InnerOrderPrintResponse.getId() + "")) { return pdfPrintCount; } } diff --git a/src/main/java/com/glxp/api/dao/inv/InvInnerOrderPrintDao.java b/src/main/java/com/glxp/api/dao/inv/InvInnerOrderPrintDao.java index 05358008..e4f31773 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvInnerOrderPrintDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvInnerOrderPrintDao.java @@ -3,7 +3,7 @@ package com.glxp.api.dao.inv; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.inv.InvInnerOrderPrintEntity; import com.glxp.api.req.inv.FilterinnerOrderprintRequest; -import com.glxp.api.res.inv.innerOrderPrintRequest; +import com.glxp.api.res.inv.InnerOrderPrintResponse; import java.util.List; @@ -11,5 +11,5 @@ public interface InvInnerOrderPrintDao extends BaseMapper filterOrderPrintList(FilterinnerOrderprintRequest filterinnerOrderprintRequest); - List filterJoinInnerPrint(FilterinnerOrderprintRequest filterinnerOrderprintRequest); -} \ No newline at end of file + List filterJoinInnerPrint(FilterinnerOrderprintRequest filterinnerOrderprintRequest); +} diff --git a/src/main/java/com/glxp/api/res/inv/innerOrderPrintRequest.java b/src/main/java/com/glxp/api/res/inv/InnerOrderPrintResponse.java similarity index 95% rename from src/main/java/com/glxp/api/res/inv/innerOrderPrintRequest.java rename to src/main/java/com/glxp/api/res/inv/InnerOrderPrintResponse.java index 1cda62c9..b3da9609 100644 --- a/src/main/java/com/glxp/api/res/inv/innerOrderPrintRequest.java +++ b/src/main/java/com/glxp/api/res/inv/InnerOrderPrintResponse.java @@ -5,7 +5,7 @@ import lombok.Data; import java.util.Date; @Data -public class innerOrderPrintRequest { +public class InnerOrderPrintResponse { private Integer id; private String udiRlIdFk; private String udiCode; diff --git a/src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java b/src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java index 46b7200c..a8bf10f2 100644 --- a/src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java +++ b/src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java @@ -1,11 +1,10 @@ package com.glxp.api.service.inv; import com.glxp.api.entity.inv.InvInnerOrderPrintEntity; -import com.glxp.api.req.inv.DeleteStPrintTempRequest; import com.glxp.api.req.inv.FilterinnerOrderprintRequest; import com.glxp.api.req.inv.InnerOrderQRCodeTextPDFTemplateRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.inv.innerOrderPrintRequest; +import com.glxp.api.res.inv.InnerOrderPrintResponse; import java.util.List; @@ -20,7 +19,7 @@ public interface InvInnerOrderPrintService { InvInnerOrderPrintEntity selectById(String id); - List filterJoinInnerPrint(FilterinnerOrderprintRequest filterinnerOrderprintRequest); + List filterJoinInnerPrint(FilterinnerOrderprintRequest filterinnerOrderprintRequest); Boolean updateOrder(InvInnerOrderPrintEntity invInnerOrderPrintEntity); diff --git a/src/main/java/com/glxp/api/service/inv/JaspaperService.java b/src/main/java/com/glxp/api/service/inv/JaspaperService.java index 6d0fbaa0..5298b22b 100644 --- a/src/main/java/com/glxp/api/service/inv/JaspaperService.java +++ b/src/main/java/com/glxp/api/service/inv/JaspaperService.java @@ -4,7 +4,7 @@ package com.glxp.api.service.inv; import cn.hutool.core.thread.ThreadUtil; import com.glxp.api.dao.inv.InvInnerOrderPdfTempDao; import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity; -import com.glxp.api.res.inv.innerOrderPrintRequest; +import com.glxp.api.res.inv.InnerOrderPrintResponse; import com.glxp.api.util.JasperUtils; import net.sf.jasperreports.engine.JRException; import org.springframework.beans.factory.annotation.Value; @@ -25,7 +25,7 @@ public class JaspaperService { private InvInnerOrderPdfTempDao innerOrderPdfTempDao; @Async - public void printPdfLocal(List> splits, List stockPrintTempEntities, String resource) { + public void printPdfLocal(List> splits, List stockPrintTempEntities, String resource) { ThreadUtil.execAsync(() -> { for (int i = 0; i < stockPrintTempEntities.size(); i++) { 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 61b2ad4c..3152c3cd 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 @@ -18,11 +18,9 @@ import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.inv.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; -import com.glxp.api.res.inv.InvCountOrderDetailResponse; -import com.glxp.api.res.inv.innerOrderPrintRequest; +import com.glxp.api.res.inv.InnerOrderPrintResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.basic.UdiProductService; -import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.inv.InnerOrderDetailService; @@ -35,7 +33,6 @@ import com.glxp.api.util.CustomUtil; import com.glxp.api.util.FileUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -133,7 +130,7 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService } @Override - public List filterJoinInnerPrint(FilterinnerOrderprintRequest filterinnerOrderprintRequest) { + public List filterJoinInnerPrint(FilterinnerOrderprintRequest filterinnerOrderprintRequest) { if (filterinnerOrderprintRequest == null) { return Collections.emptyList(); } @@ -142,7 +139,7 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService PageHelper.offsetPage(offset, filterinnerOrderprintRequest.getLimit()); } - List data = invInnerOrderPrintDao.filterJoinInnerPrint(filterinnerOrderprintRequest); + List data = invInnerOrderPrintDao.filterJoinInnerPrint(filterinnerOrderprintRequest); return data; } @@ -161,8 +158,8 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId())); if (systemPDFTemplateEntity == null) return null; - List printEntities = new ArrayList<>(); - List mStockPrintEntities = new ArrayList<>(); + List printEntities = new ArrayList<>(); + List mStockPrintEntities = new ArrayList<>(); FilterinnerOrderprintRequest filterStockprintRequest = new FilterinnerOrderprintRequest(); DeleteStPrintTempRequest deleteStPrintTempRequest = new DeleteStPrintTempRequest(); if (innerOrderQRCodeTextPDFTemplateRequest.getOrderId() != null) { @@ -175,27 +172,27 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService } innerOrderPdfTempService.delete(deleteStPrintTempRequest); - List stockPrintEntities = invInnerOrderPrintService.filterJoinInnerPrint(filterStockprintRequest); + List stockPrintEntities = invInnerOrderPrintService.filterJoinInnerPrint(filterStockprintRequest); if (stockPrintEntities != null && stockPrintEntities.size() > 0) { mStockPrintEntities.addAll(stockPrintEntities); } - for (innerOrderPrintRequest innerOrderPrintRequest : mStockPrintEntities) { - PdfPrintCountEntity pdfPrintCount = getCount(innerOrderQRCodeTextPDFTemplateRequest.getCountList(), innerOrderPrintRequest); + for (InnerOrderPrintResponse InnerOrderPrintResponse : mStockPrintEntities) { + PdfPrintCountEntity pdfPrintCount = getCount(innerOrderQRCodeTextPDFTemplateRequest.getCountList(), InnerOrderPrintResponse); if (pdfPrintCount != null && pdfPrintCount.getRowCount() > 0) { for (int i = 0; i < pdfPrintCount.getRowCount(); i++) { - innerOrderPrintRequest clone = new innerOrderPrintRequest(); - BeanUtils.copyProperties(innerOrderPrintRequest, clone); + InnerOrderPrintResponse clone = new InnerOrderPrintResponse(); + BeanUtils.copyProperties(InnerOrderPrintResponse, clone); printEntities.add(clone); } } else { - printEntities.add(innerOrderPrintRequest); + printEntities.add(InnerOrderPrintResponse); } } if (!FileUtils.isFileExist(dirPath + "/pdfprint")) { new File(dirPath + "/pdfprint").mkdirs(); } - List> splits = CustomUtil.splitList(printEntities, 100); + List> splits = CustomUtil.splitList(printEntities, 100); int index = 0; List stockPrintTempEntities = new ArrayList<>(); for (int i = 0; i < splits.size(); i++) { @@ -222,10 +219,10 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService innerOrderPdfTempService.insertStockPrintTempList(stockPrintTempEntities); - for (innerOrderPrintRequest innerOrderPrintRequest : mStockPrintEntities) { + for (InnerOrderPrintResponse InnerOrderPrintResponse : mStockPrintEntities) { InvInnerOrderPrintEntity innerOrderPrintEntity = new InvInnerOrderPrintEntity(); innerOrderPrintEntity.setStatus(ConstantStatus.PRINT_SUCCESS); - innerOrderPrintEntity.setId(innerOrderPrintRequest.getId()); + innerOrderPrintEntity.setId(InnerOrderPrintResponse.getId()); invInnerOrderPrintService.updateOrder(innerOrderPrintEntity); } PageInfo pageInfo; @@ -237,9 +234,9 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService return pageSimpleResponse; } - public PdfPrintCountEntity getCount(List countList, innerOrderPrintRequest innerOrderPrintRequest) { + public PdfPrintCountEntity getCount(List countList, InnerOrderPrintResponse InnerOrderPrintResponse) { for (PdfPrintCountEntity pdfPrintCount : countList) { - if (pdfPrintCount.getQueryId().equals(innerOrderPrintRequest.getId() + "")) { + if (pdfPrintCount.getQueryId().equals(InnerOrderPrintResponse.getId() + "")) { return pdfPrintCount; } } diff --git a/src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml b/src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml index d5773b9d..943eb479 100644 --- a/src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml @@ -1,105 +1,77 @@ - - - - - - - - - - - - - - - - - - - id, orderIdFk, udiCode, productId, productName, `count`, productDate, batchNo, `createUser`, - createTime, updateUser, updateTime - + + + + + + + + + + + + + + + + + + + id, orderIdFk, udiCode, productId, productName, `count`, productDate, batchNo, `createUser`, + createTime, updateUser, updateTime + + - - - - - - - \ No newline at end of file + +