From fe1b02a121c173e9b2d56bbe5a1982e0e69e0548 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 28 四月 2026 18:06:08 +0800
Subject: [PATCH] feat(production): 新增生产工单管理功能 - 创建 ProductionOperationTask 实体类定义工单数据结构 - 实现 ProductionOperationTaskController 提供工单的增删改查接口 - 开发 ProductionOperationTaskService 和实现类处理业务逻辑 - 配置 ProductionOperationTaskMapper 及 XML 文件实现数据库操作 - 添加 ProductionOperationTaskVo 视图对象用于数据展示 - 扩展 ProductionOrder 实体类增加生产订单相关属性 - 更新 ProductionOrderMapper.xml 完善订单查询映射配置 - 优化 ProductionOrderPickRecordMapper.xml 记录物料领取明细 - 新增 ProductionOrderRoutingOperationParam 参数配置实体 - 完善 工序参数处理逻辑
---
src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java | 89 ++++++++++++++++++++++----------------------
1 files changed, 45 insertions(+), 44 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 26ef072..1721e81 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
@@ -1,67 +1,68 @@
package com.ruoyi.production.bean.dto;
-import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.production.pojo.ProductionOrderRoutingOperationParam;
+import com.ruoyi.production.pojo.ProductionProductMain;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.List;
+@EqualsAndHashCode(callSuper = true)
@Data
-public class ProductionProductMainDto {
- @ApiModelProperty("涓婚敭ID")
- private Long id;
- @ApiModelProperty("浜у搧缂栧彿")
- private String productNo;
- @ApiModelProperty("鐢ㄦ埛ID")
- private Long userId;
- @ApiModelProperty("鐢ㄦ埛鍚嶇О")
- private String userName;
- @ApiModelProperty("浜у搧宸ヨ壓璺嚎鏄庣粏ID")
- private Long productProcessRouteItemId;
- @ApiModelProperty("宸ュ崟ID")
- private Long workOrderId;
- @ApiModelProperty("鐢熶骇宸ュ簭浠诲姟ID")
- private Long productionOperationTaskId;
- @ApiModelProperty("鐘舵��")
- private Integer status;
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
- private LocalDateTime updateTime;
- @ApiModelProperty("绉熸埛ID")
- private Long tenantId;
- @ApiModelProperty("鍒涘缓浜�")
- private Integer createUser;
- @ApiModelProperty("鏇存柊浜�")
- private Integer updateUser;
- @ApiModelProperty("閮ㄩ棬ID")
- private Long deptId;
+@Schema(name = "ProductionProductMainDto", description = "鐢熶骇鎶ュ伐鏌ヨ瀵硅薄")
+public class ProductionProductMainDto extends ProductionProductMain {
- @ApiModelProperty("宸ュ崟缂栧彿")
+ @Schema(description = "浜у搧宸ヨ壓璺嚎鏄庣粏ID")
+ private Long productProcessRouteItemId;
+
+ @Schema(description = "鐢熶骇鎶ュ伐琛╥d")
+ private Long productMainId;
+
+ @Schema(description = "绉熸埛ID")
+ private Long tenantId;
+
+ @Schema(description = "宸ュ崟缂栧彿")
private String workOrderNo;
- @ApiModelProperty("宸ュ崟鐘舵��")
+
+ @Schema(description = "宸ュ崟鐘舵��")
private String workOrderStatus;
- @ApiModelProperty("鏄电О")
+
+ @Schema(description = "鏄电О")
private String nickName;
- @ApiModelProperty("鏁伴噺")
+
+ @Schema(description = "鏁伴噺")
private BigDecimal quantity;
- @ApiModelProperty("鎶ュ簾鏁伴噺")
+
+ @Schema(description = "鎶ュ簾鏁伴噺")
private BigDecimal scrapQty;
- @ApiModelProperty("浜у搧鍚嶇О")
+
+ @Schema(description = "浜у搧鍚嶇О")
private String productName;
- @ApiModelProperty("浜у搧鍨嬪彿鍚嶇О")
+
+ @Schema(description = "浜у搧鍨嬪彿鍚嶇О")
private String productModelName;
- @ApiModelProperty("鍗曚綅")
+
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("閿�鍞悎鍚岀紪鍙�")
+
+ @Schema(description = "閿�鍞悎鍚岀紪鍙�")
private String salesContractNo;
- @ApiModelProperty("鎺掍骇鏃ユ湡")
+
+ @Schema(description = "鎺掍骇鏃ユ湡")
private LocalDate schedulingDate;
- @ApiModelProperty("鎺掍骇浜哄憳鍚嶇О")
+
+ @Schema(description = "鎺掍骇浜哄憳鍚嶇О")
private String schedulingUserName;
- @ApiModelProperty("瀹㈡埛鍚嶇О")
+
+ @Schema(description = "瀹㈡埛鍚嶇О")
private String customerName;
- @ApiModelProperty("宸ュ簭")
+
+ @Schema(description = "宸ュ簭")
private String process;
+
+ @Schema(description = "宸ュ簭鍙傛暟鍒楄〃")
+ private List<ProductionOrderRoutingOperationParam> productionOperationParamList;
}
--
Gitblit v1.9.3