From eff455b5d32fb24af67e220f84d3ce693a6b594e Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 23 五月 2024 10:40:35 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 d3c26d6..6f3977a 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
@@ -1,5 +1,7 @@
package com.example.erp.mapper.sd;
+import com.example.erp.dto.sd.DeliveryDetailDTO;
+import com.example.erp.dto.sd.DeliveryDetailProductDTO;
import com.example.erp.entity.sd.Delivery;
import com.example.erp.entity.sd.DeliveryDetail;
import com.example.erp.entity.sd.Order;
@@ -8,6 +10,7 @@
import org.apache.ibatis.annotations.Param;
import org.springframework.data.repository.CrudRepository;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -43,7 +46,7 @@
@Param("pageSize") Integer pageSize,
@Param("orderDetail") OrderDetail orderDetail);
- List<DeliveryDetail> getIsNotDeliveryDetail(@Param("deliveryDetailNumber") String deliveryDetailNumber,@Param("deliveryId") String deliveryId);
+ List<DeliveryDetail> getIsNotDeliveryDetail(@Param("deliveryId") String deliveryId);
@@ -67,4 +70,8 @@
Boolean deleteDeliveryDetail(@Param("deliveryId") String deliveryId);
+ List<DeliveryDetailDTO> exportDeliveryDetailReport(List<LocalDate> dates);
+
+ List<DeliveryDetailProductDTO> exportDeliveryDetailProductReport(List<LocalDate> dates);
+
}
--
Gitblit v1.8.0