|
|
@@ -126,10 +126,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
|
|
|
paymentManagement1.setId(IdGenerator.generateUUID());
|
|
|
paymentManagement1.setRelationId(weighingManagement1.getRelationId());
|
|
|
paymentManagement1.setCompId(weighingManagement1.getCompId());
|
|
|
- //paymentManagement1.setPaymentNo(weighingManagement1.getNumber());
|
|
|
- //paymentManagement1.setCustomerName(weighingManagement1.getCustomer());
|
|
|
paymentManagement1.setCarNo(weighingManagement1.getCarNumber());
|
|
|
- //paymentManagement1.setType(weighingManagement1.getType());
|
|
|
paymentManagement1.setGoodsName(weighingManagement1.getGoodsName());
|
|
|
paymentManagement1.setGrossWeight(weighingManagement.getGrossWeight());
|
|
|
paymentManagement1.setTare(weighingManagement1.getTare());
|
|
|
@@ -137,7 +134,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
|
|
|
//计算应收
|
|
|
paymentManagement1.setCalculationCollectable(weighingManagement1.getContractPrice()*weighingManagement.getNetWeight());
|
|
|
//实际应收
|
|
|
- paymentManagement.setActualCollectionment(paymentManagement1.getCalculationCollectable());
|
|
|
+ paymentManagement1.setActualCollectionment(paymentManagement1.getCalculationCollectable());
|
|
|
//未收
|
|
|
paymentManagement1.setAmountNotCollectable(paymentManagement1.getCalculationCollectable());
|
|
|
//已收
|
