Merge branch 'master' of ssh://10.10.101.21/source/platform-b2b into dev

src/main/java/com/uas/platform/b2b/model/ErpProdIODetail.java

@@ -251,6 +251,7 @@ public class ErpProdIODetail implements Serializable {
         this.ordercode = item.getOrderCode();
         this.thischeckqty = item.getCheckQty();
         this.pidate = item.getSourceDate();
+        this.qty = item.getCheckQty();
     }
 
     @Id

src/main/java/com/uas/platform/b2b/service/impl/ErpProdIODetailServiceImpl.java

@@ -148,6 +148,8 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
             setCheckAmount(erpProdIo, enUU, keyword.getCustomerUU(), checkDate, fromDate, endDate);
             // 查询已生成的对账单（需进行转换）
             List<PurchaseApCheckItemInfo> apCheckList = findApCheckList(enUU, keyword.getCustomerUU(), checkDate, fromDate, endDate, keyword);
+            apCheckList.removeIf(apCheck -> "已作废".equals(apCheck.getApCheck().getCheckStatus())
+                || "不同意".equals(apCheck.getApCheck().getCheckStatus()));
             List<ErpProdIODetail> detailList = covertApCheckToErpIo(apCheckList);
             erpProdIo.getDetails().addAll(detailList);
         }