From 41631eec06251ec8f858765af6a0858b180e720d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 22 二月 2024 08:22:56 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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..60759b2 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
@@ -15,7 +15,7 @@
public interface DeliveryMapper extends CrudRepository<Delivery,Long> {
List<Delivery> getseletShippingOrder(@Param("offset") Integer offset,
- @Param("pageSize") Integer pageSize,
+ @Param("pageSize") Integer pageSize,String startDate, String endDate,
@Param("delivery") Delivery delivery);
Delivery getseletShippingOrderDetaildelivery(@Param("offset") Integer offset,
@@ -25,16 +25,18 @@
Order getseletShippingOrderDetaildeliverys(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,
@Param("orderDetail") OrderDetail orderDetail);
- Integer getseletShippingOrderPageTotal(Integer offset, Integer pageSize,Delivery delivery);
+ Integer getseletShippingOrderPageTotal(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);
+ 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 updateDeliveryToExamine(@Param("deliveryId") String deliveryId,@Param("deliveryState") int deliveryState);
+
Integer getmaximum(@Param("type") String type);
Boolean updatedelivery(@Param("area") Double area,
--
Gitblit v1.8.0