From 47c5bd416bf37769022e41402add8a41c2d09c96 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期一, 23 三月 2026 09:47:53 +0800
Subject: [PATCH] 1、生产工单搜索加上生产订单号搜索。 2、列表顺序除了按照优先级进行排序,还要根据工艺路线的工序的顺序进行排序,开始的排在前面

---
 src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java b/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
index bf8edae..2d9ae4e 100644
--- a/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
+++ b/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
@@ -2,12 +2,10 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.sales.pojo.CommonFile;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -75,4 +73,21 @@
      * 鎶ヤ慨閲戦
      */
     private BigDecimal maintenancePrice;
+    /**
+     * 鏄惁鍏ュ簱瀹℃牳閫氳繃
+     */
+    @ApiModelProperty(value = "鏄惁鍏ュ簱瀹℃牳閫氳繃")
+    private boolean inventoryReview;
+
+    /**
+     * 鍏ュ簱绫诲瀷锛堝悎鏍�/涓嶅悎鏍硷級
+     */
+    @ApiModelProperty(value = "鍏ュ簱绫诲瀷")
+    private String storageType;
+
+    /**
+     * 鍏ュ簱id
+     */
+    @ApiModelProperty(value = "鍏ュ簱id")
+    private Long recordId;
 }

--
Gitblit v1.9.3