From 6b6324ae024a27fcc2232088f193922e2ded2161 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 23 四月 2024 15:52:59 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 64 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 16 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 1473de8..91a3128 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
@@ -1,19 +1,15 @@
package com.example.erp.service.sd;
import com.alibaba.excel.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
import com.baomidou.dynamic.datasource.annotation.DS;
-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 com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.mm.FinishedGoodsInventoryMapper;
-import com.example.erp.mapper.sd.DeliveryDetailMapper;
-import com.example.erp.mapper.sd.DeliveryMapper;
-import com.example.erp.mapper.sd.OrderDetailMapper;
-import com.example.erp.mapper.sd.OrderMapper;
+import com.example.erp.mapper.sd.*;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -23,7 +19,7 @@
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
-import java.math.BigDecimal;
+import java.util.concurrent.atomic.AtomicReference;
@Service
@DS("sd")
@@ -39,6 +35,8 @@
OrderDetailMapper orderDetailMapper;
@Autowired
FinishedGoodsInventoryMapper finishedGoodsInventoryMapper;
+ @Autowired
+ DeliveryOtherMoneyMapper deliveryOtherMoneyMapper;
@Autowired
SysErrorService sysErrorService;
@@ -94,6 +92,7 @@
map.put("data", deliveryDetailMapper.getSelectShippingOrderDetail(offset, pageSize, orderDetail));
map.put("delivery", deliveryMapper.getSelectShippingOrderDetailDelivery(offset, pageSize, orderDetail));
map.put("total", deliveryDetailMapper.getSelectShippingOrderDetailPageTotal(offset, pageSize, orderDetail));
+ map.put("orderOtherMoneyList",deliveryOtherMoneyMapper.findById(orderDetail.getDeliveryDetail().getDeliveryId()));
return map;
}
@@ -134,15 +133,18 @@
boolean saveState = true;
//璁剧疆鍥炴粴鐐�
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
- try {
+ try{
- String deliveryId = "";
+ String deliveryId="";
String oddNumber;
if (object.get("deliveryId") != null) {
deliveryId = object.get("deliveryId").toString();
+ } else {
+ deliveryId = "";
}
Delivery delivery = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), Delivery.class);
List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("delivery")), OrderDetail.class);
+ List<DeliveryOtherMoney> deliveryOtherMoneyList = JSONArray.parseArray(JSONObject.toJSONString(object.get("otherMoney")), DeliveryOtherMoney.class);
//鏌ヨ鍙戣揣鍗曟槸鍚﹀瓨鍦�
Integer deliveryConut = deliveryMapper.getDeliveryConut(deliveryId);
@@ -159,6 +161,7 @@
}
}
+
List<DeliveryDetail> deliveryDetaillist = deliveryDetailMapper.getIsNotDeliveryDetail(deliveryDetailNumber, deliveryId);
if (!deliveryDetaillist.isEmpty()) {
for (DeliveryDetail deliveryDetail : deliveryDetaillist) {
@@ -168,9 +171,11 @@
}
}
//杩樺師鍙戣揣琛ㄧ殑闈㈢Н鏁伴噺閲戦
- deliveryMapper.updatedelivery(0.0, 0, 0.0, deliveryId);
+ deliveryMapper.updatedelivery(0.0, 0, 0.0,0.0, deliveryId);
//鍒犻櫎鍙戣揣鏄庣粏鐨勬暟鎹�
deliveryDetailMapper.deleteDeliveryDetail(deliveryId);
+ //鍒犻櫎璁㈠崟棰濆閲戦鐨勬暟鎹�
+ deliveryOtherMoneyMapper.deleteDeliveryOtherMoney(deliveryId);
oddNumber = deliveryId;
} else {
//鑾峰彇鍗曞彿
@@ -178,9 +183,10 @@
//鏂板鍙戣揣琛ㄦ暟鎹�
deliveryMapper.insertDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
}
- Double area = 0.0;
+ double area = 0.0;
Integer quantity = 0;
- Double money = 0.0;
+ double money = 0.0;
+ AtomicReference<Double> otherMoney = new AtomicReference<>(0.0);
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
if (!orderDetaillist.isEmpty()) {
@@ -190,6 +196,21 @@
area += orderDetail.getFinishedGoodsInventory().getActualSignalArea() * orderDetail.getDeliveryDetail().getQuantity();
money += orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity();
Integer deliveryDetailmaximum = deliveryDetailMapper.getdeliveryDetailmaximum(oddNumber);
+
+ Map<String,Double> otherColumns = JSON.parseObject(orderDetail.getOtherColumns(), new TypeReference<Map<String, Double>>(){});
+ if(otherColumns!=null){
+ otherColumns.forEach((key, value) ->{
+ deliveryOtherMoneyList.forEach(deliveryOtherMoney ->{
+ if(deliveryOtherMoney.getColumn().equals(key)){
+ deliveryOtherMoney.setQuantity (otherColumns.get(key)==null?0:otherColumns.get(key));
+ deliveryOtherMoney.setQuantity(((value==null?0:value)*orderDetail.getDeliveryDetail().getQuantity()));
+ }
+ });
+
+ });
+ }
+
+
//鏂板鍙戣揣鏄庣粏鏁版嵁
deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1);
//淇敼璁㈠崟鏄庣粏
@@ -198,13 +219,23 @@
finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getOrderId(), orderDetail.getOrderNumber(), orderDetail.getDeliveryDetail().getQuantity());
}
+ //寰�璁㈠崟鍏朵粬閲戦鍓〃浼犲叆鏁版嵁
+ deliveryOtherMoneyList.forEach(deliveryOtherMoney ->{
+ deliveryOtherMoney.setId(null);
+ deliveryOtherMoney.setDeliveryId(oddNumber);
+ if(deliveryOtherMoney.getQuantity()!=null && deliveryOtherMoney.getPrice()!=null){
+ deliveryOtherMoney.setMoney((deliveryOtherMoney.getQuantity()*deliveryOtherMoney.getPrice()));
+ otherMoney.updateAndGet(v -> new Double((double) (v + deliveryOtherMoney.getMoney())));
+ deliveryOtherMoneyMapper.insertDeliveryOtherMoney(deliveryOtherMoney);
+ }
+ });
//淇敼鍙戣揣鏄庣粏绱姞闈㈢Н鏁伴噺閲戦
- deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(String.format("%.2f", money)), oddNumber);
+ deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(String.format("%.2f", money)), otherMoney.get(), oddNumber);
} else {
return false;
}
- } catch (Exception e) {
+ }catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
@@ -214,6 +245,7 @@
saveState = false;
}
+
return saveState;
}
--
Gitblit v1.8.0