From ad4e0e5444d2f4f6a4df45742a146428d646d02e Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 01 七月 2024 13:23:56 +0800
Subject: [PATCH] 提交空闲位置
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 26 ++++++++++++++++++--------
1 files changed, 18 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 a3bf1ad..69fe059 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,12 @@
JSONObject orderJson = new JSONObject(orderMap);
Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);
Map<String,Object> map = new HashMap<>();
- map.put("data",orderMapper.selectOrder(order));
+ if(order.getOrderId()!=null && !order.getOrderId().isEmpty()){
+ map.put("data",0);
+ }else{
+ map.put("data",orderMapper.selectOrder(order));
+ }
+
return map;
}
//鐢熸垚璁㈠崟鏁版嵁
@@ -160,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){
//鑾峰彇寮挗寮у害
@@ -423,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()))
);
});
@@ -454,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 =
@@ -464,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