From 2f80b7085c4eabce06d3491306b75eecc275275f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 30 四月 2026 17:31:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/pojo/ProductionOrder.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
index 0f634bd..1f882b1 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
@@ -29,13 +29,10 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @Schema(description = "閿�鍞彴璐d")
- private Long salesLedgerId;
-
- @Schema(description = "鐢熶骇璁″垝ID鍒楄〃锛屾牸寮忥細[1,2,3]")
+ @Schema(description = "鐢熶骇璁″垝ID鍒楄〃锛屾牸寮忥細[1,2,3]銆傚鏋滄寜鐢熶骇璁″垝鐢熸垚璁㈠崟锛屾柊澧炴椂浼犺繖涓瓧娈靛嵆鍙紝绯荤粺浼氳嚜鍔ㄦ眹鎬讳骇鍝佽鏍煎拰鏁伴噺銆�")
private String productionPlanIds;
- @Schema(description = "浜у搧瑙勬牸id")
+ @Schema(description = "浜у搧瑙勬牸id銆傛墜鍔ㄦ柊澧炴椂蹇呭～锛涘鏋滀紶浜� productionPlanIds锛屽垯鍙敱绯荤粺鑷姩甯﹀嚭銆�")
private Long productModelId;
@Schema(description = "鐢熶骇璁㈠崟鍙�")
@@ -49,10 +46,10 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @Schema(description = "宸ヨ壓璺嚎id")
+ @Schema(description = "宸ヨ壓璺嚎id銆傛柊澧炴椂閫夊～锛屼笉浼犲垯绯荤粺鎸変骇鍝佽鏍艰嚜鍔ㄥ尮閰嶆渶鏂板伐鑹鸿矾绾裤��")
private Long technologyRoutingId;
- @Schema(description = "闇�姹傛暟閲�")
+ @Schema(description = "闇�姹傛暟閲忋�傛墜鍔ㄦ柊澧炴椂蹇呭～涓斿繀椤诲ぇ浜� 0锛涘鏋滀紶浜� productionPlanIds锛屽垯鍙敱绯荤粺鑷姩甯﹀嚭銆�")
private BigDecimal quantity;
@Schema(description = "瀹屾垚鏁伴噺")
@@ -63,9 +60,6 @@
@Schema(description = "缁撴潫鏃ユ湡")
private LocalDateTime endTime;
-
- @Schema(description = "閿�鍞骇鍝佽鏍糹d")
- private Integer saleLedgerProductId;
@Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
@@ -80,9 +74,10 @@
@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 = "寮哄害")
- private String strength;
+ @Schema(description = "鏄惁缁撴潫锛�")
+ @TableField("is_end_order")
+ private Boolean endOrder;
}
--
Gitblit v1.9.3