|
@@ -3,56 +3,12 @@ package com.abi.qms.platform.service.impl;
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import com.abi.base.foundation.util.RedisClient;
|
|
|
-import com.abi.qms.platform.dao.entity.BaseFactory;
|
|
|
-import com.abi.qms.platform.dao.entity.BaseMaterial;
|
|
|
-import com.abi.qms.platform.dao.entity.QrBoxCodeFormat;
|
|
|
-import com.abi.qms.platform.dao.entity.QrBoxMapping;
|
|
|
-import com.abi.qms.platform.dao.entity.QrPackage;
|
|
|
-import com.abi.qms.platform.dao.entity.QrPackageBatch;
|
|
|
-import com.abi.qms.platform.dao.entity.QrPackageBookingOrder;
|
|
|
-import com.abi.qms.platform.dao.entity.QrPackageDownloadRecord;
|
|
|
-import com.abi.qms.platform.dao.entity.QrPackageSapOrderItem;
|
|
|
-import com.abi.qms.platform.dao.entity.QrRepertoryColumn;
|
|
|
-import com.abi.qms.platform.dao.entity.UserInfo;
|
|
|
-import com.abi.qms.platform.dao.enums.CodePackageOrderTypeEnum;
|
|
|
-import com.abi.qms.platform.dao.enums.FactoryTypeEnum;
|
|
|
-import com.abi.qms.platform.dao.enums.FirstFactoryEnum;
|
|
|
-import com.abi.qms.platform.dao.enums.InvalidEnum;
|
|
|
-import com.abi.qms.platform.dao.enums.MaterialTypeEnum;
|
|
|
-import com.abi.qms.platform.dao.enums.QrPackageApplyStatusEnum;
|
|
|
-import com.abi.qms.platform.dao.enums.QrPackageGenerateStatusEnum;
|
|
|
-import com.abi.qms.platform.dao.enums.QrTypeEnum;
|
|
|
-import com.abi.qms.platform.dao.enums.TrueFalseEnum;
|
|
|
-import com.abi.qms.platform.dao.mapper.BaseActiveMapper;
|
|
|
-import com.abi.qms.platform.dao.mapper.BaseBrandMapper;
|
|
|
-import com.abi.qms.platform.dao.mapper.BaseFactoryMapper;
|
|
|
-import com.abi.qms.platform.dao.mapper.BaseMaterialMapper;
|
|
|
-import com.abi.qms.platform.dao.mapper.QrBoxCodeFormatMapper;
|
|
|
-import com.abi.qms.platform.dao.mapper.QrBoxMappingMapper;
|
|
|
-import com.abi.qms.platform.dao.mapper.QrPackageBatchMapper;
|
|
|
-import com.abi.qms.platform.dao.mapper.QrPackageDownloadRecordMapper;
|
|
|
-import com.abi.qms.platform.dao.mapper.QrPackageMapper;
|
|
|
-import com.abi.qms.platform.dao.mapper.QrPackageSapOrderItemMapper;
|
|
|
-import com.abi.qms.platform.dao.mapper.QrRepertoryColumnMapper;
|
|
|
+import com.abi.qms.platform.dao.entity.*;
|
|
|
+import com.abi.qms.platform.dao.enums.*;
|
|
|
+import com.abi.qms.platform.dao.mapper.*;
|
|
|
import com.abi.qms.platform.dao.tablestore.entity.QrCode;
|
|
|
import com.abi.qms.platform.dao.vo.result.*;
|
|
|
-import com.abi.qms.platform.dto.req.DeleteQrPackageReq;
|
|
|
-import com.abi.qms.platform.dto.req.DownloadQrPackageReq;
|
|
|
-import com.abi.qms.platform.dto.req.GetPackageCodeReq;
|
|
|
-import com.abi.qms.platform.dto.req.GetQrPackageDetailReq;
|
|
|
-import com.abi.qms.platform.dto.req.GetQrSingleCheckDetailCodeReq;
|
|
|
-import com.abi.qms.platform.dto.req.InvalidQrPackageReq;
|
|
|
-import com.abi.qms.platform.dto.req.InvalidQrSingleReq;
|
|
|
-import com.abi.qms.platform.dto.req.ListQrPackageReq;
|
|
|
-import com.abi.qms.platform.dto.req.ListQrPackageWxReq;
|
|
|
-import com.abi.qms.platform.dto.req.PassQrPackageReq;
|
|
|
-import com.abi.qms.platform.dto.req.QrOneBoxCodeMappingReq;
|
|
|
-import com.abi.qms.platform.dto.req.QrOnePackageBatchReq;
|
|
|
-import com.abi.qms.platform.dto.req.RefuseQrPackageReq;
|
|
|
-import com.abi.qms.platform.dto.req.SaveQrPackageReq;
|
|
|
-import com.abi.qms.platform.dto.req.SendMobileMsgReq;
|
|
|
-import com.abi.qms.platform.dto.req.ValidSAPOrderNoAndMaterialReq;
|
|
|
-import com.abi.qms.platform.dto.req.WxQrPackageDetailReq;
|
|
|
+import com.abi.qms.platform.dto.req.*;
|
|
|
import com.abi.qms.platform.dto.res.*;
|
|
|
import com.abi.qms.platform.infrastructure.constant.RedisKey;
|
|
|
import com.abi.qms.platform.infrastructure.event.CodePackageCreateEvent;
|
|
@@ -72,7 +28,6 @@ import freemarker.template.Template;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
-import org.springframework.amqp.core.AmqpTemplate;
|
|
|
import org.springframework.amqp.rabbit.core.RabbitTemplate;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Qualifier;
|
|
@@ -550,7 +505,8 @@ public class QrPackageServiceImpl implements QrPackageService {
|
|
|
if(qrPackageVO.getStandbyRatio()>0){
|
|
|
Long qrNumber = qrPackageVO.getQrNumber();
|
|
|
int standbyRatio = IMathUtils.asInt(qrPackageVO.getStandbyRatio());
|
|
|
- qrNumber = new Double(qrNumber*(1+standbyRatio/100d)).longValue();
|
|
|
+ Double d = new Double(qrNumber*(1+standbyRatio/100d));
|
|
|
+ qrNumber = Math.round(d);
|
|
|
qrPackageVO.setQrNumber(qrNumber);
|
|
|
}
|
|
|
}
|
|
@@ -619,9 +575,10 @@ public class QrPackageServiceImpl implements QrPackageService {
|
|
|
}
|
|
|
|
|
|
//聚合拼接描述
|
|
|
- long totalQrNumber = qrPackageList.stream().mapToLong(qrPackage -> (
|
|
|
- new Double(qrPackage.getQrNumber()*(1+ Double.valueOf(IMathUtils.asInt(qrPackage.getStandbyRatio()))/100)).longValue()
|
|
|
- )).sum();
|
|
|
+ long totalQrNumber = qrPackageList.stream().mapToLong(qrPackage -> {
|
|
|
+ Double d = new Double(qrPackage.getQrNumber()*(1+ Double.valueOf(IMathUtils.asInt(qrPackage.getStandbyRatio()))/100));
|
|
|
+ return Math.round(d);
|
|
|
+ }).sum();
|
|
|
String packageIds = qrPackageList.stream().map(qrPackage -> String.valueOf(qrPackage.getId())).collect(Collectors.joining(","));
|
|
|
|
|
|
String desc = String.format("该SAP订单号和物料已申请码包%s,码数量%d", packageIds, totalQrNumber);
|