Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

guoyuji

2024-04-19 5314634fbbe6fd099d9b134614dba450cba2b5b9

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