From e42a1f99f14136657f78c0a803014acb9e03972c Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 25 四月 2024 09:36:55 +0800
Subject: [PATCH] 提交拉去 报工修改
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 80 ++++++++++++++++++++++++++-------------
1 files changed, 53 insertions(+), 27 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 c14a556..e27ceb3 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;
@@ -77,7 +75,6 @@
endDate = selectDate.get(1);
}
}
- System.out.println(pageSize);
Map<String, Object> map = new HashMap<>();
map.put("data", deliveryDetailMapper.getSelectDeliveryDetailReport(offset, pageSize,startDate,endDate, deliveryDetail));
map.put("total", deliveryDetailMapper.getSelectDeliveryDetailReportPageTotal(offset, pageSize,startDate,endDate, deliveryDetail));
@@ -95,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;
}
@@ -135,15 +133,18 @@
boolean saveState = true;
//璁剧疆鍥炴粴鐐�
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
- 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);
@@ -160,6 +161,7 @@
}
}
+
List<DeliveryDetail> deliveryDetaillist = deliveryDetailMapper.getIsNotDeliveryDetail(deliveryDetailNumber, deliveryId);
if (!deliveryDetaillist.isEmpty()) {
for (DeliveryDetail deliveryDetail : deliveryDetaillist) {
@@ -169,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 {
//鑾峰彇鍗曞彿
@@ -179,12 +183,17 @@
//鏂板鍙戣揣琛ㄦ暟鎹�
deliveryMapper.insertDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
}
- System.out.println(4);
- 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);
+ //鍏堟妸鍏朵粬閲戦鍓〃鐨勯噾棰濅笌鏁伴噺缃�0
+ deliveryOtherMoneyList.forEach(deliveryOtherMoney -> {
+ deliveryOtherMoney.setQuantity(0.0);
+ });
+
+ //鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
if (!orderDetaillist.isEmpty()) {
for (OrderDetail orderDetail : orderDetaillist) {
@@ -192,6 +201,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) ->{
+ if(value!=null) {
+ deliveryOtherMoneyList.forEach(deliveryOtherMoney ->{
+ if(deliveryOtherMoney.getColumn().equals(key)){
+ deliveryOtherMoney.setQuantity(deliveryOtherMoney.getQuantity()+(value * orderDetail.getDeliveryDetail().getQuantity()));
+ }
+ });
+
+ }
+ });
+ }
+
//鏂板鍙戣揣鏄庣粏鏁版嵁
deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1);
//淇敼璁㈠崟鏄庣粏
@@ -200,22 +224,24 @@
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) {
- TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
- //灏嗗紓甯镐紶鍏ユ暟鎹簱
- SysError sysError = new SysError();
- sysError.setError(e.toString());
- sysError.setFunc("saveOrder");
- sysErrorService.insert(sysError);
- saveState = false;
- }
+
return saveState;
}
--
Gitblit v1.8.0