审核码包码数增加备用码量

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/QrPackageController.java

@@ -99,7 +99,10 @@ public class QrPackageController {
     @ApiOperation("校验是否存在SAP订单号和物料重复数据")
     @PostMapping("/validSAPOrderNoAndMaterial")
     public BaseResponse validSAPOrderNoAndMaterial(@Validated @RequestBody ValidSAPOrderNoAndMaterialReq req) {
-        return BaseResponse.create(qrPackageService.validSAPOrderNoAndMaterial(req));
+
+        ValidSAPOrderNoAndMaterialRes result = qrPackageService.validSAPOrderNoAndMaterial(req);
+
+        return BaseResponse.create(result);
     }
 
     @ApiOperation("作废码包")

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrPackageServiceImpl.java

@@ -67,6 +67,7 @@ import com.abi.task.common.api.exception.BusinessException;
 import com.abi.task.common.api.exception.ErrorCodeEnum;
 import com.abi.task.common.tablestore.TableStorePlusUtils;
 import com.abi.task.common.tablestore.TableStoreUtils;
+import com.abi.task.common.utils.IMathUtils;
 import com.abi.task.common.utils.PojoConverterUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -608,7 +609,7 @@ public class QrPackageServiceImpl implements QrPackageService {
         }
 
         //聚合拼接描述
-        long totalQrNumber = qrPackageList.stream().mapToLong(QrPackage::getQrNumber).sum();
+        long totalQrNumber = qrPackageList.stream().mapToLong(qrPackage -> (qrPackage.getQrNumber()*(1+ IMathUtils.asInt(qrPackage.getStandbyRatio())/100))).sum();
         String packageIds = qrPackageList.stream().map(qrPackage -> String.valueOf(qrPackage.getId())).collect(Collectors.joining(","));
 
         String desc = String.format("该SAP订单号和物料已申请码包%s,码数量%d", packageIds, totalQrNumber);
@@ -820,6 +821,7 @@ public class QrPackageServiceImpl implements QrPackageService {
         AssertUtil.isNull(qrPackageSapOrderItem, "sap订单不存在");
         //之前采购数量+当前申请数量
         long number = num + req.getApplyNumber();
+
         //构造出参
         ValidSAPOrderNoAndMaterialRes res = new ValidSAPOrderNoAndMaterialRes();
         //判断是否超出sap订单中的采购数量
@@ -828,6 +830,7 @@ public class QrPackageServiceImpl implements QrPackageService {
         } else {
             res.setIsOverstepNum(TrueFalseEnum.FALSE.getCode());
         }
+
         return res;
     }