From b0c60452329a61c32db74a1c7d7753d383d6310a Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 05 九月 2025 08:20:53 +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 | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 02263f8..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
@@ -15,38 +15,52 @@
@Mapper
public interface DeliveryMapper extends CrudRepository<Delivery,Long> {
- List<Delivery> getseletShippingOrder(@Param("offset") Integer offset,
+ List<Delivery> getSelectShippingOrder(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,String startDate, String endDate,
@Param("delivery") Delivery delivery);
- Delivery getseletShippingOrderDetaildelivery(@Param("offset") Integer offset,
+ Delivery getSelectShippingOrderDetailDelivery(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,
@Param("orderDetail") OrderDetail orderDetail);
- Order getseletShippingOrderDetaildeliverys(@Param("offset") Integer offset,
+ 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);
- Map<String,Integer> getseletShippingOrderPageTotal(Integer offset, Integer pageSize, String startDate, String endDate, Delivery delivery);
+ Map<String,Integer> getSelectShippingOrderPageTotal(Integer offset, Integer pageSize, String startDate, String endDate, Delivery delivery);
List<Order> getSelectOrderInventory(@Param("offset") Integer offset,
@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);
Boolean updateDeliveryToExamine(@Param("deliveryId") String deliveryId,@Param("deliveryState") int deliveryState);
+ Boolean deleteDelivery(@Param("deliveryId") String deliveryId);
+
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