From ef5a518c3e2c1fe41aa60f56ca31ddafa0cb1561 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 23 五月 2024 08:32:36 +0800
Subject: [PATCH] 添加产品汇总报表

---
 north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java
index 52f6d15..13a352b 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java
@@ -10,38 +10,49 @@
 import org.springframework.data.repository.CrudRepository;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface DeliveryMapper extends CrudRepository<Delivery,Long> {
 
-    List<Delivery> getseletShippingOrder(@Param("offset") Integer offset,
-                                                      @Param("pageSize") Integer pageSize,
+    List<Delivery> getSelectShippingOrder(@Param("offset") Integer offset,
+                                                      @Param("pageSize") Integer pageSize,String startDate, String endDate,
                                                       @Param("delivery") Delivery delivery);
 
-   Delivery getseletShippingOrderDetaildelivery(@Param("offset") Integer offset,
+   Delivery getSelectShippingOrderDetailDelivery(@Param("offset") Integer offset,
                                                              @Param("pageSize") Integer pageSize,
                                                              @Param("orderDetail") OrderDetail orderDetail);
 
-    Order getseletShippingOrderDetaildeliverys(@Param("offset") Integer offset,
+   Delivery getSelectShippingOrderDetailDeliveryPrinting(@Param("deliveryDetail") DeliveryDetail deliveryDetail);
+
+    Order getSelectShippingOrderDetailDeliverys(@Param("offset") Integer offset,
                                                  @Param("pageSize") Integer pageSize,
                                                  @Param("orderDetail") OrderDetail orderDetail);
-    Integer getseletShippingOrderPageTotal(Integer offset, Integer pageSize,Delivery delivery);
+    Map<String,Integer> getSelectShippingOrderPageTotal(Integer offset, Integer pageSize, String startDate, String endDate, Delivery delivery);
 
     List<Order> getSelectOrderInventory(@Param("offset") Integer offset,
-                                        @Param("pageSize") Integer pageSize,
+                                        @Param("pageSize") Integer pageSize,String startDate, String endDate,
                                         @Param("order") Order order);
 
-    Integer getSelectOrderInventoryPageTotal(Integer offset, Integer pageSize, Order order);
+    Map<String,Integer> getSelectOrderInventoryPageTotal(Integer offset, Integer pageSize,String startDate, String endDate, Order order);
 
     Boolean insertDelivery(@Param("delivery") Delivery delivery,@Param("number") String number,@Param("orderId") String orderId);
+
+    Integer getDeliveryConut(@Param("deliveryId") String deliveryId);
+
+    Boolean updateDeliveryToExamine(@Param("deliveryId") String deliveryId,@Param("deliveryState") int deliveryState);
+
+    Boolean deleteDelivery(@Param("deliveryId") String deliveryId);
 
     Integer getmaximum(@Param("type") String type);
 
     Boolean updatedelivery(@Param("area") Double area,
                            @Param("quantity") Integer quantity,
                            @Param("money") Double money,
+                           @Param("otherMoney") Double otherMoney,
                            @Param("oddNumber") String oddNumber);
 
 
 
+
 }

--
Gitblit v1.8.0