From b9e4e2edbb3767ee347a91d2238544ae736b53c0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 22 七月 2025 10:29:27 +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 | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 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 5f7eccf..99ba49d 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,14 +3,13 @@
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;
-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;
import org.springframework.data.repository.CrudRepository;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -25,6 +24,9 @@
Map<String,Integer> getPageTotal(Integer offset, Integer pageSize, FinishedGoodsInventory finishedGoodsInventory);
+ FlowCard getSelectWarehousingByProcessId(@Param("order_id") String order_id,
+ @Param("order_number") Integer order_number,
+ @Param("process_id") String process_id);
List<FlowCard> getSelectWarehousing(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,
@Param("flowCard") FlowCard flowCard);
@@ -34,10 +36,18 @@
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);
+
+ Delivery findOrderDelivery(String orderId);
Integer findOrderNumberdsum(String orderId);
@@ -49,7 +59,7 @@
Boolean updateInventory(@Param("flowCard") FlowCard flowCard,
@Param("storageRegion") String storageRegion,
- @Param("remark") String remark);
+ @Param("remark") String remark, @Param("container") String container);
Boolean updateInventoryOut(@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
@@ -60,11 +70,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);
@@ -78,12 +92,14 @@
Boolean insertFinishedGoodsInventory(@Param("flowCard") FlowCard flowCard,
@Param("storageRegion") String storageRegion,
- @Param("remark") String remark);
+ @Param("remark") String remark, @Param("container") String container);
List<OrderDetail> getSelectDeliveryDetail(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,
@Param("orderDetail") OrderDetail orderDetail);
+
+ List<OrderDetail> getSelectDeliveryDetailDeliveryId(@Param("deliveryId") String deliveryId);
Map<String,Integer> getSelectDeliveryDetailPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);
@@ -113,6 +129,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