From 0989ec1e6b465141f99ed67e40fa2a0b928dce94 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 29 四月 2026 16:54:51 +0800
Subject: [PATCH] feat(production): 新增生产核算和生产工单功能模块 - 添加生产核算控制器、服务接口及实现类 - 实现生产核算分页查询和工人生产工资信息查询功能 - 添加生产工单控制器、服务接口及实现类 - 实现生产工单的增删改查和状态统计功能 - 集成工单流转卡下载和二维码生成功能 - 添加工单相关的数据传输对象和值对象 - 实现工单与用户关联的分配功能 - 完善工单附件图片处理和展示功能
---
src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 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 1721e81..9fc8d86 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
@@ -12,57 +12,63 @@
@EqualsAndHashCode(callSuper = true)
@Data
-@Schema(name = "ProductionProductMainDto", description = "鐢熶骇鎶ュ伐鏌ヨ瀵硅薄")
+@Schema(name = "ProductionProductMainDto", description = "production report query dto")
public class ProductionProductMainDto extends ProductionProductMain {
- @Schema(description = "浜у搧宸ヨ壓璺嚎鏄庣粏ID")
+ @Schema(description = "product process route item id")
private Long productProcessRouteItemId;
- @Schema(description = "鐢熶骇鎶ュ伐琛╥d")
+ @Schema(description = "production report id")
private Long productMainId;
- @Schema(description = "绉熸埛ID")
+ @Schema(description = "tenant id")
private Long tenantId;
- @Schema(description = "宸ュ崟缂栧彿")
+ @Schema(description = "work order no")
private String workOrderNo;
- @Schema(description = "宸ュ崟鐘舵��")
+ @Schema(description = "work order status")
private String workOrderStatus;
- @Schema(description = "鏄电О")
+ @Schema(description = "nick name")
private String nickName;
- @Schema(description = "鏁伴噺")
+ @Schema(description = "quantity")
private BigDecimal quantity;
- @Schema(description = "鎶ュ簾鏁伴噺")
+ @Schema(description = "scrap quantity")
private BigDecimal scrapQty;
- @Schema(description = "浜у搧鍚嶇О")
+ @Schema(description = "product name")
private String productName;
- @Schema(description = "浜у搧鍨嬪彿鍚嶇О")
+ @Schema(description = "product model name")
private String productModelName;
- @Schema(description = "鍗曚綅")
+ @Schema(description = "unit")
private String unit;
- @Schema(description = "閿�鍞悎鍚岀紪鍙�")
+ @Schema(description = "sales contract no")
private String salesContractNo;
- @Schema(description = "鎺掍骇鏃ユ湡")
+ @Schema(description = "scheduling date")
private LocalDate schedulingDate;
- @Schema(description = "鎺掍骇浜哄憳鍚嶇О")
+ @Schema(description = "scheduling user name")
private String schedulingUserName;
- @Schema(description = "瀹㈡埛鍚嶇О")
+ @Schema(description = "customer name")
private String customerName;
- @Schema(description = "宸ュ簭")
+ @Schema(description = "process")
private String process;
- @Schema(description = "宸ュ簭鍙傛暟鍒楄〃")
+ @Schema(description = "salary quota")
+ private BigDecimal workHours;
+
+ @Schema(description = "wages")
+ private BigDecimal wages;
+
+ @Schema(description = "operation param list")
private List<ProductionOrderRoutingOperationParam> productionOperationParamList;
}
--
Gitblit v1.9.3