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/DeliveryMapper.java

@@ -10,40 +10,49 @@
import org.springframework.data.repository.CrudRepository;

import java.util.List;
import java.util.Map;

@Mapper
public interface DeliveryMapper extends CrudRepository<Delivery,Long> {

    List<Delivery> getseletShippingOrder(@Param("offset") Integer offset,
    List<Delivery> getSelectShippingOrder(@Param("offset") Integer offset,
                                                      @Param("pageSize") Integer pageSize,String startDate, String endDate,
                                                      @Param("delivery") Delivery delivery);

   Delivery getseletShippingOrderDetaildelivery(@Param("offset") Integer offset,
   Delivery getSelectShippingOrderDetailDelivery(@Param("offset") Integer offset,
                                                             @Param("pageSize") Integer pageSize,
                                                             @Param("orderDetail") OrderDetail orderDetail);

    Order getseletShippingOrderDetaildeliverys(@Param("offset") Integer offset,
   Delivery getSelectShippingOrderDetailDeliveryPrinting(@Param("deliveryDetail") DeliveryDetail deliveryDetail);

    Order getSelectShippingOrderDetailDeliverys(@Param("offset") Integer offset,
                                                 @Param("pageSize") Integer pageSize,
                                                 @Param("orderDetail") OrderDetail orderDetail);
    Integer getseletShippingOrderPageTotal(Integer offset, Integer pageSize,String startDate, String endDate,Delivery delivery);
    Map<String,Integer> getSelectShippingOrderPageTotal(Integer offset, Integer pageSize, String startDate, String endDate, Delivery delivery);

    List<Order> getSelectOrderInventory(@Param("offset") Integer offset,
                                        @Param("pageSize") Integer pageSize,String startDate, String endDate,
                                        @Param("order") Order order);

    Integer getSelectOrderInventoryPageTotal(Integer offset, Integer pageSize,String startDate, String endDate, Order order);
    Map<String,Integer> getSelectOrderInventoryPageTotal(Integer offset, Integer pageSize,String startDate, String endDate, Order order);

    Boolean insertDelivery(@Param("delivery") Delivery delivery,@Param("number") String number,@Param("orderId") String orderId);

    Integer getDeliveryConut(@Param("deliveryId") String deliveryId);

    Boolean updateDeliveryToExamine(@Param("deliveryId") String deliveryId,@Param("deliveryState") int deliveryState);

    Boolean deleteDelivery(@Param("deliveryId") String deliveryId);

    Integer getmaximum(@Param("type") String type);

    Boolean updatedelivery(@Param("area") Double area,
                           @Param("quantity") Integer quantity,
                           @Param("money") Double money,
                           @Param("otherMoney") Double otherMoney,
                           @Param("oddNumber") String oddNumber);




}