From a3c54410de03f0fd242e1a1118d6471300cf1eda Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 30 四月 2026 17:36:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/pojo/ProductionOrder.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
index cb801b5..1f882b1 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
@@ -29,9 +29,6 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @Schema(description = "閿�鍞彴璐d銆傜敓浜т笅鍗曟帴鍙ｉ�氬父涓嶉渶瑕佸墠绔墜宸ュ～鍐欙紝瀛樺湪閿�鍞潵婧愭椂鐢辩郴缁熷唴閮ㄥ洖濉��")
- private Long salesLedgerId;
-
@Schema(description = "鐢熶骇璁″垝ID鍒楄〃锛屾牸寮忥細[1,2,3]銆傚鏋滄寜鐢熶骇璁″垝鐢熸垚璁㈠崟锛屾柊澧炴椂浼犺繖涓瓧娈靛嵆鍙紝绯荤粺浼氳嚜鍔ㄦ眹鎬讳骇鍝佽鏍煎拰鏁伴噺銆�")
private String productionPlanIds;
@@ -64,9 +61,6 @@
@Schema(description = "缁撴潫鏃ユ湡")
private LocalDateTime endTime;
- @Schema(description = "閿�鍞骇鍝佽鏍糹d銆傜敓浜т笅鍗曟帴鍙ｄ竴鑸笉浣滀负鍓嶇蹇呭～椤癸紝瀛樺湪閿�鍞潵婧愭椂鐢辩郴缁熷唴閮ㄥ叧鑱斻��")
- private Integer saleLedgerProductId;
-
@Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
@@ -75,11 +69,15 @@
@TableField(fill = FieldFill.INSERT)
private Long deptId;
- @Schema(description = "璁″垝瀹屾垚鏃堕棿銆傞�夊～锛涙寜鐢熶骇璁″垝鐢熸垚璁㈠崟鏃讹紝绯荤粺浼氫紭鍏堣嚜鍔ㄥ甫鍑轰氦鏈熴��")
+ @Schema(description = "璁″垝瀹屾垚鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate planCompleteTime;
- @Schema(description = "鐘舵�侊紙1.寰呭紑濮嬨��2.杩涜涓��3.宸插畬鎴愩��4.宸插彇娑堬級")
+ @Schema(description = "鐘舵�侊紙1.寰呭紑濮� 2.杩涜涓� 3.宸插畬鎴� 4.宸插彇娑� 5.宸茬粨鏉燂級")
private Integer status;
+
+ @Schema(description = "鏄惁缁撴潫锛�")
+ @TableField("is_end_order")
+ private Boolean endOrder;
}
--
Gitblit v1.9.3