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/contract/vo/contract/CrmContractRespVO.java | 63 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java
index d33143d..e9acd92 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java
@@ -17,121 +17,126 @@
public class CrmContractRespVO {
@Schema(description = "鍚堝悓缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
- @ExcelProperty("鍚堝悓缂栧彿")
private Long id;
@Schema(description = "鍚堝悓鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "鐜嬩簲")
- @ExcelProperty("鍚堝悓鍚嶇О")
+ @ExcelProperty(value = "鍚堝悓鍚嶇О", index = 1)
private String name;
@Schema(description = "鍚堝悓缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "20230101")
- @ExcelProperty("鍚堝悓缂栧彿")
+ @ExcelProperty(value = "鍚堝悓缂栧彿", index = 0)
private String no;
@Schema(description = "瀹㈡埛缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "18336")
- @ExcelProperty("瀹㈡埛缂栧彿")
private Long customerId;
@Schema(description = "瀹㈡埛鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "18336")
- @ExcelProperty("瀹㈡埛鍚嶇О")
+ @ExcelProperty(value = "瀹㈡埛鍚嶇О", index = 2)
private String customerName;
@Schema(description = "鍟嗘満缂栧彿", example = "10864")
- @ExcelProperty("鍟嗘満缂栧彿")
private Long businessId;
@Schema(description = "鍟嗘満鍚嶇О", example = "10864")
- @ExcelProperty("鍟嗘満鍚嶇О")
+ @ExcelProperty(value = "鍟嗘満鍚嶇О", index = 3)
private String businessName;
@Schema(description = "鏈�鍚庤窡杩涙椂闂�")
- @ExcelProperty("鏈�鍚庤窡杩涙椂闂�")
+ @ExcelProperty(value = "鏈�鍚庤窡杩涙椂闂�", index = 14)
private LocalDateTime contactLastTime;
@Schema(description = "璐熻矗浜虹殑鐢ㄦ埛缂栧彿", example = "25682")
- @ExcelProperty("璐熻矗浜虹殑鐢ㄦ埛缂栧彿")
private Long ownerUserId;
@Schema(description = "璐熻矗浜哄悕瀛�", example = "25682")
- @ExcelProperty("璐熻矗浜哄悕瀛�")
+ @ExcelProperty(value = "璐熻矗浜�", index = 15)
private String ownerUserName;
@Schema(description = "璐熻矗浜洪儴闂�")
- @ExcelProperty("璐熻矗浜洪儴闂�")
+ @ExcelProperty(value = "鎵�灞為儴闂�", index = 16)
private String ownerUserDeptName;
@Schema(description = "宸ヤ綔娴佺紪鍙�", example = "1043")
- @ExcelProperty("宸ヤ綔娴佺紪鍙�")
private String processInstanceId;
@Schema(description = "瀹℃壒鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
- @ExcelProperty("瀹℃壒鐘舵��")
private Integer auditStatus;
+ @Schema(description = "鍚堝悓鐘舵�佸悕绉�", example = "瀹℃壒涓�")
+ @ExcelProperty(value = "鍚堝悓鐘舵��", index = 20)
+ private String auditStatusName;
+
@Schema(description = "涓嬪崟鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("涓嬪崟鏃ユ湡")
+ @ExcelProperty(value = "涓嬪崟鏃堕棿", index = 6)
private LocalDateTime orderDate;
@Schema(description = "寮�濮嬫椂闂�")
- @ExcelProperty("寮�濮嬫椂闂�")
+ @ExcelProperty(value = "鍚堝悓寮�濮嬫椂闂�", index = 7)
private LocalDateTime startTime;
@Schema(description = "缁撴潫鏃堕棿")
- @ExcelProperty("缁撴潫鏃堕棿")
+ @ExcelProperty(value = "鍚堝悓缁撴潫鏃堕棿", index = 8)
private LocalDateTime endTime;
@Schema(description = "浜у搧鎬婚噾棰�", example = "19510")
- @ExcelProperty("浜у搧鎬婚噾棰�")
private BigDecimal totalProductPrice;
@Schema(description = "鏁村崟鎶樻墸")
- @ExcelProperty("鏁村崟鎶樻墸")
private BigDecimal discountPercent;
@Schema(description = "鍚堝悓閲戦", example = "5617")
- @ExcelProperty("鍚堝悓閲戦")
+ @ExcelProperty(value = "鍚堝悓閲戦锛堝厓锛�", index = 4)
private BigDecimal totalPrice;
@Schema(description = "瀹氶噾閲戦锛屽崟浣嶏細鍏�", example = "1000.00")
- @ExcelProperty("瀹氶噾閲戦")
+ @ExcelProperty(value = "瀹氶噾閲戦锛堝厓锛�", index = 5)
private BigDecimal depositPrice;
@Schema(description = "宸插洖娆鹃噾棰�", example = "5617")
- @ExcelProperty("宸插洖娆鹃噾棰�")
+ @ExcelProperty(value = "宸插洖娆鹃噾棰濓紙鍏冿級", index = 12)
private BigDecimal totalReceivablePrice;
+
+ @Schema(description = "鏈洖娆鹃噾棰濓紝绛変簬 鍚堝悓閲戦 - 宸插洖娆鹃噾棰�", example = "1000.00")
+ @ExcelProperty(value = "鏈洖娆鹃噾棰濓紙鍏冿級", index = 13)
+ private BigDecimal unReceivablePrice;
+
+ @Schema(description = "宸插紑绁ㄩ噾棰濓紙鍚鎵逛腑锛夛紝缁熻瀹℃壒閫氳繃 + 瀹℃壒涓殑寮�绁�", example = "5617")
+ private BigDecimal totalInvoicePrice;
+
+ @Schema(description = "鏈紑绁ㄩ噾棰濓紝绛変簬 鍚堝悓閲戦 - 宸插紑绁ㄩ噾棰�", example = "1000.00")
+ private BigDecimal unInvoicePrice;
@Schema(description = "鍏宠仈 ERP 閿�鍞鍗曠紪鍙�", example = "12345")
private Long orderId;
@Schema(description = "ERP 閿�鍞鍗曞崟鍙�", example = "SO001")
- @ExcelProperty("閿�鍞鍗曞崟鍙�")
+ @ExcelProperty(value = "鍏宠仈璁㈠崟", index = 21)
private String orderNo;
@Schema(description = "瀹㈡埛绛剧害浜虹紪鍙�", example = "18546")
private Long signContactId;
@Schema(description = "瀹㈡埛绛剧害浜�", example = "灏忚眴")
- @ExcelProperty("瀹㈡埛绛剧害浜�")
+ @ExcelProperty(value = "瀹㈡埛绛剧害浜�", index = 9)
private String signContactName;
@Schema(description = "鍏徃绛剧害浜�", example = "14036")
private Long signUserId;
@Schema(description = "鍏徃绛剧害浜�", example = "灏忔槑")
- @ExcelProperty("鍏徃绛剧害浜�")
+ @ExcelProperty(value = "鍏徃绛剧害浜�", index = 10)
private String signUserName;
@Schema(description = "澶囨敞", example = "浣犵寽")
- @ExcelProperty("澶囨敞")
+ @ExcelProperty(value = "澶囨敞", index = 11)
private String remark;
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("鍒涘缓鏃堕棿")
+ @ExcelProperty(value = "鍒涘缓鏃堕棿", index = 18)
private LocalDateTime createTime;
@Schema(description = "鍒涘缓浜�", example = "25682")
- @ExcelProperty("鍒涘缓浜�")
private String creator;
@Schema(description = "鍒涘缓浜哄悕瀛�", example = "test")
- @ExcelProperty("鍒涘缓浜哄悕瀛�")
+ @ExcelProperty(value = "鍒涘缓浜�", index = 19)
private String creatorName;
@Schema(description = "鏇存柊鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("鏇存柊鏃堕棿")
+ @ExcelProperty(value = "鏇存柊鏃堕棿", index = 17)
private LocalDateTime updateTime;
@Schema(description = "浜у搧鍒楄〃")
--
Gitblit v1.9.3