|
|
|
@ -1582,6 +1582,24 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// 榜单照片
|
|
|
|
|
if (model.getPoundPictures()!=null&&!model.getPoundPictures().isEmpty()){
|
|
|
|
|
|
|
|
|
|
}else {
|
|
|
|
|
model.setCauseError("榜单照片导入失败!请重新导入!");
|
|
|
|
|
errList.add(model);
|
|
|
|
|
ints.add(i);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
// 车辆照片
|
|
|
|
|
if (model.getCarPictures()!=null&&!model.getCarPictures().isEmpty()){
|
|
|
|
|
|
|
|
|
|
}else {
|
|
|
|
|
model.setCauseError("车辆照片导入失败!请重新导入!");
|
|
|
|
|
errList.add(model);
|
|
|
|
|
ints.add(i);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
// 起始地
|
|
|
|
|
if (model.getOriginPrice() != null) {
|
|
|
|
|
// 区域转换
|
|
|
|
@ -1690,7 +1708,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
|
|
|
|
|
BigDecimal pricePur = new BigDecimal(model.getPurchasePrice());
|
|
|
|
|
BigDecimal settlem = model.getSettlement();
|
|
|
|
|
// 采购额/结算重量
|
|
|
|
|
item0.setPrice(pricePur.divide(settlem, RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP));
|
|
|
|
|
item0.setPrice(pricePur.divide(settlem,6, RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP));
|
|
|
|
|
//settlement结算重量:为execl中的结算重量
|
|
|
|
|
item0.setSettlement(model.getSettlement());
|
|
|
|
|
//rate税率:默认为0 即13个点
|
|
|
|
@ -1700,14 +1718,15 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
|
|
|
|
|
//amount金额:price*settlement,保留6位小数
|
|
|
|
|
item0.setAmount(new BigDecimal(model.getPurchasePrice()));
|
|
|
|
|
//not_amount不含税金额:price*settlement*(1 - 税率) 不含税价格为sum/1.13=price
|
|
|
|
|
item0.setNotAmount(item0.getAmount().divide(BigDecimal.valueOf(1 + 0.13), RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP));
|
|
|
|
|
item0.setNotAmount(item0.getAmount().divide(BigDecimal.valueOf(1 + 0.13),6, RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP));
|
|
|
|
|
//vehicle_id车辆id:磅单c表车辆id
|
|
|
|
|
item0.setVehicleId(model.getVehicleId());
|
|
|
|
|
//material_id物料id:磅单表物料id
|
|
|
|
|
item0.setMaterialId(model.getMaterialId());
|
|
|
|
|
//supplier_id供应商id:磅单表供应商id
|
|
|
|
|
item0.setSupplierId(contractMEntity.getCode());
|
|
|
|
|
|
|
|
|
|
//是否垫资
|
|
|
|
|
item0.setAdvance(model.getAdvance());
|
|
|
|
|
|
|
|
|
|
//结算重量汇总到主表
|
|
|
|
|
settlementNum = settlementNum.add(item0.getSettlement());
|
|
|
|
@ -1791,10 +1810,10 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
|
|
|
|
|
BigDecimal settlement = model.getSettlement();
|
|
|
|
|
BigDecimal purchasePrice = model.getPurchasePrice();
|
|
|
|
|
// 采购单价
|
|
|
|
|
model.setPurchasePrice(purchasePrice.divide(settlement, RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP));
|
|
|
|
|
model.setPurchasePrice(purchasePrice.divide(settlement,6, RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP));
|
|
|
|
|
BigDecimal salesPrice = model.getSalesPrice();
|
|
|
|
|
// 销售单价
|
|
|
|
|
model.setSalesPrice(salesPrice.divide(settlement, RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP));
|
|
|
|
|
model.setSalesPrice(salesPrice.divide(settlement, 6,RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP));
|
|
|
|
|
// 是否审核
|
|
|
|
|
model.setIsExamine("1");
|
|
|
|
|
// 榜单类型
|
|
|
|
|