|
|
|
@ -1426,12 +1426,17 @@ if (pMap!=null&&pMap.size()>0){
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
ints.add(i);
|
|
|
|
|
|
|
|
|
|
errList.add(model);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
ArrayList<PurchaseorderDTO> dtos = new ArrayList<>();
|
|
|
|
|
for (int i = 0; i < ints.size(); i++) {
|
|
|
|
|
Integer integer = ints.get(i);
|
|
|
|
|
dataList.remove(dataList.get(integer));
|
|
|
|
|
dtos.add(dataList.get(integer));
|
|
|
|
|
}
|
|
|
|
|
for (int i = 0; i < dtos.size(); i++) {
|
|
|
|
|
PurchaseorderDTO purchaseorderDTO = dtos.get(i);
|
|
|
|
|
dataList.remove(purchaseorderDTO);
|
|
|
|
|
}
|
|
|
|
|
BillRuleController bean = SpringContext.getBean(BillRuleController.class);
|
|
|
|
|
String str2="purchase";
|
|
|
|
@ -1449,7 +1454,7 @@ if (pMap!=null&&pMap.size()>0){
|
|
|
|
|
BigDecimal rateSum = new BigDecimal("0.00");
|
|
|
|
|
// advance_amount垫资金额:判断采购订单子表中有多少磅单是属于垫资的,找到之后将他们的【金额】进行汇总得到。
|
|
|
|
|
BigDecimal advanceSum = new BigDecimal("0.00");
|
|
|
|
|
|
|
|
|
|
if (dataList.size()>0){
|
|
|
|
|
// 合同id
|
|
|
|
|
String purchaseId = dataList.get(0).getPurchaseId();
|
|
|
|
|
LambdaQueryWrapper<ContractMEntity> wrapper = new LambdaQueryWrapper<>();
|
|
|
|
@ -1581,6 +1586,8 @@ if (pMap!=null&&pMap.size()>0){
|
|
|
|
|
Purchaseorder_item0Entity entity = purItemEntities.get(i);
|
|
|
|
|
purchaseorderItem0Mapper.insert(entity);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
PurchaseOrderImportVo importVo = new PurchaseOrderImportVo();
|
|
|
|
|
num=errList.size();
|
|
|
|
|
importVo.setSnum(sum);
|
|
|
|
|