From cb05a90ebb7d71099a66fb03382cc93a4fa0a8ee Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 05 九月 2024 23:45:26 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 cdb551f..99db04b 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
@@ -27,7 +27,7 @@
List<DeliveryDetail> getSelectDeliveryPrinting(@Param("deliveryDetail") DeliveryDetail deliveryDetail);
- 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);
@@ -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);
--
Gitblit v1.8.0