提交

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -1134,7 +1134,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
                     return issueImportExcelBo;
                 }))
         );
-        excelBoList = collect.values().stream().collect(Collectors.toList());
+        excelBoList = new ArrayList<>(collect.values());
 
         List<String> productCodes = excelBoList.stream().distinct().map(IssueImportExcelBo::getProductCustomCode).collect(Collectors.toList());
         if (ObjectUtil.isNotEmpty(productCodes)) {
@@ -1158,12 +1158,13 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
                 importExcelBo.setProductSpec(productInfo.getSpec());
                 importExcelBo.setProductUnit(productInfo.getUnit());
             }
-            if (notArr.size() != 0) {
-                throw new ServiceException("以下产品不存在：" + notArr.stream().collect(Collectors.joining(",")));
+
+            if (!notArr.isEmpty()) {
+                throw new ServiceException("以下产品不存在：" + String.join(",", notArr));
             }
 
             //名称升序
-            Collections.sort(excelBoList, Comparator.comparing(IssueImportExcelBo::getProductName));
+            excelBoList.sort(Comparator.comparing(IssueImportExcelBo::getProductName));
         }
         return excelBoList;
     }

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeDetailServiceImpl.java

@@ -359,11 +359,13 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
         if (ObjectUtil.isEmpty(excelBoList)) {
             return excelBoList;
         }
+
         List<String> productCodes = excelBoList.stream().map(SubscribeDetailExcelBo::getProductCustomCode).collect(Collectors.toList());
         if (ObjectUtil.isNotEmpty(productCodes)) {
             List<String> notArr = new ArrayList<>();
             //赋值产品信息
             Map<String, ProductInfo> productInfoMap = productInfoService.mapKEntity(ProductInfo::getCustomCode, q -> q.in(ProductInfo::getCustomCode, productCodes));
+
             for (SubscribeDetailExcelBo subscribeDetailExcelBo : excelBoList) {
                 ProductInfo productInfo = productInfoMap.get(subscribeDetailExcelBo.getProductCustomCode());
                 if (ObjectUtil.isEmpty(productInfo)) {
@@ -376,8 +378,9 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
                 subscribeDetailExcelBo.setProductSpec(productInfo.getSpec());
                 subscribeDetailExcelBo.setProductUnit(productInfo.getUnit());
             }
-            if (notArr.size() != 0) {
-                throw new ServiceException("以下产品不存在：" + notArr.stream().collect(Collectors.joining(",")));
+
+            if (!notArr.isEmpty()) {
+                throw new ServiceException("以下产品不存在：" + String.join(",", notArr));
             }
         }
         return excelBoList;

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -58,6 +58,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -371,7 +372,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
                 BigDecimal multiply1 = stockWaitDetails.getQuantity().multiply(purchaseDetailPo.getPrice());
                 BigDecimal add = multiply.add(multiply1);
                 BigDecimal add1 = quantity.add(stockWaitDetails.getQuantity());
-                BigDecimal divide = add.divide(add1, 4, BigDecimal.ROUND_HALF_DOWN);
+                BigDecimal divide = add.divide(add1, 4, RoundingMode.HALF_DOWN);
 
                 productInfo.setUnitPrice(divide);
                 productInfoList.add(productInfo);