From a3976574426c68495e41b586280745c092112950 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 19 三月 2026 17:30:34 +0800
Subject: [PATCH] fix: 工序参数与基础参数表取消关联
---
src/main/java/com/ruoyi/production/pojo/ProductOrder.java | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
index 70c82d8..a7479fc 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
@@ -10,33 +10,18 @@
import java.io.Serializable;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.List;
@Data
@TableName("product_order")
-public class ProductOrder implements Serializable {
+public class ProductOrder implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
-
- /**
- * 閿�鍞彴璐d
- */
- @ApiModelProperty(value = "閿�鍞彴璐d")
- private Long salesLedgerId;
-
- /**
- * 閿�鍞彴璐︿骇鍝乮d(sales_ledger_product)
- */
- private Long saleLedgerProductId;
-
- /**
- * 閿�鍞彴璐︿骇鍝乮d(sales_ledger_product)
- */
- @ApiModelProperty(value = "閿�鍞彴璐︿骇鍝乮d")
- private Long productModelId;
/**
* 妯＄増鐨勫伐鑹鸿矾绾縤d
@@ -50,6 +35,14 @@
@ApiModelProperty(value = "鐢熶骇璁㈠崟鍙�")
@Excel(name = "鐢熶骇璁㈠崟鍙�")
private String npsNo;
+
+ /**
+ * 璁″垝瀹屾垚鏃堕棿
+ */
+ @ApiModelProperty(value = "璁″垝瀹屾垚鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate planCompleteTime;
/**
* 绉熸埛id
@@ -72,7 +65,6 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
-
/**
* 闇�姹傛暟閲�
@@ -100,6 +92,10 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
+ @Excel(name = "浜у搧绫诲瀷")
+ @ApiModelProperty("浜у搧绫诲瀷")
+ private String strength;
-
+ @ApiModelProperty(value = "鐘舵�侊紙1.寰呭紑濮嬨��2.杩涜涓��3.宸插畬鎴愩��4.宸插彇娑堬級")
+ private Integer status;
}
--
Gitblit v1.9.3