From 4521e55b7ce2840dcb91340c17f3159892bcc14d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 13:32:29 +0800
Subject: [PATCH] 修改订单金额时,根据情况是否调用发货单修改金额

---
 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 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 d369f0b..8617b71 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
@@ -62,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);
 
 
@@ -77,15 +80,19 @@
 
     List<FinishedOperateLog> getSelectFinishedOperateLogReport(@Param("offset") Integer offset,
                                              @Param("pageSize") Integer pageSize,String startDate, String endDate,
-                                             @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog,String type);
+                                             @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog,String type,
+                                             @Param("dateType")  String dateType);
 
     Map<String,Integer> getSelectFinishedOperateLogReportPageTotal(@Param("offset") Integer offset,
                                                            @Param("pageSize") Integer pageSize,String startDate, String endDate,
-                                                           @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog,String type);
+                                                           @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog,
+                                                                   String type,
+                                                           @Param("dateType") String dateType);
 
     List<FinishedOperateLogDTO> exportFinishedOperateLogReport(List<LocalDate> dates,String type);
-
-    Boolean insertOrderFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);
+    List<FinishedOperateLogDTO> exportFinishedOperateLogReportByDatetime(List<String> dates,String type);
+    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);
 
@@ -104,4 +111,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