修改工程打印以及发货单创建的运费功能添加

廖井涛

2024-07-07 ec4d06c37f948a24f5313b60b4d27327d6975bdc

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -213,6 +213,9 @@
                    }

                });
            }else if(OrderDetails.get(i).getOtherColumns()==null){

                OrderDetails.get(i).setOtherColumns("{}");
            }
        }

@@ -490,15 +493,7 @@
            orderProductDetailMap.put("productId",map.get("productId"));
            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",
                                        orderDetail.getWidth()*orderDetail.getHeight()/1000000)
                        ) * orderDetail.getQuantity()))
                );
            });

            orderProductDetailMap.put("productDetail",orderDetails);
            orderProductDetail.add(orderProductDetailMap);
@@ -557,4 +552,8 @@


    }

    public boolean updateOrderPrintNumber(String orderId) {
        return orderMapper.updateOrderPrintNumber(orderId);
    }
}