From 35968d7e3a392e19c5593bd31422570812885d22 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 20 十一月 2025 16:01:31 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue | 3 +++
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue b/north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue
index e0dc2ac..605f541 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue
@@ -242,6 +242,7 @@
gridOptions.loading=false
}else{
ElMessage.warning(t('basicData.msg.reviewFail'))
+ gridOptions.loading=false
}
})
}
@@ -270,6 +271,7 @@
gridOptions.loading=false
}else{
ElMessage.warning(t('basicData.msg.deleteFail'))
+ gridOptions.loading=false
}
})
}
@@ -330,6 +332,7 @@
gridOptions.loading=false
}else{
ElMessage.warning(res.msg)
+ gridOptions.loading=false
router.push("/login")
}
})
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index 8b49f36..7a52023 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -587,7 +587,7 @@
public Map<String,Object> getOrderReport(Integer pageNum, Integer pageSize, List<String> selectDate, OrderDetail orderDetail, Integer model, Integer scope) {
Integer offset = (pageNum-1)*pageSize;
String endDate = LocalDate.now().toString();
- String startDate = LocalDate.now().minusDays(15).toString();
+ String startDate = LocalDate.now().minusDays(30).toString();
if(selectDate !=null && selectDate.size()==2){
if(!selectDate.get(0).isEmpty()){
startDate = selectDate.get(0);
@@ -614,7 +614,7 @@
public Map<String,Object> getOrderSummaryReport(Integer pageNum, Integer pageSize, List<String> selectDate, Order order) {
Integer offset = (pageNum-1)*pageSize;
String endDate = LocalDate.now().toString();
- String startDate = LocalDate.now().minusDays(15).toString();
+ String startDate = LocalDate.now().minusDays(30).toString();
if(selectDate !=null && selectDate.size()==2){
if(!selectDate.get(0).isEmpty()){
startDate = selectDate.get(0);
@@ -642,7 +642,7 @@
public Map<String,Object> getOrderProductSummary(Integer pageNum, Integer pageSize, List<String> selectDate, OrderDetail orderDetail) {
Integer offset = (pageNum-1)*pageSize;
String endDate = LocalDate.now().toString();
- String startDate = LocalDate.now().minusDays(15).toString();
+ String startDate = LocalDate.now().minusDays(30).toString();
if(selectDate !=null && selectDate.size()==2){
if(!selectDate.get(0).isEmpty()){
startDate = selectDate.get(0);
--
Gitblit v1.8.0