“收款入账”和“账单核销”分开处理
This commit is contained in:
@@ -27,8 +27,7 @@ import com.bms.customer.customermoney.service.ICustomerMoneyService;
|
||||
* 收款管理 Controller(账单管理-收款管理)
|
||||
* <p>
|
||||
* 收款登记/审核/取消与「客户余额-登记收款」复用同一套 Service 逻辑;
|
||||
* 账单核销同样复用余额核销 Service:登记收款时可携带核销计划(审核通过后联动核销),
|
||||
* 本页「账单核销」页签可直接对账单发起核销/反核销。
|
||||
* 收款审核只将款项计入客户余额;账单核销由本页「账单核销」页签单独执行。
|
||||
*
|
||||
* @author bms
|
||||
* @date 2026-10-13
|
||||
@@ -82,7 +81,7 @@ public class ArReceiptController extends BaseController
|
||||
}
|
||||
|
||||
/**
|
||||
* 登记收款(必须选择客户;默认待确认,审核通过后入账并执行登记时选择的核销计划)
|
||||
* 登记收款(必须选择客户;默认待确认,审核通过后将款项计入客户余额)
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ar:receipt:add')")
|
||||
@Log(title = "收款管理-登记收款", businessType = BusinessType.INSERT)
|
||||
@@ -94,7 +93,7 @@ public class ArReceiptController extends BaseController
|
||||
}
|
||||
|
||||
/**
|
||||
* 审核通过收款单:确认后金额计入客户余额,登记时选择的账单一并核销
|
||||
* 审核通过收款单:确认后仅将收款金额计入客户余额,账单核销由账单核销页单独执行
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ar:receipt:review')")
|
||||
@Log(title = "收款管理-收款审核", businessType = BusinessType.UPDATE)
|
||||
@@ -116,7 +115,7 @@ public class ArReceiptController extends BaseController
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询客户可核销账单(已确认/部分核销,未核销额大于0),登记收款选账单与核销页签共用
|
||||
* 查询客户可核销账单(已确认/部分核销,未核销额大于0),供账单核销页使用
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ar:receipt:list')")
|
||||
@GetMapping("/bill/unsettled/{customerId}")
|
||||
|
||||
Reference in New Issue
Block a user