UDI
/
udi-spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

内部码相关修改

Browse Source
master
anthonywj 2 years ago
parent 7dd919b693
commit 7687ae7d42
7 changed files with 111 additions and 150 deletions
Show Stats Download Patch File Download Diff File

41
src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java
Unescape Escape View File

@ -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<InvInnerOrderPrintEntity> list = invInnerOrderPrintService.filterOrderPrintList(filterinnerOrderprintRequest);
PageInfo<InvInnerOrderPrintEntity> pageInfo = new PageInfo<>(list);
PageSimpleResponse<InvInnerOrderPrintEntity> pageSimpleResponse = new PageSimpleResponse<>();
List<InnerOrderPrintResponse> list = invInnerOrderPrintService.filterJoinInnerPrint(filterinnerOrderprintRequest);
PageInfo<InnerOrderPrintResponse> pageInfo = new PageInfo<>(list);
PageSimpleResponse<InnerOrderPrintResponse> 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<innerOrderPrintRequest> printEntities = new ArrayList<>();
List<innerOrderPrintRequest> mStockPrintEntities = new ArrayList<>();
List<InnerOrderPrintResponse> printEntities = new ArrayList<>();
List<InnerOrderPrintResponse> mStockPrintEntities = new ArrayList<>();
FilterinnerOrderprintRequest filterinnerOrderprintRequest = new FilterinnerOrderprintRequest();
if (stockQRCodeTextPDFTemplateRequest.getOrderId() != null) {
filterinnerOrderprintRequest.setSOrderId(stockQRCodeTextPDFTemplateRequest.getOrderId());
} else {
filterinnerOrderprintRequest.setId(stockQRCodeTextPDFTemplateRequest.getQueryId());
}
List<innerOrderPrintRequest> stockPrintEntities = invInnerOrderPrintService.filterJoinInnerPrint(filterinnerOrderprintRequest);
List<InnerOrderPrintResponse> 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<List<innerOrderPrintRequest>> splits = CustomUtil.splitList(printEntities, 100);
List<List<InnerOrderPrintResponse>> splits = CustomUtil.splitList(printEntities, 100);
int index = 0;
List<InvInnerOrderPdfTempEntity> 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<PdfPrintCountEntity> countList, innerOrderPrintRequest innerOrderPrintRequest) {
public PdfPrintCountEntity getCount(List<PdfPrintCountEntity> countList, InnerOrderPrintResponse InnerOrderPrintResponse) {
for (PdfPrintCountEntity pdfPrintCount : countList) {
if (pdfPrintCount.getQueryId().equals(innerOrderPrintRequest.getId() + "")) {
if (pdfPrintCount.getQueryId().equals(InnerOrderPrintResponse.getId() + "")) {
return pdfPrintCount;
}
}

4
src/main/java/com/glxp/api/dao/inv/InvInnerOrderPrintDao.java
Unescape Escape View File

@ -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<InvInnerOrderPrintEnti
List<InvInnerOrderPrintEntity> filterOrderPrintList(FilterinnerOrderprintRequest filterinnerOrderprintRequest);
List<innerOrderPrintRequest> filterJoinInnerPrint(FilterinnerOrderprintRequest filterinnerOrderprintRequest);
List<InnerOrderPrintResponse> filterJoinInnerPrint(FilterinnerOrderprintRequest filterinnerOrderprintRequest);
}

2
src/main/java/com/glxp/api/res/inv/innerOrderPrintRequest.java → src/main/java/com/glxp/api/res/inv/InnerOrderPrintResponse.java
Unescape Escape View File

@ -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;

5
src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java
Unescape Escape View File

@ -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<innerOrderPrintRequest> filterJoinInnerPrint(FilterinnerOrderprintRequest filterinnerOrderprintRequest);
List<InnerOrderPrintResponse> filterJoinInnerPrint(FilterinnerOrderprintRequest filterinnerOrderprintRequest);
Boolean updateOrder(InvInnerOrderPrintEntity invInnerOrderPrintEntity);

4
src/main/java/com/glxp/api/service/inv/JaspaperService.java
Unescape Escape View File

@ -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<List<innerOrderPrintRequest>> splits, List<InvInnerOrderPdfTempEntity> stockPrintTempEntities, String resource) {
public void printPdfLocal(List<List<InnerOrderPrintResponse>> splits, List<InvInnerOrderPdfTempEntity> stockPrintTempEntities, String resource) {
ThreadUtil.execAsync(() -> {
for (int i = 0; i < stockPrintTempEntities.size(); i++) {

35
src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java
Unescape Escape View File

@ -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<innerOrderPrintRequest> filterJoinInnerPrint(FilterinnerOrderprintRequest filterinnerOrderprintRequest) {
public List<InnerOrderPrintResponse> filterJoinInnerPrint(FilterinnerOrderprintRequest filterinnerOrderprintRequest) {
if (filterinnerOrderprintRequest == null) {
return Collections.emptyList();
}
@ -142,7 +139,7 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
PageHelper.offsetPage(offset, filterinnerOrderprintRequest.getLimit());
}
List<innerOrderPrintRequest> data = invInnerOrderPrintDao.filterJoinInnerPrint(filterinnerOrderprintRequest);
List<InnerOrderPrintResponse> 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<innerOrderPrintRequest> printEntities = new ArrayList<>();
List<innerOrderPrintRequest> mStockPrintEntities = new ArrayList<>();
List<InnerOrderPrintResponse> printEntities = new ArrayList<>();
List<InnerOrderPrintResponse> 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<innerOrderPrintRequest> stockPrintEntities = invInnerOrderPrintService.filterJoinInnerPrint(filterStockprintRequest);
List<InnerOrderPrintResponse> 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<List<innerOrderPrintRequest>> splits = CustomUtil.splitList(printEntities, 100);
List<List<InnerOrderPrintResponse>> splits = CustomUtil.splitList(printEntities, 100);
int index = 0;
List<InvInnerOrderPdfTempEntity> 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<InvInnerOrderPdfTempEntity> pageInfo;
@ -237,9 +234,9 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
return pageSimpleResponse;
}
public PdfPrintCountEntity getCount(List<PdfPrintCountEntity> countList, innerOrderPrintRequest innerOrderPrintRequest) {
public PdfPrintCountEntity getCount(List<PdfPrintCountEntity> countList, InnerOrderPrintResponse InnerOrderPrintResponse) {
for (PdfPrintCountEntity pdfPrintCount : countList) {
if (pdfPrintCount.getQueryId().equals(innerOrderPrintRequest.getId() + "")) {
if (pdfPrintCount.getQueryId().equals(InnerOrderPrintResponse.getId() + "")) {
return pdfPrintCount;
}
}

76
src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml
Unescape Escape View File

@ -4,18 +4,18 @@
<resultMap id="BaseResultMap" type="com.glxp.api.entity.inv.InvInnerOrderPrintEntity">
<!--@mbg.generated-->
<!--@Table inv_inner_order_print-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="orderIdFk" jdbcType="VARCHAR" property="orderIdFk" />
<result column="udiCode" jdbcType="VARCHAR" property="udiCode" />
<result column="productId" jdbcType="VARCHAR" property="productId" />
<result column="productName" jdbcType="VARCHAR" property="productName" />
<result column="count" jdbcType="INTEGER" property="count" />
<result column="productDate" jdbcType="VARCHAR" property="productDate" />
<result column="batchNo" jdbcType="VARCHAR" property="batchNo" />
<result column="createUser" jdbcType="VARCHAR" property="createUser" />
<result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
<result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
<result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="orderIdFk" jdbcType="VARCHAR" property="orderIdFk"/>
<result column="udiCode" jdbcType="VARCHAR" property="udiCode"/>
<result column="productId" jdbcType="VARCHAR" property="productId"/>
<result column="productName" jdbcType="VARCHAR" property="productName"/>
<result column="count" jdbcType="INTEGER" property="count"/>
<result column="productDate" jdbcType="VARCHAR" property="productDate"/>
<result column="batchNo" jdbcType="VARCHAR" property="batchNo"/>
<result column="createUser" jdbcType="VARCHAR" property="createUser"/>
<result column="createTime" jdbcType="TIMESTAMP" property="createTime"/>
<result column="updateUser" jdbcType="VARCHAR" property="updateUser"/>
<result column="updateTime" jdbcType="TIMESTAMP" property="updateTime"/>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
@ -24,10 +24,10 @@
</sql>
<select id="filterOrderPrintList" parameterType="com.glxp.api.req.inv.FilterinnerOrderprintRequest"
resultType="com.glxp.api.entity.inv.InvInnerOrderPrintEntity">
SELECT * FROM inv_inner_order_print
SELECT *
FROM inv_inner_order_print
<where>
<if test="orderIdFk != '' and orderIdFk != null">
AND orderIdFk = #{orderIdFk}
@ -35,18 +35,13 @@
<if test="udiCode != '' and udiCode != null">
AND udiCode = #{udiCode}
</if>
</where>
</select>
<select id="filterJoinInnerPrint" parameterType="com.glxp.api.req.inv.FilterinnerOrderprintRequest"
resultType="com.glxp.api.res.inv.innerOrderPrintRequest">
SELECT
inv_inner_order_print.id,
resultType="com.glxp.api.res.inv.InnerOrderPrintResponse">
SELECT inv_inner_order_print.id,
inv_inner_order_print.udiCode,
basic_products.nameCode,
inv_inner_order_print.batchNo,
@ -57,37 +52,12 @@
basic_products.ylqxzcrbarmc,
basic_products.zczbhhzbapzbh,
basic_products.ggxh
FROM
inv_inner_order_print
FROM inv_inner_order_print
LEFT JOIN basic_udirel ON inv_inner_order_print.productId = basic_udirel.id
INNER JOIN basic_products ON basic_products.uuid = basic_udirel.uuid
<where>
<if test="nameCode != '' and nameCode != null">
AND inv_stockprint.nameCode = #{nameCode}
</if>
<if test="udiCode != '' and udiCode != null">
AND inv_stockprint.udiCode = #{udiCode}
</if>
<if test="printStatus != '' and printStatus != null">
AND printStatus = #{printStatus}
</if>
<if test="cpmctymc != '' and cpmctymc != null">
AND inv_stockprint.cpmctymc like concat('%',#{cpmctymc},'%')
</if>
<if test="thirdName != '' and thirdName != null">
AND inv_stockprint.thirdName like concat('%',#{thirdName},'%')
</if>
<if test="thirdId != '' and thirdId != null">
AND inv_stockprint.thirdId = #{thirdId}
</if>
<if test="thirdSysFk != '' and thirdSysFk != null">
AND inv_stockprint.thirdSysFk = #{thirdSysFk}
</if>
<if test="genKeyFk != '' and genKeyFk != null">
AND inv_stockprint.genKeyFk = #{genKeyFk}
</if>
<if test="sDetailId != '' and sDetailId != null">
AND inv_stockprint.sDetailId = #{sDetailId}
AND basic_products.nameCode = #{nameCode}
</if>
<if test="sOrderId != '' and sOrderId != null">
AND inv_inner_order_print.orderIdFk = #{sOrderId}
@ -95,11 +65,13 @@
<if test="id != '' and id != null">
AND inv_inner_order_print.id = #{id}
</if>
<if test="orderIdFk != '' and orderIdFk != null">
AND orderIdFk = #{orderIdFk}
</if>
<if test="udiCode != '' and udiCode != null">
AND udiCode = #{udiCode}
</if>
and diType = 1
</where>
</select>
</mapper>
Write Preview
Loading…
Cancel
Save