From 00a6c486eb0f4aec35af265ff9851bff41f18bd2 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 18 三月 2024 16:43:26 +0800
Subject: [PATCH] 修改报工前端判断流程卡位数

---
 north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 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 60759b2..7c30f76 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,32 +10,37 @@
 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,
+    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);
 
@@ -46,4 +51,5 @@
 
 
 
+
 }

--
Gitblit v1.8.0