|
@@ -785,14 +785,14 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
|
|
|
syCostAllocation.setUsdTotalexportprice(BigDecimal.ZERO);
|
|
|
}
|
|
|
//加工费
|
|
|
- if(ship.getProcessCost()!=null){
|
|
|
- if(syCostAllocation.getRmbProcesscost()==null){
|
|
|
- syCostAllocation.setRmbProcesscost(BigDecimal.ZERO);
|
|
|
- }
|
|
|
- syCostAllocation.setRmbProcesscost(ship.getProcessCost().add(syCostAllocation.getRmbProcesscost()));
|
|
|
- }else {
|
|
|
- syCostAllocation.setRmbProcesscost(BigDecimal.ZERO);
|
|
|
- }
|
|
|
+// if(ship.getProcessCost()!=null){
|
|
|
+// if(syCostAllocation.getRmbProcesscost()==null){
|
|
|
+// syCostAllocation.setRmbProcesscost(BigDecimal.ZERO);
|
|
|
+// }
|
|
|
+// syCostAllocation.setRmbProcesscost(ship.getProcessCost().add(syCostAllocation.getRmbProcesscost()));
|
|
|
+// }else {
|
|
|
+// ship.setProcessCost(BigDecimal.ZERO);
|
|
|
+// }
|
|
|
}
|
|
|
//短出数
|
|
|
if(syCostAllocation.getActualShipquantity()!=null && syCostAllocation.getPlanQuantity()!=null){
|