From e529b1dd89b5f2927457a284e660d489b9aa8cc8 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 01 四月 2026 11:24:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材

---
 src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index 73920e9..35e8711 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
@@ -23,6 +23,8 @@
     @ApiModelProperty(value = "宸ュ簭")
     private String processName;
 
+    private Long processId;
+
     //鍗曚綅
     @ApiModelProperty(value = "鍗曚綅")
     private String unit;
@@ -31,6 +33,7 @@
     //鐢熶骇璁㈠崟鍙�
     @ApiModelProperty(value = "鐢熶骇璁㈠崟鍙�")
     private String productOrderNpsNo;
+    private Boolean productOrderIsEnd;
 
     @ApiModelProperty(value = "瀹屾垚杩涘害")
     private BigDecimal completionStatus;
@@ -42,4 +45,7 @@
     private String workOrderType;
 
     private String uidNo;
+
+    @ApiModelProperty(value = "棰嗘枡璁板綍")
+    private String drawMaterials;
 }

--
Gitblit v1.9.3