From 554886463a4cb4a2d5c042f08e85d2dfcd6e9dcf Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 12 十二月 2025 10:02:22 +0800
Subject: [PATCH] 修改义乌合片流程卡配置

---
 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
index 47e0205..5081ca8 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
@@ -7,9 +7,9 @@
 import com.example.erp.entity.sd.OrderDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.data.repository.CrudRepository;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -17,9 +17,12 @@
 public interface FinishedOperateLogMapper extends BaseMapper<FinishedOperateLog> {
     FinishedOperateLog getselectFinishedOperateLog();
 
-    Boolean insertIntFinishedOperateLog(@Param("flowCard") FlowCard flowCard ,@Param("userName") String userName,
-                                        @Param("oddNumber") String oddNumber,@Param("container") String container,
-                                        @Param("deliveryDetailMoney") Double deliveryDetailMoney,@Param("deliveryDetailArea") Double deliveryDetailArea);
+    Boolean insertIntFinishedOperateLog(@Param("flowCard") FlowCard flowCard , @Param("userName") String userName,
+                                        @Param("oddNumber") String oddNumber, @Param("container") String container,
+                                        @Param("deliveryDetailMoney") Double deliveryDetailMoney,
+                                        @Param("deliveryDetailArea") Double deliveryDetailArea,
+                                        String createTime,
+                                        @Param("getComputeArea") Double getComputeArea);
 
     Boolean insertOutFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail, @Param("userName") String userName, @Param("oddNumber") String oddNumber, String boxNo);
 
@@ -59,6 +62,9 @@
                                            @Param("userName") String userName,
                                             @Param("type") String type);
 
+    Boolean updateFinishedOperateLogQuantity(@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog
+            ,@Param("deliveryDetailMoney") Double deliveryDetailMoney,@Param("deliveryDetailArea") Double deliveryDetailArea);
+
     Boolean updateFinishedOperateLogState(@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog,@Param("type") String type);
 
 
@@ -82,7 +88,8 @@
 
     List<FinishedOperateLogDTO> exportFinishedOperateLogReport(List<LocalDate> dates,String type);
 
-    Boolean insertOrderFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);
+    Boolean insertOrderFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,
+                                          @Param("oddNumber") String oddNumber,@Param("processId") String processId);
 
     Boolean updateOrderFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);
 
@@ -101,4 +108,5 @@
     List<Map<String, Object>> getDetailLists(String orderId, String remarks, Integer productId,String thickness);
 
     List<Map<String, Object>> getDetailList2(String orderId, String processId, String remarks);
+
 }

--
Gitblit v1.8.0