From 227eff61120aaca63e068035d745d86452e6499a Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 09:35:12 +0800
Subject: [PATCH] feat(mes): 优化生产订单与排产任务列表显示，新增启停工及校验逻辑 1. 生产订单列表展示优化 (WorkOrder) - 新增「生产状态」列，全局注册 `ORDER_PRODUCTION_STATUS` 常量并绑定系统动态字典。 - 彻底重构「工序生产进度」单元格显示：弃用臃肿的 Steps 组件，改为极简横向布局（彩色状态圆点 + 进度百分比），解决表格行高被强行撑开及内容截断问题，支持横向滚动。 - 优化「完成进度」列宽及展示样式，将百分比数值外置同行显示，更加直观。 2. 排产任务列表改造 (Task) - 顶部表头重构，由单一标题重构为「全部 / 未完成 / 已完成」的 Tabs 标签页切换结构。 - 重写数据过滤逻辑，剥离写死的 status 查询，改为使用 `scheduleStatus` 字段动态响应 Tabs 切换 (0: 未完成, 1: 已完成)。 3. 工单业务逻辑增强与状态流转 - 落实「工单查询逻辑设计方案」，优化底层的工单条件检索逻辑。 - 实现「添加工单启停功能」与「停工状态」，支持工单在执行过程中的暂停与恢复业务流转。 - 强化容错与防呆设计：操作「完成订单」时增加前置校验 `handleCheckFinish`，若生产状态为未完成，强制弹出二次确认 Modal，避免误操作。 # 相关讨论/参考方案 # - 添加工单启停功能 # - 停工状态功能设计方案 # - 工单查询逻辑设计方案 # - 工单完成进度显示优化
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java
index 0a960e5..8397ad9 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java
@@ -16,14 +16,17 @@
import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.invoice.CrmInvoiceDO;
+import cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum;
import cn.iocoder.yudao.module.crm.service.contract.CrmContractService;
import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService;
import cn.iocoder.yudao.module.crm.service.invoice.CrmInvoiceService;
+import cn.iocoder.yudao.module.crm.service.receivable.CrmReceivableService;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import cn.iocoder.yudao.module.system.enums.storage.StorageRecordTypeEnum;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -35,6 +38,8 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -60,6 +65,8 @@
private CrmContractService contractService;
@Resource
private CrmCustomerService customerService;
+ @Resource
+ private CrmReceivableService receivableService;
@Resource
private AdminUserApi adminUserApi;
@@ -151,6 +158,9 @@
// 1.3 鑾峰緱鍚堝悓鍒楄〃
Map<Long, CrmContractDO> contractMap = contractService.getContractMap(
convertSet(invoiceList, CrmInvoiceDO::getContractId));
+ // 1.4 鑾峰緱姣忓紶寮�绁ㄥ凡鍥炴閲戦锛堣崏绋� + 瀹℃壒涓� + 瀹℃壒閫氳繃锛�
+ Map<Long, BigDecimal> receivablePriceMap = receivableService.getReceivablePriceMapByInvoiceId(
+ convertSet(invoiceList, CrmInvoiceDO::getId));
// 2. 鎷兼帴缁撴灉
return BeanUtils.toBean(invoiceList, CrmInvoiceRespVO.class, (invoiceVO) -> {
// 2.1 鎷兼帴瀹㈡埛鍚嶇О
@@ -166,7 +176,13 @@
findAndThen(contractMap, invoiceVO.getContractId(), contract ->
invoiceVO.setContract(BeanUtils.toBean(contract, CrmContractRespVO.class)));
// 2.4 鎷兼帴鍙戠エ闄勪欢
- invoiceVO.setAttachmentList(storageAttachmentApi.listAttachments("crm_invoice", invoiceVO.getId()));
+ invoiceVO.setAttachmentList(storageAttachmentApi.listAttachments(
+ StorageRecordTypeEnum.CRM_INVOICE.getType(), invoiceVO.getId()));
+ // 2.5 鎷兼帴鏄惁宸蹭笂浼犻檮浠�
+ invoiceVO.setHasAttachment(CollUtil.isNotEmpty(invoiceVO.getAttachmentList()));
+ // 2.6 鎷兼帴鍓╀綑鍙洖娆鹃噾棰�
+ invoiceVO.setRemainingInvoicePrice(invoiceVO.getPrice().subtract(
+ receivablePriceMap.getOrDefault(invoiceVO.getId(), BigDecimal.ZERO)));
});
}
@@ -185,4 +201,41 @@
return success(invoiceService.getAuditInvoiceCount(getLoginUserId()));
}
+ @GetMapping("/simple-list")
+ @Operation(summary = "鑾峰緱寮�绁ㄧ簿绠�鍒楄〃", description = "鍙寘鍚鏍搁�氳繃涓斿凡涓婁紶鍙戠エ闄勪欢鐨勫紑绁紝涓昏鐢ㄤ簬鍥炴鍒涘缓鏃堕�夋嫨鍏宠仈寮�绁�")
+ @Parameter(name = "contractId", description = "鍚堝悓缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('crm:invoice:query')")
+ public CommonResult<List<CrmInvoiceRespVO>> getInvoiceSimpleList(@RequestParam("contractId") Long contractId) {
+ List<CrmInvoiceDO> invoices = invoiceService.getInvoiceListByContractIdAndStatus(contractId,
+ List.of(CrmAuditStatusEnum.APPROVE.getStatus()));
+ if (CollUtil.isEmpty(invoices)) {
+ return success(Collections.emptyList());
+ }
+ // 杩囨护锛氬凡涓婁紶鍙戠エ闄勪欢
+ invoices.removeIf(invoice -> CollUtil.isEmpty(storageAttachmentApi.listAttachments(
+ StorageRecordTypeEnum.CRM_INVOICE.getType(), invoice.getId())));
+ if (CollUtil.isEmpty(invoices)) {
+ return success(Collections.emptyList());
+ }
+ // 璁＄畻姣忓紶寮�绁ㄥ凡鍥炴閲戦锛堣崏绋� + 瀹℃壒涓� + 瀹℃壒閫氳繃锛屽彛寰勪笌鍒涘缓鍥炴鏍￠獙涓�鑷达級
+ Map<Long, BigDecimal> receivablePriceMap = receivableService.getReceivablePriceMapByInvoiceId(
+ convertSet(invoices, CrmInvoiceDO::getId));
+ // 杩囨护锛氬墿浣欏彲鍥炴閲戦 > 0 鎵嶅彲閫�
+ List<CrmInvoiceRespVO> result = new ArrayList<>();
+ for (CrmInvoiceDO invoice : invoices) {
+ BigDecimal remainingPrice = invoice.getPrice()
+ .subtract(receivablePriceMap.getOrDefault(invoice.getId(), BigDecimal.ZERO));
+ if (remainingPrice.compareTo(BigDecimal.ZERO) <= 0) {
+ continue;
+ }
+ result.add(new CrmInvoiceRespVO() // 鍙繑鍥炵簿绠�瀛楁
+ .setId(invoice.getId()).setNo(invoice.getNo()).setInvoiceNo(invoice.getInvoiceNo())
+ .setInvoiceTitle(invoice.getInvoiceTitle()).setPrice(invoice.getPrice())
+ .setCustomerId(invoice.getCustomerId()).setContractId(invoice.getContractId())
+ .setAuditStatus(invoice.getAuditStatus()).setHasAttachment(true)
+ .setRemainingInvoicePrice(remainingPrice));
+ }
+ return success(result);
+ }
+
}
--
Gitblit v1.9.3