From 8668e5ce64e1d7b3dbfffc42cf6767cb9ea2d6c0 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 25 六月 2024 09:54:15 +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/DeliveryMapper.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java
index 2dbb88b..d5f7793 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java
@@ -23,6 +23,10 @@
@Param("pageSize") Integer pageSize,
@Param("orderDetail") OrderDetail orderDetail);
+ Delivery getSelectShippingOrderDetailDeliveryPrinting(@Param("deliveryDetail") DeliveryDetail deliveryDetail);
+
+ Order getSelectShippingOrderDetailPrinting(@Param("orderDetail") OrderDetail orderDetail);
+
Order getSelectShippingOrderDetailDeliverys(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,
@Param("orderDetail") OrderDetail orderDetail);
@@ -40,11 +44,14 @@
Boolean updateDeliveryToExamine(@Param("deliveryId") String deliveryId,@Param("deliveryState") int deliveryState);
+ Boolean deleteDelivery(@Param("deliveryId") String deliveryId);
+
Integer getmaximum(@Param("type") String type);
Boolean updatedelivery(@Param("area") Double area,
@Param("quantity") Integer quantity,
@Param("money") Double money,
+ @Param("otherMoney") Double otherMoney,
@Param("oddNumber") String oddNumber);
--
Gitblit v1.8.0