From 098d9a5ac8e3ab5731dd6eb2a18a07441bf63f4c Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 25 六月 2026 13:14:30 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/home/controller/HomeController.java | 31 ++++++++++++++++---------------
src/main/java/com/ruoyi/production/enums/ProductOrderStatusEnum.java | 11 ++++++-----
src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java | 2 +-
3 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index 48a2185..35c3954 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -61,7 +61,8 @@
private static final Integer ORDER_STATUS_WAIT = 1;
private static final Integer ORDER_STATUS_RUNNING = 2;
private static final Integer ORDER_STATUS_COMPLETED = 3;
- private static final Integer ORDER_STATUS_PAUSED = 4;
+ //private static final Integer ORDER_STATUS_END = 4; // 宸插彇娑�
+ private static final Integer ORDER_STATUS_END = 5;
/********************************************************鍩虹绫�*****************************************************/
@GetMapping("/todos")
@@ -260,7 +261,7 @@
}
Integer statusFromParam = parseOrderStatus(status);
if (!isBlank(status) && statusFromParam == null && !"all".equalsIgnoreCase(status.trim())) {
- return R.fail("status鍙傛暟涓嶅悎娉曪紝鍙�夊�硷細all/waiting/inProgress/completed/paused 鎴� 1/2/3/4");
+ return R.fail("status鍙傛暟涓嶅悎娉曪紝鍙�夊�硷細all/waiting/inProgress/completed/end 鎴� 1/2/3/5");
}
Integer queryStatus = resolveOrderStatus(status, tab);
@@ -282,7 +283,7 @@
long waitingCount = 0L;
long inProgressCount = 0L;
long completedCount = 0L;
- long pausedCount = 0L;
+ long endCount = 0L;
List<Map<String, Object>> statusCountRows = productionOrderMapper.countHomeOrderProgressByStatus(startTime, endTime);
if (statusCountRows != null) {
for (Map<String, Object> countRow : statusCountRows) {
@@ -294,8 +295,8 @@
inProgressCount = cnt;
} else if (Objects.equals(statusKey, ORDER_STATUS_COMPLETED)) {
completedCount = cnt;
- } else if (Objects.equals(statusKey, ORDER_STATUS_PAUSED)) {
- pausedCount = cnt;
+ } else if (Objects.equals(statusKey, ORDER_STATUS_END)) {
+ endCount = cnt;
}
}
}
@@ -310,7 +311,7 @@
result.put("waitingCount", waitingCount);
result.put("inProgressCount", inProgressCount);
result.put("completedCount", completedCount);
- result.put("pausedCount", pausedCount);
+ result.put("endCount", endCount);
result.put("records", records);
return R.ok(result);
}
@@ -530,8 +531,8 @@
if ("3".equals(normalized) || "completed".equals(normalized)) {
return ORDER_STATUS_COMPLETED;
}
- if ("4".equals(normalized) || "paused".equals(normalized)) {
- return ORDER_STATUS_PAUSED;
+ if ("5".equals(normalized) || "end".equals(normalized)) {
+ return ORDER_STATUS_END;
}
return null;
}
@@ -543,8 +544,8 @@
if (Objects.equals(status, ORDER_STATUS_COMPLETED)) {
return "completed";
}
- if (Objects.equals(status, ORDER_STATUS_PAUSED)) {
- return "paused";
+ if (Objects.equals(status, ORDER_STATUS_END)) {
+ return "end";
}
if (Objects.equals(status, ORDER_STATUS_WAIT)) {
return "waiting";
@@ -562,8 +563,8 @@
if (Objects.equals(status, ORDER_STATUS_COMPLETED)) {
return "completed";
}
- if (Objects.equals(status, ORDER_STATUS_PAUSED)) {
- return "paused";
+ if (Objects.equals(status, ORDER_STATUS_END)) {
+ return "end";
}
return "all";
}
@@ -578,8 +579,8 @@
if (Objects.equals(status, ORDER_STATUS_COMPLETED)) {
return "宸插畬鎴�";
}
- if (Objects.equals(status, ORDER_STATUS_PAUSED)) {
- return "宸叉殏鍋�";
+ if (Objects.equals(status, ORDER_STATUS_END)) {
+ return "宸茬粨鏉�";
}
return "鏈煡";
}
@@ -636,7 +637,7 @@
.select(ProductionOrder::getQuantity, ProductionOrder::getCompleteQuantity)
.ge(ProductionOrder::getCreateTime, day.atStartOfDay())
.lt(ProductionOrder::getCreateTime, day.plusDays(1).atStartOfDay())
- .ne(ProductionOrder::getStatus, ORDER_STATUS_PAUSED));
+ .ne(ProductionOrder::getStatus, ORDER_STATUS_END));
BigDecimal totalQuantity = BigDecimal.ZERO;
BigDecimal totalCompleteQuantity = BigDecimal.ZERO;
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
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
index 5c103b8..1905d4a 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -1134,7 +1134,7 @@
@Override
public int updateOrder(ProductionOrderDto productionOrderDto) {
// 鏇存柊鐢熶骇璁㈠崟涓绘暟鎹�
- productionOrderDto.setStatus(5);
+ productionOrderDto.setStatus(ProductOrderStatusEnum.END.getCode());
return baseMapper.updateById(productionOrderDto);
}
}
--
Gitblit v1.9.3