From c7e7ed6d05cd1586b37396bcabc9f3f7e6ec589f Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期三, 21 十月 2026 16:08:51 +0800
Subject: [PATCH] feat(销售台账/产品维护): 图号必填唯一、合同号唯一、明细产品编码与导入物料编码
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 05b0bce..a46bd78 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -14,6 +14,7 @@
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.sales.dto.SalesLedgerDto;
+import com.ruoyi.sales.dto.SalesLedgerEditFlagDto;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.service.ICommonFileService;
import com.ruoyi.sales.service.ISalesLedgerService;
@@ -246,32 +247,25 @@
// 鑾峰彇褰撳墠椤垫墍鏈夊彴璐﹁褰曠殑 ID 闆嗗悎
List<Long> salesLedgerIds = iPage.getRecords().stream().map(SalesLedger::getId).collect(Collectors.toList());
-
-
-
- // 杞崲鍥炴鏁版嵁, key 涓哄彴璐D, value 涓鸿鍙拌处鐨勬�诲洖娆鹃噾棰�
- Map<Long, BigDecimal> receiptTotals = new HashMap<>();
-
+ // 鎵归噺鏌ヨ姣忎釜鍙拌处鐨勭紪杈戦檺鍒舵爣璁帮細鏄惁鍚渶瑕佺敓浜х殑浜у搧銆佺敓浜ц鍒掓槸鍚﹀凡涓嬪彂銆佹槸鍚﹀凡鍙戣揣
+ Map<Long, SalesLedgerEditFlagDto> editFlags = salesLedgerService.getEditFlags(salesLedgerIds);
for (SalesLedgerVo salesLedgerVo : iPage.getRecords()) {
Long ledgerId = salesLedgerVo.getId();
- // 鍚堝悓鎬婚噾棰�
- BigDecimal contractAmount = salesLedgerVo.getContractAmount() == null ? BigDecimal.ZERO : salesLedgerVo.getContractAmount();
- // 寮�绁ㄦ�婚鍜屽洖娆炬�婚
- BigDecimal receiptPaymentAmountTotal = receiptTotals.getOrDefault(ledgerId, BigDecimal.ZERO);
+ SalesLedgerEditFlagDto editFlag = editFlags.get(ledgerId);
+ boolean needsProduction = isFlagTrue(editFlag == null ? null : editFlag.getNeedsProduction());
+ boolean planIssued = isFlagTrue(editFlag == null ? null : editFlag.getPlanIssued());
+ boolean shipped = isFlagTrue(editFlag == null ? null : editFlag.getShipped());
- // 濡傛灉宸茬粡鏈夎繃寮�绁ㄦ垨鍥炴鎿嶄綔,鍒欎笉鍏佽缂栬緫
- boolean hasReceiptOperation = receiptPaymentAmountTotal.compareTo(BigDecimal.ZERO) > 0;
- salesLedgerVo.setIsEdit(hasReceiptOperation);
+ // 宸插彂璐х殑璁㈠崟涓嶅厑璁哥紪杈戯紱闇�瑕佺敓浜т笖鐢熶骇璁″垝宸蹭笅鍙戯紙鍚儴鍒嗕笅鍙戯級鐨勮鍗曞厑璁哥紪杈戯紝鍓嶇鍙斁寮�鏃堕棿绫诲瓧娈�
+ salesLedgerVo.setIsEdit(!shipped);
+ salesLedgerVo.setHasProductionRecord(planIssued);
salesLedgerVo.setStorageBlobVOs(fileUtil.getStorageBlobVOsByApplicationAndRecordTypeAndRecordId(ApplicationTypeEnum.FILE, RecordTypeEnum.SALES_LEDGER, ledgerId));
}
if (ObjectUtils.isNotEmpty(salesLedgerDto.getStatus())) {
if (salesLedgerDto.getStatus()) {
- // 娓呴櫎鎵�鏈夆�滄湭寮�绁ㄩ噾棰濃�濅负 0 鐨勮褰�
- iPage.getRecords().removeIf(salesLedger ->
- Objects.equals(salesLedger.getNoInvoiceAmountTotal(), new BigDecimal("0.00")));
iPage.setTotal(iPage.getRecords().size());
}
}
@@ -284,4 +278,18 @@
public R getSalesLedgerWithProductsLoss(Long salesLedgerId) {
return R.ok(salesLedgerService.getSalesLedgerWithProductsLoss(salesLedgerId));
}
+
+ @Operation(summary = "鑾峰彇閿�鍞崟鎵撳嵃鏁版嵁")
+ @GetMapping("/printData/{id}")
+ public AjaxResult printData(@PathVariable Long id) {
+ Map<String, Object> data = salesLedgerService.getPrintData(id);
+ if (data == null) {
+ return AjaxResult.error("閿�鍞崟涓嶅瓨鍦�");
+ }
+ return AjaxResult.success(data);
+ }
+
+ private boolean isFlagTrue(Integer flag) {
+ return flag != null && flag == 1;
+ }
}
--
Gitblit v1.9.3