From b3fe06c151dc8455649bf0a46e481ceb83e3ea2a Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期六, 07 十一月 2026 13:37:54 +0800
Subject: [PATCH] feat: 完成好水川 MOM 需求1/2/4/5/8（装箱、BOM成本、销售合同、劳动合同、留样）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java | 63 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 5 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java
index 70e1530..93cd77b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java
@@ -61,13 +61,30 @@
@ExcelProperty("鍗曚綅")
private String unitMeasureName;
- @Schema(description = "鐢熶骇鏁伴噺", example = "100.00")
- @ExcelProperty("鐢熶骇鏁伴噺")
+ @Schema(description = "璁㈠崟鏁伴噺", example = "100.00")
+ @ExcelProperty("璁㈠崟鏁伴噺")
private BigDecimal quantity;
@Schema(description = "宸茬敓浜ф暟閲�", example = "50.00")
@ExcelProperty("宸茬敓浜ф暟閲�")
private BigDecimal quantityProduced;
+
+ @Schema(description = "宸茶绠辨暟閲�", example = "30.00")
+ @ExcelProperty("宸茶绠辨暟閲�")
+ private BigDecimal packedQuantity;
+
+ @Schema(description = "宸茶绠辩鏁�", example = "3")
+ @ExcelProperty("宸茶绠辩鏁�")
+ private Integer packedBoxCount;
+
+ @Schema(description = "瑁呯鐘舵��", example = "1")
+ @ExcelProperty(value = "瑁呯鐘舵��", converter = DictConvert.class)
+ @DictFormat(DictTypeConstants.MES_PRO_WORK_ORDER_PACKING_STATUS)
+ private Integer packingStatus;
+
+ @Schema(description = "瀹屽伐杩涘害", example = "50.00")
+ @ExcelProperty("瀹屽伐杩涘害")
+ private BigDecimal completionProgress;
@Schema(description = "璋冩暣鏁伴噺", example = "0")
@ExcelProperty("璋冩暣鏁伴噺")
@@ -77,12 +94,33 @@
@ExcelProperty("宸叉帓浜ф暟閲�")
private BigDecimal quantityScheduled;
+ @Schema(description = "瓒呰�楁姤璀︽瘮渚�(%)", example = "5")
+ @ExcelProperty("瓒呰�楁姤璀︽瘮渚�(%)")
+ private BigDecimal overConsumeRatio;
+
+ @Schema(description = "鏍囧噯鐗╂枡鎴愭湰", example = "1000.00")
+ @ExcelProperty("鏍囧噯鐗╂枡鎴愭湰")
+ private BigDecimal standardMaterialCost;
+
+ @Schema(description = "瀹為檯鐗╂枡鎴愭湰", example = "1050.00")
+ @ExcelProperty("瀹為檯鐗╂枡鎴愭湰")
+ private BigDecimal actualMaterialCost;
+
+ @Schema(description = "瓒呰�楃墿鏂欐垚鏈�", example = "50.00")
+ @ExcelProperty("瓒呰�楃墿鏂欐垚鏈�")
+ private BigDecimal overConsumeCost;
+
+ @Schema(description = "鐗╂枡鍗曚綅鎴愭湰锛堝疄闄呯墿鏂欐垚鏈�/宸叉姤宸ユ暟閲忥級", example = "10.50")
+ @ExcelProperty("鐗╂枡鍗曚綅鎴愭湰")
+ private BigDecimal materialUnitCost;
+
+ @Schema(description = "鎴愭湰璁＄畻鏃堕棿")
+ @ExcelProperty("鎴愭湰璁＄畻鏃堕棿")
+ private LocalDateTime costUpdateTime;
+
@Schema(description = "瀹㈡埛缂栧彿", example = "300")
private Long clientId;
- @Schema(description = "瀹㈡埛缂栫爜", example = "C-001")
- @ExcelProperty("瀹㈡埛缂栫爜")
- private String clientCode;
@Schema(description = "瀹㈡埛鍚嶇О", example = "瀹㈡埛 A")
@ExcelProperty("瀹㈡埛鍚嶇О")
@@ -134,4 +172,19 @@
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
+ @Schema(description = "宸ュ簭杩涘害鍒楄〃")
+ private java.util.List<MesProWorkOrderProcessProgressVO> processProgressList;
+
+ @Schema(description = "鏄惁鎶ュ伐瀹℃壒")
+ @ExcelProperty("鏄惁鎶ュ伐瀹℃壒")
+ private Boolean feedbackApprove;
+
+ @Schema(description = "BPM 娴佺▼瀹氫箟 Key")
+ @ExcelProperty("BPM 娴佺▼瀹氫箟 Key")
+ private String processDefinitionKey;
+
+ @Schema(description = "鎶ュ伐瑙掕壊 (澶氫釜瑙掕壊閫楀彿鍒嗛殧)")
+ @ExcelProperty("鎶ュ伐瑙掕壊")
+ private String feedbackRole;
+
}
--
Gitblit v1.9.3