From 2f58ddd5085b9e51bcc4b7e1ad2e850a95e43bbd Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 11 三月 2026 17:42:59 +0800
Subject: [PATCH] feat: 同步物料编码数据
---
src/main/java/com/ruoyi/production/pojo/ProductOrder.java | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 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..0e06718 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
@@ -11,6 +11,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
@Data
@TableName("product_order")
@@ -20,23 +21,6 @@
@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 +34,20 @@
@ApiModelProperty(value = "鐢熶骇璁㈠崟鍙�")
@Excel(name = "鐢熶骇璁㈠崟鍙�")
private String npsNo;
+
+ /**
+ * 鍚堝苟鐢熶骇璁″垝ids
+ */
+ @ApiModelProperty(value = "鍚堝苟鐢熶骇璁″垝ids")
+ private String combineProductionPlanIds;
+
+ /**
+ * 璁″垝瀹屾垚鏃堕棿
+ */
+ @ApiModelProperty(value = "璁″垝瀹屾垚鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime planCompleteTime;
/**
* 绉熸埛id
@@ -72,7 +70,6 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
-
/**
* 闇�姹傛暟閲�
@@ -99,7 +96,4 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
-
-
-
}
--
Gitblit v1.9.3