Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-06-07 2f640b1038fa331954f78ed1f4317212cf5bb34d

 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);

}