From c1c7cae9ebaa7f743e51660265c8dfa6ac52f10d Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 09 十月 2025 16:07:42 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java | 10 ++++++++++
1 files changed, 10 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 a79c0fb..5e42465 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
@@ -25,6 +25,8 @@
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);
@@ -34,9 +36,13 @@
@Param("pageSize") Integer pageSize,String startDate, String endDate,
@Param("order") Order order);
+ Order selectOrderId(String orderId);
+
Map<String,Integer> getSelectOrderInventoryPageTotal(Integer offset, Integer pageSize,String startDate, String endDate, Order order);
Boolean insertDelivery(@Param("delivery") Delivery delivery,@Param("number") String number,@Param("orderId") String orderId);
+
+ Boolean updateDelivery(@Param("delivery") Delivery delivery,@Param("number") String number,@Param("orderId") String orderId);
Integer getDeliveryConut(@Param("deliveryId") String deliveryId);
@@ -46,11 +52,15 @@
Integer getmaximum(@Param("type") String type);
+ Integer getmaximumMonth();
+
Boolean updatedelivery(@Param("area") Double area,
@Param("quantity") Integer quantity,
@Param("money") Double money,
+ @Param("otherMoney") Double otherMoney,
@Param("oddNumber") String oddNumber);
+ boolean updateDeliveryPrintNumber(@Param("deliveryId") String deliveryId);
--
Gitblit v1.8.0