|
@@ -95,16 +95,16 @@ public class SalesDeliveryReportServiceImpl extends ServiceImpl<SalesDeliveryRep
|
|
|
if (money >= salesDeliveryReport1.getCollectionNotPayable()) {
|
|
|
money=money-salesDeliveryReport1.getCollectionNotPayable();
|
|
|
//全部收款
|
|
|
- salesDeliveryReport1.setStatus(StatusEnum.PUR_PAYaLL.getName());
|
|
|
- salesDeliveryReport1.setStatusFlag(StatusEnum.PUR_PAYaLL.getFlag());
|
|
|
+ salesDeliveryReport1.setStatus(StatusEnum.PUR_COLLECTaLL.getName());
|
|
|
+ salesDeliveryReport1.setStatusFlag(StatusEnum.PUR_COLLECTaLL.getFlag());
|
|
|
salesDeliveryReport1.setCollectionEdPayable(salesDeliveryReport1.getCollectionEdPayable()+salesDeliveryReport1.getCollectionNotPayable());
|
|
|
salesDeliveryReport1.setCollectionNotPayable(0.0f);
|
|
|
this.updateById(salesDeliveryReport1);
|
|
|
} else if (money> 0) {
|
|
|
Float moneyTmp = money-salesDeliveryReport1.getCollectionNotPayable();
|
|
|
//部分收款
|
|
|
- salesDeliveryReport1.setStatus(StatusEnum.PUR_PAY.getName());
|
|
|
- salesDeliveryReport1.setStatusFlag(StatusEnum.PUR_PAY.getFlag());
|
|
|
+ salesDeliveryReport1.setStatus(StatusEnum.PUR_COLLECT.getName());
|
|
|
+ salesDeliveryReport1.setStatusFlag(StatusEnum.PUR_COLLECT.getFlag());
|
|
|
salesDeliveryReport1.setCollectionEdPayable(salesDeliveryReport1.getCollectionEdPayable()+money);
|
|
|
salesDeliveryReport1.setCollectionNotPayable(salesDeliveryReport1.getCollectionNotPayable()-money);
|
|
|
this.updateById(salesDeliveryReport1);
|