wuweihua/BMS
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去掉应收登记收款功能逻辑

Browse Source
This commit is contained in:
caojia
2026-09-16 17:57:34 +08:00
parent d2ed7fd4ea
commit e52f52cb35
22 changed files with 30 additions and 878 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ar/ArReceiptController.java
-106
View File
@@ -1,106 +0,0 @@
package com.ruoyi.web.controller.ar;
import java.util.List;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.ar.domain.ArReceipt;
import com.ruoyi.ar.domain.ArReceiptWriteoff;
import com.ruoyi.ar.domain.vo.ArBillActionRequest;
import com.ruoyi.ar.domain.vo.ArReceiptQuery;
import com.ruoyi.ar.domain.vo.ArReceiptWriteoffRequest;
import com.ruoyi.ar.service.IArReceiptService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
/** 应收收款与核销管理。 */
@RestController
@RequestMapping("/ar/receipt")
@Validated
public class ArReceiptController extends BaseController
{
@Autowired
private IArReceiptService receiptService;
@PreAuthorize("@ss.hasPermi('ar:receipt:list')")
@GetMapping("/list")
public TableDataInfo list(ArReceiptQuery query)
{
startPage();
return getDataTable(receiptService.selectReceiptList(query));
}
@PreAuthorize("@ss.hasPermi('ar:receipt:list')")
@GetMapping("/{receiptId}/writeoffs")
public AjaxResult writeoffs(@PathVariable Long receiptId)
{
return success(receiptService.selectWriteoffs(receiptId));
}
@Log(title = "应收收款", businessType = BusinessType.INSERT)
@PreAuthorize("@ss.hasPermi('ar:receipt:add')")
@PostMapping
public AjaxResult add(@Valid @RequestBody ArReceipt receipt,
@RequestHeader(value = "X-Request-Id", required = false) String headerRequestId)
{
String requestId = requestId(headerRequestId);
return success(receiptService.registerReceipt(receipt, getUsername(), requestId)).put("request_id", requestId);
}
@Log(title = "应收收款", businessType = BusinessType.UPDATE)
@PreAuthorize("@ss.hasPermi('ar:receipt:cancel')")
@PutMapping("/{receiptId}/cancel")
public AjaxResult cancelReceipt(@PathVariable Long receiptId, @RequestBody(required = false) ArBillActionRequest request,
@RequestHeader(value = "X-Request-Id", required = false) String headerRequestId)
{
String requestId = requestId(request == null ? null : request.getRequestId(), headerRequestId);
receiptService.cancelReceipt(receiptId, request == null ? null : request.getRemark(), getUsername(), requestId);
return success().put("request_id", requestId);
}
@Log(title = "应收收款核销", businessType = BusinessType.UPDATE)
@PreAuthorize("@ss.hasPermi('ar:receipt:writeoff')")
@PostMapping("/writeoff")
public AjaxResult writeoff(@Valid @RequestBody ArReceiptWriteoffRequest request,
@RequestHeader(value = "X-Request-Id", required = false) String headerRequestId)
{
String requestId = StringUtils.isNotEmpty(request.getRequestId()) ? request.getRequestId() : requestId(headerRequestId);
List<ArReceiptWriteoff> rows = receiptService.writeoff(request, getUsername(), requestId);
return success(rows).put("request_id", requestId);
}
@Log(title = "应收收款核销", businessType = BusinessType.UPDATE)
@PreAuthorize("@ss.hasPermi('ar:receipt:cancel')")
@PutMapping("/writeoff/{writeoffId}/cancel")
public AjaxResult cancel(@PathVariable Long writeoffId, @RequestBody(required = false) ArBillActionRequest request,
@RequestHeader(value = "X-Request-Id", required = false) String headerRequestId)
{
String requestId = requestId(request == null ? null : request.getRequestId(), headerRequestId);
receiptService.cancelWriteoff(writeoffId, request == null ? null : request.getRemark(), getUsername(), requestId);
return success().put("request_id", requestId);
}
private String requestId(String headerRequestId)
{
return StringUtils.isNotEmpty(headerRequestId) ? headerRequestId : IdUtils.fastSimpleUUID();
}
private String requestId(String bodyRequestId, String headerRequestId)
{
return StringUtils.isNotEmpty(bodyRequestId) ? bodyRequestId : requestId(headerRequestId);
}
}