From 40a1da64f471f6e1aee58d0fcc3468d4db051a95 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 05 七月 2024 16:49:25 +0800
Subject: [PATCH] 提交一键完工，打印其他金额
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 10 +++++++---
1 files changed, 7 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 f609666..7736752 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
@@ -360,13 +360,14 @@
List <Map<String, Object>> moneryList=new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
List<DeliveryDetail> deliveryDetailList=deliveryDetailMapper.getSelectDeliveryPrinting(deliveryDetail);
String orderId="";
+ double otherMoney=0.0;
for (DeliveryDetail detail : deliveryDetailList) {
- System.out.println(detail);
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());
@@ -374,7 +375,9 @@
boolean isnull = key.contains("M");
if(isnull) {
Map<String, Object> moneryItemmap = new HashMap<>();
- List<Map<String, Object>> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectotherMoney(detail.getOrderDetail().getOrderId(), detail.getDeliveryId(), key, jsonObject.get(key).toString());
+ Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectotherMoney(detail.getOrderDetail().getOrderId(),
+ detail.getDeliveryId(),Integer.parseInt(stringObjectMap.get("order_number").toString()), key, jsonObject.get(key).toString());
+ otherMoney=otherMoney+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
moneryList.add(moneryItemmap);
}
@@ -388,6 +391,7 @@
}
Delivery delivery=deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail);
+ delivery.setMoney(delivery.getMoney()+otherMoney);
map.put("data", list);
map.put("otherMoney",moneryList);
map.put("delivery", deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail));
@@ -414,7 +418,7 @@
boolean isnull = key.contains("M");
if(isnull){
Map<String, Object> moneryItemmap = new HashMap<>();
- List<Map<String, Object>> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(detail.getOrderId(),key,jsonObject.get(key).toString());
+ Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(detail.getOrderId(),Integer.parseInt(stringObjectMap.get("order_number").toString()),key,jsonObject.get(key).toString());
moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
moneryList.add(moneryItemmap);
}
--
Gitblit v1.8.0