From 5314634fbbe6fd099d9b134614dba450cba2b5b9 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 19 四月 2024 13:52:23 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java | 20 ++++++++++++++++----
1 files changed, 16 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 6c2128f..d66aa05 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,19 +9,31 @@
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> getSelectDeliveryPrinting(@Param("deliveryDetail") DeliveryDetail deliveryDetail);
+
+ List <Map<String, Object>> getSelectDeliveryDetailPrinting(@Param("deliveryId") String deliveryId,
+ @Param("productId") Integer productId,@Param("orderId") String orderId);
+
+ 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);
@@ -29,7 +41,7 @@
- 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);
--
Gitblit v1.8.0