ERP_override.git

			@@ -1,5 +1,6 @@
			package com.example.erp.mapper.sd;

			import com.example.erp.dto.sd.DeliverySearchDTO;
			import com.example.erp.entity.pp.FlowCard;
			import com.example.erp.entity.sd.Delivery;
			import com.example.erp.entity.sd.DeliveryDetail;
			@@ -17,7 +18,7 @@

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

			Delivery getSelectShippingOrderDetailDelivery(@Param("offset") Integer offset,
			@Param("pageSize") Integer pageSize,
			@@ -30,7 +31,7 @@
			Order getSelectShippingOrderDetailDeliverys(@Param("offset") Integer offset,
			@Param("pageSize") Integer pageSize,
			@Param("orderDetail") OrderDetail orderDetail);
			Map<String,Integer> getSelectShippingOrderPageTotal(Integer offset, Integer pageSize, String startDate, String endDate, Delivery delivery);
			Map<String,Integer> getSelectShippingOrderPageTotal(Integer offset, Integer pageSize, String startDate, String endDate, DeliverySearchDTO delivery);

			List<Order> getSelectOrderInventory(@Param("offset") Integer offset,
			@Param("pageSize") Integer pageSize,String startDate, String endDate,
			@@ -52,6 +53,8 @@

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

			Integer getmaximumMonth();

			Boolean updatedelivery(@Param("area") Double area,
			@Param("quantity") Integer quantity,
			@Param("money") Double money,
			@@ -61,6 +64,5 @@
			boolean updateDeliveryPrintNumber(@Param("deliveryId") String deliveryId);




			List<Delivery> selectByDate(String startDate, String endDate);
			}