From 6b6f3fbd333894209e0df1822ff89881aa4319fe Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 29 八月 2025 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 d5f7793..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
@@ -36,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);
@@ -48,12 +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