|
@@ -496,6 +496,24 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
|
|
|
for (int i=0;i<Shipdetail.size();i++) {
|
|
|
SyCostAllocationShipdetail ship = JSONObject.toJavaObject(Shipdetail.get(i), SyCostAllocationShipdetail.class);
|
|
|
Shipdetails.add(ship);
|
|
|
+ //实际出货数量
|
|
|
+ if(ship.getShipQuantity()!=null){
|
|
|
+ syCostAllocation.setActualShipquantity(ship.getShipQuantity().add(syCostAllocation.getActualShipquantity()));
|
|
|
+ }else {
|
|
|
+ syCostAllocation.setActualShipquantity(BigDecimal.ZERO);
|
|
|
+ }
|
|
|
+ //人民币金额
|
|
|
+ if(ship.getRmbAmount()!=null){
|
|
|
+ syCostAllocation.setRmbExportamount(ship.getRmbAmount().add(syCostAllocation.getRmbExportamount()));
|
|
|
+ }else {
|
|
|
+ syCostAllocation.setRmbExportamount(BigDecimal.ZERO);
|
|
|
+ }
|
|
|
+ //美元外销金额
|
|
|
+ if(ship.getExportPrice()!=null){
|
|
|
+ syCostAllocation.setUsdTotalexportprice(ship.getExportPrice().add(syCostAllocation.getRmbExportamount()));
|
|
|
+ }else {
|
|
|
+ syCostAllocation.setUsdTotalexportprice(BigDecimal.ZERO);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|