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-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemRespVO.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemRespVO.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemRespVO.java
index cc07aa9..b9709d3 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemRespVO.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemRespVO.java
@@ -37,6 +37,33 @@
@Schema(description = "璁￠噺鍗曚綅鍚嶇О", example = "涓�")
private String unitMeasureName;
+ @Schema(description = "杈呭崟浣�1缂栧彿", example = "2")
+ private Long unitMeasureId2;
+
+ @Schema(description = "杈呭崟浣�1鍚嶇О")
+ private String unitMeasureName2;
+
+ @Schema(description = "杈呭崟浣�1鎹㈢畻姣旂巼", example = "12")
+ private BigDecimal unitMeasureRate1;
+
+ @Schema(description = "杈呭崟浣�2缂栧彿", example = "3")
+ private Long unitMeasureId3;
+
+ @Schema(description = "杈呭崟浣�2鍚嶇О")
+ private String unitMeasureName3;
+
+ @Schema(description = "杈呭崟浣�2鎹㈢畻姣旂巼", example = "100")
+ private BigDecimal unitMeasureRate2;
+
+ @Schema(description = "榛樿浠撳簱缂栧彿", example = "1")
+ private Long warehouseId;
+
+ @Schema(description = "榛樿浠撳簱缂栫爜", example = "WH001")
+ private String warehouseCode;
+
+ @Schema(description = "榛樿浠撳簱鍚嶇О", example = "鍘熸枡浠�")
+ private String warehouseName;
+
@Schema(description = "鍝佺墝缂栧彿", example = "1")
private Long brandId;
@@ -68,10 +95,33 @@
private BigDecimal maxStock;
@Schema(description = "淇濊川鏈熷ぉ鏁�", example = "365")
- private Integer expiryDays;
+ private Integer expiryDay;
@Schema(description = "鏄惁鎵规绠＄悊", example = "false")
private Boolean isBatchManaged;
+
+ // ==================== 鎵规灞炴�ч厤缃� ====================
+
+ @Schema(description = "鐢熶骇鏃ユ湡", example = "false")
+ private Boolean produceDateFlag;
+
+ @Schema(description = "鏈夋晥鏈�", example = "false")
+ private Boolean expireDateFlag;
+
+ @Schema(description = "鍏ュ簱鏃ユ湡", example = "false")
+ private Boolean receiptDateFlag;
+
+ @Schema(description = "渚涘簲鍟�", example = "false")
+ private Boolean vendorFlag;
+
+ @Schema(description = "閲囪喘璁㈠崟缂栧彿", example = "false")
+ private Boolean purchaseOrderCodeFlag;
+
+ @Schema(description = "鐢熶骇鎵瑰彿", example = "false")
+ private Boolean lotNumberFlag;
+
+ @Schema(description = "璐ㄩ噺鐘舵��", example = "false")
+ private Boolean qualityStatusFlag;
@Schema(description = "鏄惁楂樺�肩墿鏂�", example = "false")
private Boolean isHighValue;
@@ -82,6 +132,9 @@
@Schema(description = "澶囨敞", example = "澶囨敞淇℃伅")
private String remark;
+ @Schema(description = "鏄惁宸插悓姝ュ埌 MES", example = "true")
+ private Boolean syncedMes;
+
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
--
Gitblit v1.9.3