From 6f0df10fdd0e55e5ed3e31b1720efd25e2bf02fb Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 16 九月 2026 18:51:12 +0800
Subject: [PATCH] fix: 添加条件过滤以确保查询结果中合格数量大于零
---
src/main/java/com/ruoyi/production/enums/ProductOrderStatusEnum.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/enums/ProductOrderStatusEnum.java b/src/main/java/com/ruoyi/production/enums/ProductOrderStatusEnum.java
index 631b2b0..5ad55c3 100644
--- a/src/main/java/com/ruoyi/production/enums/ProductOrderStatusEnum.java
+++ b/src/main/java/com/ruoyi/production/enums/ProductOrderStatusEnum.java
@@ -17,8 +17,7 @@
WAIT(1, "寰呭紑濮�"),
RUNNING(2, "杩涜涓�"),
FINISHED(3, "宸插畬鎴�"),
- //CANCEL(4, "宸插彇娑�"),
- END(5, "宸茬粨鏉�");
+ CANCEL(4, "宸插彇娑�");
private final Integer code;
private final String desc;
@@ -44,10 +43,10 @@
}
/**
- * 鍒ゆ柇鏄惁鍏佽鍒犻櫎锛�1锛�
+ * 鍒ゆ柇鏄惁鍏佽鍒犻櫎锛�4锛�
*/
public static boolean canDelete(Integer code) {
- return WAIT.getCode().equals(code);
+ return WAIT.getCode().equals(code) || CANCEL.getCode().equals(code);
}
/**
@@ -58,9 +57,9 @@
}
/**
- * 鍒ゆ柇鏄惁宸插紑濮嬬敓浜э紙2銆�3銆�5锛�
+ * 鍒ゆ柇鏄惁宸插紑濮嬬敓浜э紙2銆�3锛�
*/
public static boolean isStarted(Integer code) {
- return RUNNING.getCode().equals(code) || FINISHED.getCode().equals(code) || END.getCode().equals(code);
+ return RUNNING.getCode().equals(code) || FINISHED.getCode().equals(code);
}
}
\ No newline at end of file
--
Gitblit v1.9.3