From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整

---
 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java |   42 +++++++++++++++++++++++++++++++++++++-----
 1 files changed, 37 insertions(+), 5 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 c0bac76..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
@@ -1,15 +1,15 @@
 package com.example.erp.mapper.mm;
 
 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;
 
@@ -33,12 +33,22 @@
     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);
+
+    Integer findOrderDeliveryQuantitySum(String orderId);
 
     Integer findDeliveryQuantity(String deliveryId);
 
@@ -48,16 +58,24 @@
                             @Param("storageRegion") String storageRegion,
                             @Param("remark") String remark);
 
+    Boolean updateInventoryOut(@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
+
     Boolean updateInventoryquantityavailable(@Param("orderDetail") OrderDetail orderDetail);
     Boolean updateflowcard(FlowCard flowCard);
 
+    Boolean updateflowcardOut(@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
+
     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);
@@ -66,7 +84,8 @@
 
     Boolean updateDeliveryDeliveryState(String deliveryId,Integer state);
 
-    Boolean updateDeliveryDetailState(OrderDetail orderDetail,Integer state);
+    Boolean updateDeliveryDetailState(@Param("orderId") String orderId,
+                                      @Param("orderNumber") Integer orderNumber,@Param("deliveryId") String deliveryId,Integer state);
 
     Boolean insertFinishedGoodsInventory(@Param("flowCard") FlowCard flowCard,
                                          @Param("storageRegion") String storageRegion,
@@ -105,6 +124,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