From 2f640b1038fa331954f78ed1f4317212cf5bb34d Mon Sep 17 00:00:00 2001 From: chenlu <1320612696@qq.com> Date: 星期五, 07 六月 2024 16:56:06 +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 | 3 +++ 1 files changed, 3 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 7c30f76..13a352b 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,8 @@ @Param("pageSize") Integer pageSize, @Param("orderDetail") OrderDetail orderDetail); + Delivery getSelectShippingOrderDetailDeliveryPrinting(@Param("deliveryDetail") DeliveryDetail deliveryDetail); + Order getSelectShippingOrderDetailDeliverys(@Param("offset") Integer offset, @Param("pageSize") Integer pageSize, @Param("orderDetail") OrderDetail orderDetail); @@ -47,6 +49,7 @@ 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