From 6bacf93d628a974bb4882029e3a8847d5715572f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 25 六月 2026 15:19:38 +0800
Subject: [PATCH] feat(purchase): 采购添加实际合同金额字段并实现退货扣减逻辑
---
src/main/java/com/ruoyi/production/enums/ProductOrderStatusEnum.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/enums/ProductOrderStatusEnum.java b/src/main/java/com/ruoyi/production/enums/ProductOrderStatusEnum.java
index 5ad55c3..631b2b0 100644
--- a/src/main/java/com/ruoyi/production/enums/ProductOrderStatusEnum.java
+++ b/src/main/java/com/ruoyi/production/enums/ProductOrderStatusEnum.java
@@ -17,7 +17,8 @@
WAIT(1, "寰呭紑濮�"),
RUNNING(2, "杩涜涓�"),
FINISHED(3, "宸插畬鎴�"),
- CANCEL(4, "宸插彇娑�");
+ //CANCEL(4, "宸插彇娑�"),
+ END(5, "宸茬粨鏉�");
private final Integer code;
private final String desc;
@@ -43,10 +44,10 @@
}
/**
- * 鍒ゆ柇鏄惁鍏佽鍒犻櫎锛�4锛�
+ * 鍒ゆ柇鏄惁鍏佽鍒犻櫎锛�1锛�
*/
public static boolean canDelete(Integer code) {
- return WAIT.getCode().equals(code) || CANCEL.getCode().equals(code);
+ return WAIT.getCode().equals(code);
}
/**
@@ -57,9 +58,9 @@
}
/**
- * 鍒ゆ柇鏄惁宸插紑濮嬬敓浜э紙2銆�3锛�
+ * 鍒ゆ柇鏄惁宸插紑濮嬬敓浜э紙2銆�3銆�5锛�
*/
public static boolean isStarted(Integer code) {
- return RUNNING.getCode().equals(code) || FINISHED.getCode().equals(code);
+ return RUNNING.getCode().equals(code) || FINISHED.getCode().equals(code) || END.getCode().equals(code);
}
}
\ No newline at end of file
--
Gitblit v1.9.3