From df143921e8ec85b43420b71961d73825521911d1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 十月 2025 10:14:49 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java
index 52f6d15..5e42465 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java
@@ -10,38 +10,58 @@
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,
- @Param("pageSize") Integer pageSize,
+ 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 getSelectShippingOrderDetailPrinting(@Param("orderDetail") OrderDetail orderDetail);
+
+ Order getSelectShippingOrderDetailDeliverys(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,
@Param("orderDetail") OrderDetail orderDetail);
- Integer getseletShippingOrderPageTotal(Integer offset, Integer pageSize,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,
+ @Param("pageSize") Integer pageSize,String startDate, String endDate,
@Param("order") Order order);
- Integer getSelectOrderInventoryPageTotal(Integer offset, Integer pageSize, Order order);
+ Order selectOrderId(String orderId);
+
+ 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);
+ Boolean updateDelivery(@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);
+
+ Integer getmaximumMonth();
Boolean updatedelivery(@Param("area") Double area,
@Param("quantity") Integer quantity,
@Param("money") Double money,
+ @Param("otherMoney") Double otherMoney,
@Param("oddNumber") String oddNumber);
+ boolean updateDeliveryPrintNumber(@Param("deliveryId") String deliveryId);
+
}
--
Gitblit v1.8.0