From 741918a903e17b2ec7522556d2c043b8d35dd8a1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 15 六月 2026 17:42:58 +0800
Subject: [PATCH] 生产取消bom,不合格管理定制化
---
src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java b/src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java
index edcd62f..8fd92d2 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java
@@ -1,12 +1,13 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
+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;
/**
@@ -28,8 +29,8 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @Schema(description = "宸ヨ壓璺嚎宸ュ簭琛╥d")
- private Long technologyRoutingOperationId;
+ @Schema(description = "鐢熶骇宸ヨ壓璺嚎宸ュ簭琛╥d")
+ private Long productionOrderRoutingOperationId;
@Schema(description = "褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@@ -43,16 +44,24 @@
private String workOrderNo;
@Schema(description = "璁″垝寮�濮嬫椂闂�")
- private LocalDate planStartTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime planStartTime;
@Schema(description = "璁″垝缁撴潫鏃堕棿")
- private LocalDate planEndTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime planEndTime;
@Schema(description = "瀹為檯寮�濮嬫椂闂�")
- private LocalDate actualStartTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime actualStartTime;
@Schema(description = "瀹為檯缁撴潫鏃堕棿")
- private LocalDate actualEndTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime actualEndTime;
@Schema(description = "鐘舵�� 1 寰呯‘璁� 2 寰呯敓浜� 3鐢熶骇涓� 4宸茬敓浜�")
private Integer status;
@@ -73,4 +82,7 @@
@Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
+
+ @Schema(description = "鏉冮檺鐢ㄦ埛ID鍒楄〃锛屾牸寮忥細[1,2,3]銆傛寚瀹氬涓敤鎴稩D鏃讹紝鐢ㄩ�楀彿鍒嗛殧銆�")
+ private String userIds;
}
--
Gitblit v1.9.3