From 93b80ffb7f7ffc02bc414271b8ebeac82be6bcb9 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 11 十一月 2024 16:29:00 +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/mm/FinishedGoodsInventoryMapper.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 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 67992b6..4201fdf 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
@@ -3,6 +3,7 @@
 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.DeliveryDetail;
 import com.example.erp.entity.sd.Order;
 import com.example.erp.entity.sd.OrderDetail;
 import com.example.erp.entity.sd.Product;
@@ -38,6 +39,9 @@
     FinishedGoodsInventory findOrderNumberd(@Param("orderId") String orderId,
                                   @Param("orderNumber") Integer orderNumber);
 
+    OrderDetail findOrderDetailNumberd(@Param("orderId") String orderId,
+                                            @Param("orderNumber") Integer orderNumber);
+
     Integer finishedGoodsInventorybycount(@Param("orderId") String orderId,
                                   @Param("orderNumber") Integer orderNumber);
 
@@ -69,6 +73,10 @@
     Boolean updateOutOrderNumberConut( @Param("orderId") String orderId,
                                        @Param("orderNumber") Integer orderNumber,
                                        @Param("quantity") Integer quantity);
+
+    Boolean updateOrderNumberConut( @Param("orderId") String orderId,
+                                       @Param("orderNumber") Integer orderNumber,
+                                       @Param("quantity") Long quantity);
 
 
     Boolean updateOrderWarehousingState(String orderId,Integer state);
@@ -124,6 +132,11 @@
 
     Boolean updateOrderInventory(@Param("orderDetail") OrderDetail orderDetail);
 
+    FlowCard findFlowCard(FlowCard flowCard);
+
+    DeliveryDetail findDeliverydetail(@Param("orderId") String orderId,
+                                      @Param("orderNumber") Integer orderNumber,@Param("deliveryId") String deliveryId);
+
 
 }
 

--
Gitblit v1.8.0