From b74d3f3e8cfece410031916d18b9ebccb0aba731 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 03 七月 2024 13:04:25 +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 | 7 ++++---
1 files changed, 4 insertions(+), 3 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 47a0279..46d7340 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
@@ -107,7 +107,7 @@
JSONObject orderJson = new JSONObject(orderMap);
Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);
Map<String,Object> map = new HashMap<>();
- if(order.getOrderId()!=null){
+ if(order.getOrderId()!=null && !order.getOrderId().isEmpty()){
map.put("data",0);
}else{
map.put("data",orderMapper.selectOrder(order));
@@ -165,7 +165,7 @@
for (int i = 0; i < OrderDetails.size(); i++) {
OrderDetails.get(i).setOrderNumber(i+1);
OrderDetails.get(i).setOrderId(orderId);
- OrderDetails.get(i).setPerimeter(OrderDetails.get(i).getWidth()*OrderDetails.get(i).getHeight()*2/1000);
+ OrderDetails.get(i).setPerimeter((OrderDetails.get(i).getWidth()+OrderDetails.get(i).getHeight())*2/1000);
OrderDetails.get(i).setWeight(1.0);
if(OrderDetails.get(i).getBendRadius()!=null && OrderDetails.get(i).getBendRadius()!=0){
//鑾峰彇寮挗寮у害
@@ -329,7 +329,8 @@
orderDetail = updateOrderMoneyComputed(orderDetail,order.getCalculateType());
money+= orderDetail.getGrossAmount();
}
- order.setMoney(money);
+
+ order.setMoney(money+orderOtherMoneyMapper.selectGrossAmount(order.getOrderId()));
orderMapper.updateMoney(order);
orderDetailMapper.updateOrderMoney(OrderDetails);
return false;
--
Gitblit v1.8.0