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/ErpPurchaseRequestRespVO.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestRespVO.java
index 4a28ce1..74ff12b 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestRespVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestRespVO.java
@@ -1,76 +1,111 @@
package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request;
+import cn.idev.excel.annotation.ExcelIgnore;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import cn.iocoder.yudao.module.system.api.storage.dto.StorageBlobRespDTO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.List;
@Schema(description = "绠＄悊鍚庡彴 - ERP 閲囪喘鐢宠 Response VO")
@Data
+@ExcelIgnoreUnannotated
public class ErpPurchaseRequestRespVO {
@Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @ExcelIgnore
private Long id;
@Schema(description = "閲囪喘鐢宠鍗曞彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "CGSQ001")
+ @ExcelProperty("閲囪喘鐢宠鍗曞彿")
private String no;
@Schema(description = "鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
+ @ExcelProperty(value = "鐘舵��", converter = cn.iocoder.yudao.module.erp.convert.ErpPurchaseRequestStatusConvert.class)
private Integer status;
+ @Schema(description = "娴佺▼瀹炰緥缂栧彿", example = "1024")
+ private String processInstanceId;
+
@Schema(description = "鐢宠浜虹紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @ExcelProperty("鐢宠浜虹紪鍙�")
private Long requestUserId;
@Schema(description = "鐢宠浜哄鍚�", example = "寮犱笁")
+ @ExcelProperty("鐢宠浜哄鍚�")
private String requestUserName;
@Schema(description = "鐢宠閮ㄩ棬缂栧彿", example = "1")
+ @ExcelProperty("鐢宠閮ㄩ棬缂栧彿")
private Long requestDeptId;
@Schema(description = "鐢宠閮ㄩ棬鍚嶇О", example = "鐢熶骇閮�")
+ @ExcelProperty("鐢宠閮ㄩ棬鍚嶇О")
private String requestDeptName;
@Schema(description = "鐢宠鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("鐢宠鏃堕棿")
private LocalDateTime requestTime;
@Schema(description = "鐢宠鐞嗙敱", example = "鐢熶骇闇�瑕�")
+ @ExcelProperty("鐢宠鐞嗙敱")
private String requestReason;
@Schema(description = "渚涘簲鍟嗙紪鍙�", example = "1")
+ @ExcelProperty("渚涘簲鍟嗙紪鍙�")
private Long supplierId;
@Schema(description = "渚涘簲鍟嗗悕绉�", example = "渚涘簲鍟咥")
+ @ExcelProperty("渚涘簲鍟嗗悕绉�")
private String supplierName;
@Schema(description = "瀹氶噾閲戦", example = "1000.00")
+ @ExcelProperty("瀹氶噾閲戦")
private BigDecimal depositPrice;
@Schema(description = "鍚堣鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("鍚堣鏁伴噺")
private BigDecimal totalCount;
@Schema(description = "鍚堣浠锋牸", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("鍚堣浠锋牸")
private BigDecimal totalPrice;
@Schema(description = "浜у搧鍚嶇О鍒楄〃", example = "浜у搧A,浜у搧B")
+ @ExcelProperty("浜у搧鍚嶇О鍒楄〃")
private String productNames;
@Schema(description = "鐢熸垚鐨勯噰璐鍗曠紪鍙�", example = "1")
+ @ExcelIgnore
private Long orderId;
@Schema(description = "鐢熸垚鐨勯噰璐鍗曞彿", example = "CGDD001")
+ @ExcelProperty("閲囪喘璁㈠崟鍙�")
private String orderNo;
- @Schema(description = "闄勪欢鍦板潃", example = "https://xxx.com/xxx.pdf")
- private String fileUrl;
+ @Schema(description = "鍏ュ簱鐘舵��", example = "0")
+ @ExcelProperty(value = "鍏ュ簱鐘舵��", converter = cn.iocoder.yudao.module.erp.convert.ErpPurchaseOrderInStatusConvert.class)
+ private Integer inStatus;
@Schema(description = "澶囨敞", example = "澶囨敞")
+ @ExcelProperty("澶囨敞")
private String remark;
+ @Schema(description = "闄勪欢鍒楄〃")
+ @ExcelIgnore
+ private List<StorageBlobRespDTO> attachmentList;
+
@Schema(description = "鍒涘缓鏃堕棿")
+ @ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
@Schema(description = "鐢宠鏄庣粏鍒楄〃")
+ @ExcelIgnore
private java.util.List<Item> items;
@Schema(description = "鐢宠鏄庣粏椤�")
@@ -111,7 +146,7 @@
private BigDecimal taxPrice;
@Schema(description = "闇�姹傛棩鏈�")
- private LocalDateTime demandTime;
+ private LocalDate demandTime;
@Schema(description = "澶囨敞", example = "澶囨敞")
private String remark;
@@ -119,6 +154,9 @@
@Schema(description = "鏄惁闇�瑕佹潵鏂欐楠�", example = "true")
private Boolean qcCheckFlag;
+ @Schema(description = "鍏ュ簱鏁伴噺", example = "10.00")
+ private BigDecimal inCount;
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3