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-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestSaveReqVO.java | 50 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestSaveReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestSaveReqVO.java
index d1a01ad..d12da09 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestSaveReqVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestSaveReqVO.java
@@ -15,7 +15,7 @@
@Data
public class ErpPurchaseRequestSaveReqVO {
- @Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "17386")
+ @Schema(description = "缂栧彿锛堜慨鏀规椂蹇呭～锛�", example = "1")
private Long id;
@Schema(description = "鐢宠鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -25,53 +25,69 @@
@Schema(description = "鐢宠鐞嗙敱", example = "鐢熶骇闇�瑕�")
private String requestReason;
- @Schema(description = "渚涘簲鍟嗙紪鍙凤紙鍙�夛級", example = "1724")
+ @Schema(description = "渚涘簲鍟嗙紪鍙�", example = "1")
private Long supplierId;
- @Schema(description = "浼樻儬鐜囷紝鐧惧垎姣�", example = "99.88")
+ @Schema(description = "浼樻儬鐜囷紝鐧惧垎姣�", example = "10")
private BigDecimal discountPercent;
- @Schema(description = "闄勪欢鍦板潃", example = "https://www.iocoder.cn")
- private String fileUrl;
+ @Schema(description = "瀹氶噾閲戦", example = "1000.00")
+ private BigDecimal depositPrice;
- @Schema(description = "澶囨敞", example = "浣犵寽")
+ @Schema(description = "澶囨敞", example = "澶囨敞")
private String remark;
- @Schema(description = "鐢宠鏄庣粏鍒楄〃")
- @NotEmpty(message = "鐢宠鏄庣粏鍒楄〃涓嶈兘涓虹┖")
+ @Schema(description = "闄勪欢 blobId 鍒楄〃", example = "[1, 2, 3]")
+ private List<Long> blobIds;
+
+ @Schema(description = "鐢宠鏄庣粏鍒楄〃", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotEmpty(message = "鐢宠鏄庣粏涓嶈兘涓虹┖")
@Valid
private List<Item> items;
+ @Schema(description = "鐢宠鏄庣粏椤�")
@Data
public static class Item {
- @Schema(description = "鐢宠椤圭紪鍙�", example = "11756")
+ @Schema(description = "缂栧彿锛堜慨鏀规椂蹇呭～锛�", example = "1")
private Long id;
- @Schema(description = "浜у搧缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
+ @Schema(description = "浜у搧缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "浜у搧缂栧彿涓嶈兘涓虹┖")
private Long productId;
- @Schema(description = "浜у搧鍗曚綅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
- @NotNull(message = "浜у搧鍗曚綅缂栧彿涓嶈兘涓虹┖")
+ @Schema(description = "浜у搧鍗曚綅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "浜у搧鍗曚綅涓嶈兘涓虹┖")
private Long productUnitId;
- @Schema(description = "浜у搧鍗曚环锛堝弬鑰冧环锛�", example = "100.00")
+ @Schema(description = "浜у搧鍙傝�冨崟浠�", example = "100.00")
private BigDecimal productPrice;
- @Schema(description = "鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
+ @Schema(description = "鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
@NotNull(message = "鏁伴噺涓嶈兘涓虹┖")
private BigDecimal count;
- @Schema(description = "绋庣巼锛岀櫨鍒嗘瘮", example = "13.00")
+ @Schema(description = "绋庣巼锛岀櫨鍒嗘瘮", example = "13")
private BigDecimal taxPercent;
- @Schema(description = "闇�姹傛棩鏈�", example = "2024-01-01")
+ @Schema(description = "闇�姹傛棩鏈�")
private LocalDate demandTime;
- @Schema(description = "澶囨敞", example = "闅忎究")
+ @Schema(description = "澶囨敞", example = "澶囨敞")
private String remark;
+ @Schema(description = "鏄惁闇�瑕佹潵鏂欐楠�", example = "true")
+ private Boolean qcCheckFlag;
+
+ @Schema(description = "浜у搧鍚嶇О锛堝墠绔睍绀虹敤锛屽悗绔拷鐣ワ級", example = "浜у搧A")
+ private String productName;
+
+ @Schema(description = "浜у搧鏉＄爜锛堝墠绔睍绀虹敤锛屽悗绔拷鐣ワ級", example = "12345678")
+ private String productBarCode;
+
+ @Schema(description = "浜у搧鍗曚綅鍚嶇О锛堝墠绔睍绀虹敤锛屽悗绔拷鐣ワ級", example = "涓�")
+ private String productUnitName;
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3