From 2f640b1038fa331954f78ed1f4317212cf5bb34d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 六月 2024 16:56:06 +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 | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 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..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,31 +10,69 @@
import org.apache.ibatis.annotations.Param;
import org.springframework.data.repository.CrudRepository;
+import java.time.LocalDate;
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> getSelectDeliveryDetailProductReport(@Param("offset") Integer offset,
+ @Param("pageSize") Integer pageSize,String startDate, String endDate,
+ @Param("deliveryDetail") DeliveryDetail deliveryDetail);
+
+ Map<String,Integer> getSelectDeliveryDetailProductReportPageTotal(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("deliveryId") String deliveryId);
- Integer getseletShippingOrderDetailsPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);
- Boolean insertDeliveryDetail(@Param("orderDetail") OrderDetail orderDetail, @Param("number") String number,@Param("deliveryNumber") Integer deliveryNumber);
+ Integer getSelectShippingOrderDetailsPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);
+
+ Boolean insertDeliveryDetail(@Param("orderDetail") OrderDetail orderDetail, @Param("number") String number
+ ,@Param("deliveryNumber") Integer deliveryNumber,@Param("deliveryDetailMoney") Double deliveryDetailMoney);
Integer getdeliveryDetailmaximum(@Param("deliveryId") String deliveryId);
+ Integer getSelectDetailNum(@Param("orderId") String orderId);
+
+ Integer getSelectDetailQuantity(@Param("orderId") String orderId);
+
Boolean updateOrderDetailDeliveryNum(OrderDetail orderDetail);
+ Boolean updateOrderDelivery(@Param("orderDetail") OrderDetail orderDetail,@Param("state") Integer state);
+
+ Boolean updateIsNotOrderDetailDeliveryNum(@Param("orderId") String orderId,
+ @Param("orderNumber") Integer orderNumber,
+ @Param("quantity") Integer quantity);
+
+ Boolean deleteDeliveryDetail(@Param("deliveryId") String deliveryId);
+
+ List<DeliveryDetailDTO> exportDeliveryDetailReport(List<LocalDate> dates);
+
+ List<DeliveryDetailProductDTO> exportDeliveryDetailProductReport(List<LocalDate> dates);
+
}
--
Gitblit v1.8.0