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/pojo/ProductionOrder.java | 52 +++++++++++++++++++++++++++-------------------------
1 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
index 5fcab22..c7415b5 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
@@ -1,13 +1,14 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -18,10 +19,9 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-04-21 03:55:52
*/
-@Getter
-@Setter
+@Data
@TableName("production_order")
-@ApiModel(value = "ProductionOrder瀵硅薄", description = "鐢熶骇璁㈠崟琛�")
+@Schema(name = "ProductionOrder瀵硅薄", description = "鐢熶骇璁㈠崟琛�")
public class ProductionOrder implements Serializable {
private static final long serialVersionUID = 1L;
@@ -29,49 +29,51 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("閿�鍞彴璐d")
- private Long salesLedgerId;
-
- @ApiModelProperty("鐢熶骇璁″垝ID鍒楄〃锛屾牸寮忥細[1,2,3]")
+ @Schema(description = "鐢熶骇璁″垝ID鍒楄〃锛屾牸寮忥細[1,2,3]銆傚鏋滄寜鐢熶骇璁″垝鐢熸垚璁㈠崟锛屾柊澧炴椂浼犺繖涓瓧娈靛嵆鍙紝绯荤粺浼氳嚜鍔ㄦ眹鎬讳骇鍝佽鏍煎拰鏁伴噺銆�")
private String productionPlanIds;
- @ApiModelProperty("浜у搧瑙勬牸id")
+ @Schema(description = "浜у搧瑙勬牸id銆傛墜鍔ㄦ柊澧炴椂蹇呭～锛涘鏋滀紶浜� productionPlanIds锛屽垯鍙敱绯荤粺鑷姩甯﹀嚭銆�")
private Long productModelId;
- @ApiModelProperty("鐢熶骇璁㈠崟鍙�")
+ @Schema(description = "鐢熶骇璁㈠崟鍙�")
private String npsNo;
- @ApiModelProperty("褰曞叆鏃堕棿")
+ @Schema(description = "褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("宸ヨ壓璺嚎id")
+ @Schema(description = "宸ヨ壓璺嚎id銆傛柊澧炴椂閫夊～锛屼笉浼犲垯绯荤粺鎸変骇鍝佽鏍艰嚜鍔ㄥ尮閰嶆渶鏂板伐鑹鸿矾绾裤��")
private Long technologyRoutingId;
- @ApiModelProperty("闇�姹傛暟閲�")
+ @Schema(description = "闇�姹傛暟閲忋�傛墜鍔ㄦ柊澧炴椂蹇呭～涓斿繀椤诲ぇ浜� 0锛涘鏋滀紶浜� productionPlanIds锛屽垯鍙敱绯荤粺鑷姩甯﹀嚭銆�")
private BigDecimal quantity;
- @ApiModelProperty("瀹屾垚鏁伴噺")
+ @Schema(description = "瀹屾垚鏁伴噺")
private BigDecimal completeQuantity;
- @ApiModelProperty("寮�濮嬫棩鏈�")
+ @Schema(description = "寮�濮嬫棩鏈�")
private LocalDateTime startTime;
- @ApiModelProperty("缁撴潫鏃ユ湡")
+ @Schema(description = "缁撴潫鏃ユ湡")
private LocalDateTime endTime;
- @ApiModelProperty("閿�鍞骇鍝佽鏍糹d")
- private Integer saleLedgerProductId;
-
- @ApiModelProperty("鍒涘缓浜篒D")
+ @Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
+
+ @Schema(description = "璁″垝瀹屾垚鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate planCompleteTime;
+
+ @Schema(description = "鐘舵�侊紙1.寰呭紑濮� 2.杩涜涓� 3.宸插畬鎴� 4.宸插彇娑堬級")
+ private Integer status;
}
--
Gitblit v1.9.3