From d2e11d8ef4eccf41ae0fadc2bd57317308ca0b64 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 12 二月 2025 16:54:13 +0800
Subject: [PATCH] 修改物料库存不分页
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
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 eba39bb..18b58f6 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
@@ -31,6 +31,8 @@
import java.util.*;
import java.util.stream.Collectors;
+import static org.apache.coyote.http11.Constants.a;
+
@Service
@DS("sd")
@Transactional(rollbackFor = Exception.class)
@@ -165,7 +167,7 @@
private String getOrderId(String dateType){
String orderId = null;
- if(dateType.equals("day")){
+ if(dateType==null || dateType.equals("day")){
Integer maxOrderId = orderMapper.selectMaxOrderId();
//鏌ヨ璁㈠崟id锛屽苟涓旇嚜澧�
String formattedNumber = String.format("%02d", maxOrderId+1);
@@ -316,7 +318,7 @@
}
//鏌ヨ鑾峰彇鍒楄〃
- public Map<String,Object> getOrderList(Integer pageNum, Integer pageSize, List<String> selectDate, Order order,Integer orderType) {
+ public Map<String,Object> getOrderList(Integer pageNum, Integer pageSize, List<String> selectDate, Map<String,Object> config,Integer orderType) {
Integer offset = (pageNum-1)*pageSize;
String endDate = LocalDate.now().toString();
String startDate = LocalDate.now().minusDays(15).toString();
@@ -328,9 +330,15 @@
endDate = selectDate.get(1);
}
}
+ JSONObject orderJson = new JSONObject(config);
+ Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("filter")), Order.class);
+ Map<String,String> sortDate = (Map<String, String>) config.get("sort");
+ String field = sortDate.get("field").replaceAll("(?<!^)([A-Z])", "_$1").toLowerCase();
+ String orderBy = sortDate.get("order");
+ System.out.println(field+" "+orderBy);
Map<String,Object> map = new HashMap<>();
- map.put("data",orderMapper.getOrderList(offset, pageSize, startDate, endDate, order,orderType));
+ map.put("data",orderMapper.getOrderList(offset, pageSize, startDate, endDate, order,orderType, field, orderBy));
map.put("total",orderMapper.getPageTotal(offset, pageSize, startDate, endDate, order,orderType));
List<String> list = new ArrayList<>();
list.add(startDate);
@@ -797,4 +805,8 @@
}
return saveState;
}
+
+ public Boolean selectDifferentSize(String orderId) {
+ return !orderMapper.selectDifferentSize(orderId).isEmpty();
+ }
}
--
Gitblit v1.8.0