From 0b8d0ead8e5fc8b2327688e65257834eb8dff37b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 01 七月 2024 12:15:21 +0800
Subject: [PATCH] 提交
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
index f0525b5..166c1a6 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
@@ -19,6 +19,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import java.lang.reflect.Field;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
@@ -343,23 +344,38 @@
}
- public Map<String, Object> getSelectDeliveryPrinting( DeliveryDetail deliveryDetail) {
+ public Map<String, Object> getSelectDeliveryPrinting( DeliveryDetail deliveryDetail) throws IllegalAccessException {
Map<String, Object> map = new HashMap<>();
List <Map<String, Object>> list=new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+ List <Map<String, Object>> moneryList=new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
List<DeliveryDetail> deliveryDetailList=deliveryDetailMapper.getSelectDeliveryPrinting(deliveryDetail);
+ String orderId="";
for (DeliveryDetail detail : deliveryDetailList) {
-
+ orderId=detail.getOrderDetail().getOrderId();
Map<String, Object> itemmap = new HashMap<>();
+
List<Map<String, Object>> deliveryDetailList2 = deliveryDetailMapper.getSelectDeliveryDetailPrinting(detail.getDeliveryId(),
detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());
+ for (Map<String, Object> stringObjectMap : deliveryDetailList2) {
+ if(stringObjectMap.get("other_columns")!=null){
+ JSONObject jsonObject = JSON.parseObject(stringObjectMap.get("other_columns").toString());
+ for(String key : jsonObject.keySet()){
+ Map<String, Object> moneryItemmap = new HashMap<>();
+ List<Map<String, Object>> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectotherMoney(detail.getOrderDetail().getOrderId(),detail.getDeliveryId(),key,jsonObject.get(key).toString());
+ moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
+ moneryList.add(moneryItemmap);
+ }
+
+ }
+ }
itemmap.put("DeliveryDetail", detail);
itemmap.put("DeliveryDetailList", deliveryDetailList2);
list.add(itemmap);
-
}
Delivery delivery=deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail);
map.put("data", list);
+ map.put("otherMoney",moneryList);
map.put("delivery", deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail));
map.put("money", toChinese(delivery.getMoney().toString(), false));
return map;
--
Gitblit v1.8.0