From 0e05a38203ab2c60d89890698e0b34d9d7ab5eb0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 18 十一月 2024 08:29:48 +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 |    7 +++----
 1 files changed, 3 insertions(+), 4 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 4201fdf..e50e125 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,10 +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;
+import com.example.erp.entity.sd.*;
 import com.example.erp.entity.userInfo.User;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -47,6 +44,8 @@
 
     Integer findOrderQuantity(String orderId);
 
+    Delivery findOrderDelivery(String orderId);
+
     Integer findOrderNumberdsum(String orderId);
 
     Integer findOrderDeliveryQuantitySum(String orderId);

--
Gitblit v1.8.0