From 3ee23fa2bfb5f90863a1e2579c882b4bae875aa3 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 31 五月 2024 11:50:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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..c94f2a1 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,13 +46,14 @@
@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);
Integer getSelectShippingOrderDetailsPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);
- Boolean insertDeliveryDetail(@Param("orderDetail") OrderDetail orderDetail, @Param("number") String number,@Param("deliveryNumber") Integer deliveryNumber);
+ Boolean insertDeliveryDetail(@Param("orderDetail") OrderDetail orderDetail, @Param("number") String number
+ ,@Param("deliveryNumber") Integer deliveryNumber,@Param("deliveryDetailMoney") Double deliveryDetailMoney);
Integer getdeliveryDetailmaximum(@Param("deliveryId") String deliveryId);
@@ -67,4 +71,8 @@
Boolean deleteDeliveryDetail(@Param("deliveryId") String deliveryId);
+ List<DeliveryDetailDTO> exportDeliveryDetailReport(List<LocalDate> dates);
+
+ List<DeliveryDetailProductDTO> exportDeliveryDetailProductReport(List<LocalDate> dates);
+
}
--
Gitblit v1.8.0