From a5f66f55b2c176e8504b8a077e00acfe2dfb4b00 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 18 九月 2026 18:09:56 +0800
Subject: [PATCH] feat(生产报工): 报工完成按四类区分计数零件并分流质检入库
---
src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
index 0879617..ad13722 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
@@ -21,11 +21,20 @@
@Schema(description = "鎶ュ伐ID")
private Long productMainId;
+ @Schema(description = "鎶ュ伐鍗曞彿")
+ private String reportNo;
+
@Schema(description = "鎶ュ伐缁撴灉绫诲瀷锛�0鍚堟牸锛�1杞诲井杩斿伐锛�2涓ラ噸杩斿伐锛�3鎶ュ簾")
private Integer reportType;
+ @Schema(description = "鎶ュ伐缁撴灉绫诲瀷鍚嶇О")
+ private String reportTypeName;
+
@Schema(description = "瀹℃牳鐘舵�侊細0寰呭鏍革紝1瀹℃牳閫氳繃锛�2瀹℃牳涓嶉�氳繃")
private Integer auditStatus;
+
+ @Schema(description = "瀹℃牳鐘舵�佸悕绉�")
+ private String auditStatusName;
@Schema(description = "瀹℃牳鎰忚")
private String auditRemark;
@@ -45,8 +54,20 @@
@Schema(description = "鏁伴噺")
private BigDecimal quantity;
+ @Schema(description = "鎺掍骇鏁伴噺")
+ private BigDecimal schedulingNum;
+
+ @Schema(description = "寰呯敓浜ф暟閲�")
+ private BigDecimal pendingNum;
+
@Schema(description = "鎶ュ簾鏁伴噺")
private BigDecimal scrapQty;
+
+ @Schema(description = "杞诲井杩斿伐鏁伴噺")
+ private BigDecimal reworkMinorQty;
+
+ @Schema(description = "涓ラ噸杩斿伐鏁伴噺")
+ private BigDecimal reworkMajorQty;
@Schema(description = "浜у搧鍚嶇О")
private String productName;
@@ -72,12 +93,30 @@
@Schema(description = "宸ュ簭")
private String process;
+ @Schema(description = "宸ュ簭鏍囧噯鏁伴噺")
+ private java.math.BigDecimal standardQuantity;
+
@Schema(description = "宸ヨ祫瀹氶")
private BigDecimal workHours;
+ @Schema(description = "鎶樼畻宸ユ椂")
+ private BigDecimal convertedWorkHours;
+
@Schema(description = "宸ヨ祫")
private BigDecimal wages;
+ @Schema(description = "鍘熷伐璧�")
+ private BigDecimal originalWages;
+
+ @Schema(description = "琛ヤ慨鐞嗗伐鏃�")
+ private BigDecimal repairWorkHour;
+
+ @Schema(description = "宸ヨ祫淇閲戦")
+ private BigDecimal adjustAmount;
+
+ @Schema(description = "宸ヨ祫淇璇存槑")
+ private String adjustRemark;
+
@Schema(description = "宸ュ簭鍙傛暟鍒楄〃")
private List<ProductionOrderRoutingOperationParam> productionOperationParamList;
}
--
Gitblit v1.9.3