From f0420251442ac6f7bfb6beafa37ad045b4f6478a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 31 十二月 2025 15:49:05 +0800
Subject: [PATCH] 报工多工序，用户多工序修改
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java
index ae2388f..25e29eb 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java
@@ -2,10 +2,7 @@
import com.example.erp.dto.sd.DeliveryDetailDTO;
import com.example.erp.dto.sd.DeliveryDetailProductDTO;
-import com.example.erp.entity.sd.Delivery;
-import com.example.erp.entity.sd.DeliveryDetail;
-import com.example.erp.entity.sd.Order;
-import com.example.erp.entity.sd.OrderDetail;
+import com.example.erp.entity.sd.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.repository.CrudRepository;
@@ -25,7 +22,17 @@
Integer getSelectShippingOrderDetailPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);
- List<DeliveryDetail> getSelectDeliveryPrinting(@Param("deliveryId") String deliveryId);
+ List<DeliveryDetail> getSelectDeliveryPrinting(@Param("deliveryId") String deliveryId,@Param("type") String type);
+
+ List<DeliveryDetail> getSelectDeliveryPrintingMoney(@Param("deliveryId") String deliveryId,@Param("type") String type);
+
+ List<DeliveryDetail> getSelectDeliveryPrintingNoMoney(@Param("deliveryId") String deliveryId,@Param("type") String type);
+
+ List<Map<String, Object>> getSelectDeliveryPrintingMoneySpecifications(@Param("deliveryId") String deliveryId,
+ @Param("productId") Integer productId,@Param("orderId") String orderId);
+
+ List<Map<String, Object>> getSelectDeliveryPrintingNoMoneySpecifications(@Param("deliveryId") String deliveryId,
+ @Param("productId") Integer productId,@Param("orderId") String orderId);
List<OrderDetail> getSelectOrderPrinting(Object productId, String orderId);
@@ -35,7 +42,9 @@
Map<String, Object> getSelectotherMoney(@Param("orderId") String orderId,@Param("deliveryId") String deliveryId,
@Param("orderNumber") Integer orderNumber,@Param("key") String key,@Param("value") Double value);
- Map<String, Object> getSelectOrderotherMoney(@Param("orderId") String orderId,@Param("orderNumber") Integer orderNumber, @Param("key") String key,@Param("value") Double value);
+ Map<String, Object> getSelectOrderotherMoney(@Param("orderId") String orderId,@Param("orderNumber") Integer orderNumber, @Param("key") String key,@Param("value") Double value,@Param("quantity") Integer quantity);
+
+ Map<String, Object> getSelectOrderotherMoneys(@Param("orderId") String orderId,@Param("orderNumber") Integer orderNumber, @Param("key") String key,@Param("value") Double value);
List <Map<String, Object>> getSelectOrderDetailPrinting(@Param("productId") Integer productId,@Param("orderId") String orderId);
@@ -88,4 +97,14 @@
OrderDetail selectOrderDetailDeliveryCount(@Param("orderDetail") OrderDetail orderDetail);
+ List<DeliveryDetail> getDeliverDetailOrderNumber(@Param("orderId") String orderId,
+ @Param("orderNumber") Integer orderNumber,@Param("deliveryId") String deliveryId);
+
+ List<Delivery> getDeliverOrderNumber(@Param("orderId") String orderId,
+ @Param("orderNumber") Integer orderNumber);
+
+ Boolean updateDeliveryDetailmonye(@Param("price") Double price,@Param("deliveryDetail") DeliveryDetail deliveryDetail);
+ Boolean updateDeliverymonye(@Param("deliveryId") String deliveryId,@Param("money") Double money);
+
+ Boolean insertDeliveryOtherMoney(@Param("orderOtherMoney")OrderOtherMoney orderOtherMoney,@Param("deliveryId") String deliveryId);
}
--
Gitblit v1.8.0