From a4908aafb0aa9adbc70a006214e7580c626396a5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 15 八月 2024 17:10:06 +0800
Subject: [PATCH] 添加流程卡上是否显示其它备注配置

---
 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 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..67992b6 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,6 +1,7 @@
 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;
@@ -10,6 +11,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;
 
@@ -33,12 +35,17 @@
     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);
 
     Integer findOrderQuantity(String orderId);
 
     Integer findOrderNumberdsum(String orderId);
+
+    Integer findOrderDeliveryQuantitySum(String orderId);
 
     Integer findDeliveryQuantity(String deliveryId);
 
@@ -48,12 +55,16 @@
                             @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,
@@ -66,7 +77,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 +117,14 @@
     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);
+
+
 }
 
 

--
Gitblit v1.8.0