From 4dab23e4f826abd3d744c836054e4ddaac715d4d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期六, 31 八月 2024 10:56:28 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index d559921..3a03a09 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -23,6 +23,9 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.sql.SQLOutput;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
@@ -85,7 +88,7 @@
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
- sysError.setError(e.toString());
+ sysError.setError(e.toString()+Arrays.toString(e.getStackTrace()));
sysError.setFunc("saveOrder");
sysErrorService.insert(sysError);
saveState = false;
@@ -169,6 +172,13 @@
String formattedDate = dateFormat.format(currentDate);
orderId = "NG"+formattedDate+formattedNumber;
+ }else if(dateType.equals("year")){
+ Integer maxOrderId = orderMapper.selectMaxOrderIdByYear();
+ String formattedNumber = String.format("%06d", maxOrderId+1);
+ Date currentDate = new Date();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yy");
+ String formattedDate = dateFormat.format(currentDate);
+ orderId = "NG"+formattedDate+formattedNumber;
}
return orderId;
@@ -223,21 +233,26 @@
Map<String,Object> otherColumns = JSON.parseObject(OrderDetails.get(i).getOtherColumns(), new TypeReference<Map<String, Object>>(){});
int finalI = i;
-
if(otherColumns!=null){
+ otherColumns.values().removeIf(value -> value == null || value.equals(""));
+ OrderDetails.get(i).setOtherColumns(JSON.toJSONString(otherColumns));
+
otherColumns.forEach((key, value) ->{
- if(value!=null && key.contains("M")) {
+
+ if(value!=null && !value.equals("") && key.contains("M")) {
orderOtherMoneyList.forEach(orderOtherMoney -> {
if (orderOtherMoney.getColumn().equals(key)) {
- orderOtherMoney.setQuantity(orderOtherMoney.getQuantity()+(Double.parseDouble((String) value) * OrderDetails.get(finalI).getQuantity()));
+ orderOtherMoney.setQuantity(
+ orderOtherMoney.getQuantity()+(Double.parseDouble((String) value) * OrderDetails.get(finalI).getQuantity()));
}
});
}
});
- }else if(OrderDetails.get(i).getOtherColumns()==null){
+ }else{
OrderDetails.get(i).setOtherColumns("{}");
}
+
}
@@ -370,8 +385,15 @@
double money = 0;
for (OrderDetail orderDetail : OrderDetails) {
orderDetail = updateOrderMoneyComputed(orderDetail,order.getCalculateType());
- money+= orderDetail.getGrossAmount();
+ BigDecimal getGrossAmount= BigDecimal.valueOf(orderDetail.getGrossAmount());
+ money+=getGrossAmount.doubleValue();
}
+ Log log = new Log();
+ log.setOperator(order.getCreator());
+ log.setOperatorId(order.getCreatorId());
+ log.setContent(jsonObject.toString());
+ log.setFunction("updateOrderMoney閲戦閲嶇疆:"+order.getOrderId());
+
orderOtherMoneyList.forEach(orderOtherMoney -> {
if(orderOtherMoney.getQuantity()!=null && orderOtherMoney.getPrice()!=null){
orderOtherMoney.setMoney((orderOtherMoney.getQuantity()*orderOtherMoney.getPrice()));
@@ -384,14 +406,18 @@
order.setOtherMoney(orderOtherMoneyMapper.selectGrossAmount(order.getOrderId()));
orderMapper.updateMoney(order);
orderDetailMapper.updateOrderMoney(OrderDetails);
+ logService.saveLog(log);
return false;
}
private OrderDetail updateOrderMoneyComputed(OrderDetail orderDetail, Integer calculateType) {
+ BigDecimal getPrice= BigDecimal.valueOf(orderDetail.getPrice());
+ BigDecimal getQuantity= BigDecimal.valueOf(orderDetail.getQuantity());
+ BigDecimal getComputeGrossArea= BigDecimal.valueOf(orderDetail.getComputeGrossArea());
if (calculateType == 3) {
- orderDetail.setGrossAmount(orderDetail.getPrice() * orderDetail.getQuantity());
+ orderDetail.setGrossAmount(getPrice.multiply(getQuantity).setScale(2, RoundingMode.HALF_UP).doubleValue());
} else {
- orderDetail.setGrossAmount(orderDetail.getComputeGrossArea() * orderDetail.getPrice());
+ orderDetail.setGrossAmount(getPrice.multiply(getComputeGrossArea).setScale(2, RoundingMode.HALF_UP).doubleValue());
}
return orderDetail;
}
--
Gitblit v1.8.0