diff --git a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java index daeb26356..0d69cdef4 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java @@ -223,6 +223,7 @@ public class BasicOrderPrintController { bizData.put("billdate", formatter.format(ioOrderResponse.getCreateTime())); bizData.put("remark1", sysPdfTemplateRelevanceCodeEntity.getRemark1() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark1()); bizData.put("remark2", sysPdfTemplateRelevanceCodeEntity.getRemark2() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark2()); + bizData.put("remark3", sysPdfTemplateRelevanceCodeEntity.getRemark3() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark3()); if (udiProductEntity != null) { bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms()); bizData.put("ybbm", udiProductEntity.getYbbm() == null ? ' ' : udiProductEntity.getYbbm()); 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 7ce964b6a..c0366e8e2 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; @@ -19,10 +20,7 @@ import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.inout.*; -import com.glxp.api.entity.system.CompanyEntity; -import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; -import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; -import com.glxp.api.entity.system.SystemPDFTemplateEntity; +import com.glxp.api.entity.system.*; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.req.dev.DeviceInfoDetailQuery; import com.glxp.api.req.inout.*; @@ -33,9 +31,7 @@ import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.*; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inout.impl.IoOrderInvoiceService; -import com.glxp.api.service.system.CompanyService; -import com.glxp.api.service.system.SystemPDFModuleService; -import com.glxp.api.service.system.SystemPDFTemplateService; +import com.glxp.api.service.system.*; import com.glxp.api.service.thrsys.ThrProductsService; import com.glxp.api.util.BeanCopyUtils; import com.glxp.api.util.JasperUtils; @@ -80,6 +76,8 @@ public class IoOrderDetailResultController extends BaseController { @Resource private SystemPDFTemplateService systemPDFTemplateService; @Resource + private SystemPDFTemplateRelevanceBizService systemPDFTemplateRelevanceBizService; + @Resource private SystemPDFModuleService systemPDFModuleService; @Value("${file_path}") private String filePath; @@ -462,6 +460,11 @@ public class IoOrderDetailResultController extends BaseController { public BaseResponse filterOrderPrintDept(@RequestBody FilterOrderDetailDeptResultRequest filterOrderDetailDeptResultRequest, HttpServletRequest request, HttpServletResponse response) throws JRException, IOException { List ioOrderDetailResultResponseList = new ArrayList<>(); SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterOrderDetailDeptResultRequest.getTemplateId()); + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + qw.eq(SysPdfTemplateRelevanceBizEntity::getTemplateId,systemPDFTemplateEntity.getId()); + qw.last("limit 1"); + SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity = systemPDFTemplateRelevanceBizService.getOne(qw); + //打印单号标签 Map data = new HashMap<>(1); List list = new ArrayList<>(); @@ -495,13 +498,88 @@ public class IoOrderDetailResultController extends BaseController { ioOrderDetailResultData.put("count", item.getCount()); ioOrderDetailResultData.put("fromInvCode", item.getFromInvCode() == null ? ' ' : item.getFromInvCode()); ioOrderDetailResultData.put("fromInvName", item.getFromInvName() == null ? ' ' : item.getFromInvName()); + ioOrderDetailResultData.put("fromCorpName", item.getFromCorpName() == null ? ' ' : item.getFromCorpName()); ioOrderDetailResultData.put("startAduditTime", filterOrderDetailDeptResultRequest.getStartAduditTime() == null ? ' ' : filterOrderDetailDeptResultRequest.getStartAduditTime()); ioOrderDetailResultData.put("endAduditTime", filterOrderDetailDeptResultRequest.getEndAduditTime() == null ? ' ' : filterOrderDetailDeptResultRequest.getEndAduditTime()); ioOrderDetailResultData.put("locInvName", filterOrderDetailDeptResultRequest.getLocInvName() == null ? ' ' : filterOrderDetailDeptResultRequest.getLocInvName()); ioOrderDetailResultData.put("employeeName", filterOrderDetailDeptResultRequest.getEmployeeName() == null ? ' ' : filterOrderDetailDeptResultRequest.getEmployeeName()); ioOrderDetailResultData.put("exportTime", dateStr); + ioOrderDetailResultData.put("remark1", sysPdfTemplateRelevanceBizEntity.getRemark1() == null ? ' ' : sysPdfTemplateRelevanceBizEntity.getRemark1()); + ioOrderDetailResultData.put("remark2", sysPdfTemplateRelevanceBizEntity.getRemark2() == null ? ' ' : sysPdfTemplateRelevanceBizEntity.getRemark2()); + ioOrderDetailResultData.put("remark3", sysPdfTemplateRelevanceBizEntity.getRemark3() == null ? ' ' : sysPdfTemplateRelevanceBizEntity.getRemark3()); + list.add(ioOrderDetailResultData); + i++; + } + + + data.put("data", list); + String param = JSON.toJSONString(data); + JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf"); + return ResultVOUtils.success(); + } + + + + /** + * 仓库出入库明细打印 + * + * @param filterOrderDetailDeptResultRequest + * @return + */ + @AuthRuleAnnotation("") + @PostMapping("/udiwms/inout/resultDetail/filterOrderPrintDeptSup") + public BaseResponse filterOrderPrintDeptSup(@RequestBody FilterOrderDetailDeptResultRequest filterOrderDetailDeptResultRequest, HttpServletRequest request, HttpServletResponse response) throws JRException, IOException { + List ioOrderDetailResultResponseList = new ArrayList<>(); + SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterOrderDetailDeptResultRequest.getTemplateId()); + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + qw.eq(SysPdfTemplateRelevanceBizEntity::getTemplateId,systemPDFTemplateEntity.getId()); + qw.last("limit 1"); + SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity = systemPDFTemplateRelevanceBizService.getOne(qw); + + //打印单号标签 + Map data = new HashMap<>(1); + List list = new ArrayList<>(); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String dateStr = sdf.format(new Date()); + + //按选入打印 + if (filterOrderDetailDeptResultRequest.getList() != null && filterOrderDetailDeptResultRequest.getList().size() > 0) { + ioOrderDetailResultResponseList = filterOrderDetailDeptResultRequest.getList(); + } else { + + //按查询打印 + FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); + filterOrderRequest.setVueType(filterOrderDetailDeptResultRequest.getActionType()); + List actions = orderService.setActions(filterOrderRequest); + if (CollUtil.isEmpty(actions)) { + return ResultVOUtils.success(""); + } + filterOrderDetailDeptResultRequest.setActions(actions); + + ioOrderDetailResultResponseList = orderDetailResultService.getOrderDeptSupResult(filterOrderDetailDeptResultRequest); + } + int i = 1; + for (IoOrderDetailDeptResultResponse item : ioOrderDetailResultResponseList) { + + //组装数据 + Map ioOrderDetailResultData = new HashMap<>(); + ioOrderDetailResultData.put("index", String.valueOf(i)); + ioOrderDetailResultData.put("amount", item.getAmount() == null ? null : item.getAmount()); + ioOrderDetailResultData.put("count", item.getCount()); + ioOrderDetailResultData.put("fromInvCode", item.getFromInvCode() == null ? ' ' : item.getFromInvCode()); + ioOrderDetailResultData.put("fromInvName", item.getFromInvName() == null ? ' ' : item.getFromInvName()); + ioOrderDetailResultData.put("fromCorpName", item.getFromCorpName() == null ? ' ' : item.getFromCorpName()); + ioOrderDetailResultData.put("startAduditTime", filterOrderDetailDeptResultRequest.getStartAduditTime() == null ? ' ' : filterOrderDetailDeptResultRequest.getStartAduditTime()); + ioOrderDetailResultData.put("endAduditTime", filterOrderDetailDeptResultRequest.getEndAduditTime() == null ? ' ' : filterOrderDetailDeptResultRequest.getEndAduditTime()); + ioOrderDetailResultData.put("locInvName", filterOrderDetailDeptResultRequest.getLocInvName() == null ? ' ' : filterOrderDetailDeptResultRequest.getLocInvName()); + ioOrderDetailResultData.put("employeeName", filterOrderDetailDeptResultRequest.getEmployeeName() == null ? ' ' : filterOrderDetailDeptResultRequest.getEmployeeName()); + ioOrderDetailResultData.put("exportTime", dateStr); + ioOrderDetailResultData.put("remark1", sysPdfTemplateRelevanceBizEntity.getRemark1() == null ? ' ' : sysPdfTemplateRelevanceBizEntity.getRemark1()); + ioOrderDetailResultData.put("remark2", sysPdfTemplateRelevanceBizEntity.getRemark2() == null ? ' ' : sysPdfTemplateRelevanceBizEntity.getRemark2()); + ioOrderDetailResultData.put("remark3", sysPdfTemplateRelevanceBizEntity.getRemark3() == null ? ' ' : sysPdfTemplateRelevanceBizEntity.getRemark3()); list.add(ioOrderDetailResultData); i++; } diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvSubWarehouseRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvSubWarehouseRequest.java index 2eaab8667..7bd3d0c94 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvSubWarehouseRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvSubWarehouseRequest.java @@ -23,4 +23,6 @@ public class FilterInvSubWarehouseRequest extends ListPageRequest { private Integer filterAdvanceType; private Boolean lyInvType; private Boolean sgInvType; + + private Boolean allFlagInvType; } diff --git a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml index 3fb534b85..6df84e660 100644 --- a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml @@ -288,6 +288,12 @@ left join auth_warehouse c on a.parentCode = c.code + + AND ( + a.lyInvType = 1 OR + a.sgInvType = 1 OR + a.spUse = 1 ) + AND a.id = #{id}