From 429d3c3b56d80510a5c73f9a21826602dfd3da46 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 16 四月 2024 11:39:27 +0800
Subject: [PATCH] 提交idea

---
 north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java
index 74b04c1..bae21c0 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java
@@ -9,25 +9,34 @@
 import org.springframework.data.repository.CrudRepository;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface DeliveryDetailMapper extends CrudRepository<DeliveryDetail,Long> {
 
-    List<DeliveryDetail> getseletShippingOrderDetail(@Param("offset") Integer offset,
+    List<DeliveryDetail> getSelectShippingOrderDetail(@Param("offset") Integer offset,
                                                       @Param("pageSize") Integer pageSize,
                                                       @Param("orderDetail") OrderDetail orderDetail);
 
 
 
-    Integer getseletShippingOrderDetailPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);
+    Integer getSelectShippingOrderDetailPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);
 
-    List<DeliveryDetail> getseletShippingOrderDetails(@Param("offset") Integer offset,
+    List<DeliveryDetail> getSelectDeliveryDetailReport(@Param("offset") Integer offset,
+                                                      @Param("pageSize") Integer pageSize,String startDate, String endDate,
+                                                      @Param("deliveryDetail") DeliveryDetail deliveryDetail);
+
+    Map<String,Integer> getSelectDeliveryDetailReportPageTotal(Integer offset, Integer pageSize,String startDate, String endDate, DeliveryDetail deliveryDetail);
+
+    List<DeliveryDetail> getSelectShippingOrderDetails(@Param("offset") Integer offset,
                                                      @Param("pageSize") Integer pageSize,
                                                      @Param("orderDetail") OrderDetail orderDetail);
 
+    List<DeliveryDetail> getIsNotDeliveryDetail(@Param("deliveryDetailNumber") String deliveryDetailNumber,@Param("deliveryId") String deliveryId);
 
 
-    Integer getseletShippingOrderDetailsPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);
+
+    Integer getSelectShippingOrderDetailsPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);
 
     Boolean insertDeliveryDetail(@Param("orderDetail") OrderDetail orderDetail, @Param("number") String number,@Param("deliveryNumber") Integer deliveryNumber);
 
@@ -35,4 +44,10 @@
 
     Boolean updateOrderDetailDeliveryNum(OrderDetail orderDetail);
 
+    Boolean updateIsNotOrderDetailDeliveryNum(@Param("orderId") String orderId,
+                                              @Param("orderNumber") Integer orderNumber,
+                                              @Param("quantity") Integer quantity);
+
+    Boolean deleteDeliveryDetail(@Param("deliveryId") String deliveryId);
+
 }

--
Gitblit v1.8.0