From 3a959bff4721bfdbe60c1e7c5ba3c9851ac0d3f8 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 25 三月 2026 15:15:45 +0800
Subject: [PATCH] Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_长治_健齿齿科器材

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

diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index f4ebe75..2ab2b2a 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
@@ -1,6 +1,5 @@
 package com.ruoyi.production.dto;
 
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.production.pojo.ProductWorkOrder;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,6 +23,8 @@
     @ApiModelProperty(value = "宸ュ簭")
     private String processName;
 
+    private Long processId;
+
     //鍗曚綅
     @ApiModelProperty(value = "鍗曚綅")
     private String unit;
@@ -35,4 +36,12 @@
 
     @ApiModelProperty(value = "瀹屾垚杩涘害")
     private BigDecimal completionStatus;
+
+    @ApiModelProperty(value = "鎶ュ簾鏁伴噺")
+    private BigDecimal scrapQty;
+
+    @ApiModelProperty(value = "宸ュ崟绫诲瀷 姝e父 /杩斿伐杩斾慨")
+    private String workOrderType;
+
+    private String uidNo;
 }

--
Gitblit v1.9.3