From 54faafd8252079de27ca75e9ccb825a0fccd9c43 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 05 三月 2025 10:32:19 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java
index a317edc..6a16701 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java
@@ -14,12 +14,14 @@
boolean updateOrderParameter(@Param("orderId") String orderId);
- List<Order> getOrderList(Integer offset, Integer pageSize, String startDate, String endDate, Order order, Integer orderType);
- Map<String,Integer> getPageTotal(Integer offset, Integer pageSize, String startDate, String endDate, Order order , Integer orderType);
+ List<Order> getOrderList(Integer offset, Integer pageSize, String startDate, String endDate, Order order, Integer orderType, String field, String orderBy);
+ Map<String,Float> getPageTotal(Integer offset, Integer pageSize, String startDate, String endDate, Order order , Integer orderType);
boolean reviewOrderById(String id, Integer status, String userId, String userName);
boolean reviewOrderByIds(String id, Integer status, String userId, String userName);
+
+ boolean backReviewOrderById(String id);
boolean reviewProcessById(String id, Integer status);
@@ -27,5 +29,30 @@
Integer cancelOrder(String id);
- Integer selectOrder(@Param("order") Order order);
+ List<Order> selectOrder(@Param("order") Order order);
+
+ Integer selectMaxOrderIdByMonth();
+
+ boolean updateOrderPrintNumber(@Param("orderId") String orderId);
+
+ Integer selectMaxOrderIdByYear();
+
+ Integer selectOrderIdMin(Integer substringInt);
+
+ Integer selectOrderIdIs(Integer substringInt);
+
+ Integer selectOrderIdDay(String oldOrderId);
+
+ Integer selectOrderIdMonth(String oldOrderId);
+
+ Integer selectOrderIdYear(String oldOrderId);
+
+ Boolean updateOrderId(String oldOrderId,String newOrderId);
+
+ Order selectOrderId(String orderId);
+
+ List<Map<String,String>> selectDifferentSize(String orderId);
+
+ //鏌ヨ璁㈠崟鍏ュ簱鐘舵��
+ Integer searchOrderWarehousing( String orderId);
}
--
Gitblit v1.8.0