From 398551392afc2ab879f837f60f95f9c9d8cf3c98 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 27 四月 2026 13:08:24 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
index 0a061c0..fc36725 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
@@ -3,8 +3,6 @@
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -30,11 +28,11 @@
@Schema(description = "鐢熶骇璁㈠崟id")
private Long productionOrderId;
- @Schema(description = "宸ヨ壓璺嚎宸ュ簭琛╥d")
+ @Schema(description = "宸ヨ壓璺嚎宸ュ簭琛╥d(棰濆鏂板鐨勬椂鍊欒繖涓瓧娈垫槸绌虹殑)")
private Long technologyRoutingOperationId;
- @Schema(description = "宸ヨ壓璺嚎id")
- private Long technologyRoutingId;
+ @Schema(description = "鐢熶骇璁㈠崟宸ヨ壓璺嚎id")
+ private Long orderRoutingId;
@Schema(description = "浜у搧瑙勬牸id")
private Long productModelId;
@@ -53,6 +51,9 @@
@Schema(description = "鏄惁璐ㄦ宸ュ簭")
private Boolean isQuality;
+ @Schema(description = "鏄惁鐢熶骇")
+ private Boolean isProduction;
+
@Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
@@ -60,4 +61,10 @@
@Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
+
+ @Schema(description = "宸ュ簭鍚嶇О")
+ private String operationName;
+
+ @Schema(description = "宸ュ簭琛╥d")
+ private Long technologyOperationId;
}
--
Gitblit v1.9.3