From 8668e5ce64e1d7b3dbfffc42cf6767cb9ea2d6c0 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 25 六月 2024 09:54:15 +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 | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 98ee83d..110b790 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));
@@ -428,10 +428,12 @@
orderProductDetailMap.put("productName",map.get("productName"));
List<OrderDetail> orderDetails = orderDetailMapper.getOrderProductByProductId(map.get("productId"),orderId);
orderDetails.forEach(orderDetail->{
+
orderDetail.setGrossArea(
- Double.parseDouble(String.format("%.3f",
+ Double.parseDouble(String.format("%.3f",Double.parseDouble(
+ String.format("%.3f",
orderDetail.getWidth()*orderDetail.getHeight()/1000000)
- ) * orderDetail.getQuantity()
+ ) * orderDetail.getQuantity()))
);
});
@@ -459,9 +461,10 @@
List<OrderDetail> orderDetails = orderDetailMapper.getOrderProductByProductId(map.get("productId"),orderId);
orderDetails.forEach(orderDetail->{
orderDetail.setGrossArea(
- Double.parseDouble(String.format("%.3f",
- orderDetail.getWidth()*orderDetail.getHeight()/1000000)
- ) * orderDetail.getQuantity()
+ Double.parseDouble(String.format("%.3f",Double.parseDouble(
+ String.format("%.3f",
+ orderDetail.getWidth()*orderDetail.getHeight()/1000000)
+ ) * orderDetail.getQuantity()))
);
List<OrderGlassDetail> orderGlassDetails =
@@ -469,7 +472,9 @@
new QueryWrapper<OrderGlassDetail>().
eq("order_id",orderId).
eq("order_number",orderDetail.getOrderNumber())
- );
+ );
+ Integer differentSize = orderGlassDetailMapper.getDifferentSizeNumber(orderId,orderDetail.getOrderNumber());
+ orderDetail.setDifferentSize(differentSize);
orderDetail.setOrderGlassDetails(orderGlassDetails);
});
--
Gitblit v1.8.0