From 54c2f0fda44123782e5241ff7d1ad6e81c95f2b2 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 12 十一月 2024 15:52:32 +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 | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 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 52acccc..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;
@@ -11,6 +12,7 @@
import org.apache.ibatis.annotations.Param;
import org.springframework.data.repository.CrudRepository;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -34,12 +36,20 @@
Integer findOrderNumberdcount(@Param("orderId") String orderId,
@Param("orderNumber") Integer orderNumber);
+ 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);
Integer findOrderQuantity(String orderId);
Integer findOrderNumberdsum(String orderId);
+
+ Integer findOrderDeliveryQuantitySum(String orderId);
Integer findDeliveryQuantity(String deliveryId);
@@ -58,11 +68,15 @@
Boolean updateIntOrderNumberConut( @Param("orderId") String orderId,
@Param("orderNumber") Integer orderNumber,
- @Param("quantity") Integer quantity);
+ @Param("quantity") Long quantity);
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);
@@ -111,6 +125,19 @@
Boolean updateInventoryInventoryInt(@Param("orderId") String orderId,
@Param("orderNumber") Integer orderNumber,
@Param("quantity") Integer quantity);
+
+ List<OrderDetail> getSelectOrderDetail(String orderId);
+
+ Boolean insertOrderFinishedGoodsInventory(@Param("orderDetail") OrderDetail orderDetail);
+
+ 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