From 1ef275124e5c311daf06b84e961c62e43b748778 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 21 五月 2024 11:41:07 +0800
Subject: [PATCH] 后端获取报表数据

---
 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 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 e5be1ce..5f7eccf 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
@@ -1,6 +1,7 @@
 package com.example.erp.mapper.mm;
 
 import com.example.erp.entity.mm.FinishedGoodsInventory;
+import com.example.erp.entity.mm.FinishedOperateLog;
 import com.example.erp.entity.pp.FlowCard;
 import com.example.erp.entity.sd.Order;
 import com.example.erp.entity.sd.OrderDetail;
@@ -24,11 +25,11 @@
 
     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);
 
-    Map<String,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);
@@ -40,6 +41,8 @@
 
     Integer findOrderNumberdsum(String orderId);
 
+    Integer findOrderDeliveryQuantitySum(String orderId);
+
     Integer findDeliveryQuantity(String deliveryId);
 
     Integer findDeliverydetailsum(String deliveryId,Integer deliveryDetailState);
@@ -48,8 +51,12 @@
                             @Param("storageRegion") String storageRegion,
                             @Param("remark") String remark);
 
+    Boolean updateInventoryOut(@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
+
     Boolean updateInventoryquantityavailable(@Param("orderDetail") OrderDetail orderDetail);
     Boolean updateflowcard(FlowCard flowCard);
+
+    Boolean updateflowcardOut(@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
 
     Boolean updateIntOrderNumberConut( @Param("orderId") String orderId,
                                        @Param("orderNumber") Integer orderNumber,
@@ -66,18 +73,19 @@
 
     Boolean updateDeliveryDeliveryState(String deliveryId,Integer state);
 
-    Boolean updateDeliveryDetailState(OrderDetail orderDetail,Integer state);
+    Boolean updateDeliveryDetailState(@Param("orderId") String orderId,
+                                      @Param("orderNumber") Integer orderNumber,@Param("deliveryId") String deliveryId,Integer state);
 
     Boolean insertFinishedGoodsInventory(@Param("flowCard") FlowCard flowCard,
                                          @Param("storageRegion") String storageRegion,
                                          @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);
 
-    Map<String,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,

--
Gitblit v1.8.0