From 1a04230a60c65e2a7e8d1b392bc6408b2e77aa61 Mon Sep 17 00:00:00 2001
From: 你好啊 <1536384743@qq.com>
Date: 星期六, 22 二月 2025 13:53:17 +0800
Subject: [PATCH] 配置文件修改

---
 north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java
index c1d7a92..9073b81 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java
@@ -25,17 +25,17 @@
 
     Integer getSelectShippingOrderDetailPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);
 
-    List<DeliveryDetail> getSelectDeliveryPrinting(@Param("deliveryDetail") DeliveryDetail deliveryDetail);
+    List<DeliveryDetail> getSelectDeliveryPrinting(@Param("deliveryId") String deliveryId,@Param("type") String type);
 
-    List<OrderDetail> getSelectOrderPrinting(@Param("orderDetail") OrderDetail orderDetail);
+    List<OrderDetail> getSelectOrderPrinting(Object productId, String orderId);
 
     List <Map<String, Object>> getSelectDeliveryDetailPrinting(@Param("deliveryId") String deliveryId,
                                                          @Param("productId") Integer productId,@Param("orderId") String orderId);
 
     Map<String, Object> getSelectotherMoney(@Param("orderId") String orderId,@Param("deliveryId") String deliveryId,
-                                                   @Param("orderNumber") Integer orderNumber,@Param("key") String key,@Param("value") String value);
+                                                   @Param("orderNumber") Integer orderNumber,@Param("key") String key,@Param("value") Double value);
 
-    Map<String, Object> getSelectOrderotherMoney(@Param("orderId") String orderId,@Param("orderNumber") Integer orderNumber, @Param("key") String key,@Param("value") String value);
+    Map<String, Object> getSelectOrderotherMoney(@Param("orderId") String orderId,@Param("orderNumber") Integer orderNumber, @Param("key") String key,@Param("value") Double value);
 
     List <Map<String, Object>> getSelectOrderDetailPrinting(@Param("productId") Integer productId,@Param("orderId") String orderId);
 
@@ -64,7 +64,7 @@
 
     Boolean insertDeliveryDetail(@Param("orderDetail") OrderDetail orderDetail, @Param("number") String number
             ,@Param("deliveryNumber") Integer deliveryNumber,@Param("deliveryDetailMoney") Double deliveryDetailMoney,
-                                 @Param("otherMoneys") Double otherMoneys);
+                                 @Param("otherMoneys") Double otherMoneys,@Param("deliveryDetailArea") Double deliveryDetailArea);
 
     Integer getdeliveryDetailmaximum(@Param("deliveryId") String deliveryId);
 
@@ -86,4 +86,6 @@
 
     List<DeliveryDetailProductDTO> exportDeliveryDetailProductReport(List<LocalDate> dates);
 
+    OrderDetail selectOrderDetailDeliveryCount(@Param("orderDetail") OrderDetail orderDetail);
+
 }

--
Gitblit v1.8.0