From eef4b7ca66cc2fb34d2d2cb0a4a8643f2bb0f838 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 18 十月 2024 13:44:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java | 21 ++++++++++++++++++++-
1 files changed, 20 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 289e597..b146a3d 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;
@@ -35,6 +36,9 @@
Integer findOrderNumberdcount(@Param("orderId") String orderId,
@Param("orderNumber") Integer orderNumber);
+ FinishedGoodsInventory findOrderNumberd(@Param("orderId") String orderId,
+ @Param("orderNumber") Integer orderNumber);
+
Integer finishedGoodsInventorybycount(@Param("orderId") String orderId,
@Param("orderNumber") Integer orderNumber);
@@ -61,11 +65,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);
@@ -115,6 +123,17 @@
@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