From ebd55233e37a6c050fda335be6c2c67630b1f7e3 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 13 三月 2024 10:30:42 +0800
Subject: [PATCH] 拉取文件

---
 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java
index e14107c..c0bac76 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java
@@ -11,6 +11,7 @@
 import org.springframework.data.repository.CrudRepository;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface FinishedGoodsInventoryMapper extends CrudRepository<FinishedGoodsInventory,Long> {
@@ -21,13 +22,13 @@
                                                       @Param("pageSize") Integer pageSize,
                                                       @Param("finishedGoodsInventory") FinishedGoodsInventory finishedGoodsInventory);
 
-    Integer getPageTotal(Integer offset, Integer pageSize,FinishedGoodsInventory finishedGoodsInventory);
+    Map<String,Integer> getPageTotal(Integer offset, Integer pageSize, FinishedGoodsInventory finishedGoodsInventory);
 
-    List<FlowCard> getseletwarehousing(@Param("offset") Integer offset,
+    List<FlowCard> getSelectWarehousing(@Param("offset") Integer offset,
                                        @Param("pageSize") Integer pageSize,
                                        @Param("flowCard") FlowCard flowCard);
 
-    Integer getseletwarehousingPageTotal(Integer offset, Integer pageSize,FlowCard flowCard);
+    Map<String,Integer> getSelectWarehousingPageTotal(Integer offset, Integer pageSize,FlowCard flowCard);
 
     Integer findOrderNumberdcount(@Param("orderId") String orderId,
                                   @Param("orderNumber") Integer orderNumber);
@@ -38,6 +39,10 @@
     Integer findOrderQuantity(String orderId);
 
     Integer findOrderNumberdsum(String orderId);
+
+    Integer findDeliveryQuantity(String deliveryId);
+
+    Integer findDeliverydetailsum(String deliveryId,Integer deliveryDetailState);
 
     Boolean updateInventory(@Param("flowCard") FlowCard flowCard,
                             @Param("storageRegion") String storageRegion,
@@ -59,6 +64,8 @@
 
     Boolean updateOrderDeliveryState(String orderId,Integer state);
 
+    Boolean updateDeliveryDeliveryState(String deliveryId,Integer state);
+
     Boolean updateDeliveryDetailState(OrderDetail orderDetail,Integer state);
 
     Boolean insertFinishedGoodsInventory(@Param("flowCard") FlowCard flowCard,
@@ -66,17 +73,17 @@
                                          @Param("remark") String remark);
 
 
-    List<OrderDetail> getseletdeliveryDetail(@Param("offset") Integer offset,
+    List<OrderDetail> getSelectDeliveryDetail(@Param("offset") Integer offset,
                                                       @Param("pageSize") Integer pageSize,
                                                       @Param("orderDetail") OrderDetail orderDetail);
 
-    Integer getseletdeliveryDetailPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);
+    Map<String,Integer> getSelectDeliveryDetailPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);
 
     List<OrderDetail> getSelectAllocate(@Param("offset") Integer offset,
                                         @Param("pageSize") Integer pageSize,
                                         @Param("orderDetail") OrderDetail orderDetail);
 
-    Integer getSelectAllocatePageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);
+    Map<String,Integer> getSelectAllocatePageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);
 
     Boolean updateInventoryquantityAllocateOut(@Param("orderId") String orderId,
                                                @Param("orderNumber") Integer orderNumber,

--
Gitblit v1.8.0