From 47596a855703fbb57e9c4feaf05b601ec07854ef Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期六, 09 五月 2026 11:41:58 +0800
Subject: [PATCH] fix:1.退料审核 2.工序加上工时-生产订单-报工填写 3.核算加上工时计算

---
 src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
index 2a9ffae..d784109 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
@@ -28,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;
@@ -64,4 +64,10 @@
 
     @Schema(description = "宸ュ簭鍚嶇О")
     private String operationName;
+
+    @Schema(description = "宸ュ簭琛╥d")
+    private Long technologyOperationId;
+
+    @Schema(description = "绫诲瀷 鍖哄垎璁℃椂鍜岃浠讹紝0璁℃椂锛�1璁′欢")
+    private Integer type;
 }

--
Gitblit v1.9.3