From fdc35138850a1b21e87a1fba3761f7c2df15c068 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 16 七月 2024 10:14:15 +0800
Subject: [PATCH] 排产添加反审按钮
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 0c010ef..be98844 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
@@ -93,6 +93,7 @@
try{
LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Order::getOrderId, order.getOrderId());
+ order.setCreateTime(null);
orderMapper.update(order,updateWrapper);
//淇敼璁㈠崟涓昏〃闈㈢Н涓庡懆闀夸互鍙婇噸閲�
orderMapper.updateOrderParameter(order.getOrderId());
@@ -576,10 +577,11 @@
List<OrderDetail> orderDetails = orderDetailMapper.getOrderProductByProductId(map.get("productId"),orderId);
orderDetails.forEach(orderDetail->{
orderDetail.setGrossArea(
- Double.parseDouble(String.format("%.3f",Double.parseDouble(
+ /*Double.parseDouble(String.format("%.3f",Double.parseDouble(
String.format("%.3f",
orderDetail.getWidth()*orderDetail.getHeight()/1000000)
- ) * orderDetail.getQuantity()))
+ ) * orderDetail.getQuantity()))*/
+ orderDetail.getComputeGrossArea()
);
List<OrderGlassDetail> orderGlassDetails =
--
Gitblit v1.8.0