Merge remote-tracking branch 'origin/dev' into dev

ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java

@@ -240,7 +240,7 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService
         if (purchaseOrder.getPurchaseOrderChildList() != null) {
             List<PurchaseOrderChild> purchaseOrderChildList = purchaseOrder.getPurchaseOrderChildList();
            //订单子表去除实际物料数量位null或者0的物料信息
-            purchaseOrderChildList = purchaseOrderChildList.stream().filter(child -> child.getMaterialNoRmb() != null && child.getMaterialNoRmb().compareTo(BigDecimal.ZERO) != 0).collect(Collectors.toList());
+            purchaseOrderChildList = purchaseOrderChildList.stream().filter(child -> child.getMaterialRealNum() != null && child.getMaterialRealNum()!=0).collect(Collectors.toList());
             for (PurchaseOrderChild child : purchaseOrderChildList) {
                 if (child.getCorrelationCode().contains(",")) {
                     String[] correlationCodes = child.getCorrelationCode().split(",");