提交

廖井涛

2024-07-05 5514536d619869e2de93941328be22b8edc244bb

提交

 north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue

@@ -38,7 +38,6 @@
  request.get(`/order/printOrderProductDetail/${props.orderId}/${selectedValues.value}`).then(res => {
    data.value= res.data
    productIdData.value=data.value.orderProductDetail
    console.log(data.value.orderProductDetail)
    data.value.orderProductDetail.forEach(item => {

      grossNum.value.quantity += getQuantity(item.productDetail)
@@ -102,7 +101,7 @@
const getArea = (productList) => {
  let area = 0
  productList.forEach(item => {
    area += item.grossArea
    area += item.computeGrossArea
  })
  return parseFloat(area.toFixed(2))

@@ -191,7 +190,7 @@
                <td colspan="2" style="font-size: 15px;font-weight: bold;" v-if="items.otherColumns?.S02">{{items.otherColumns?.S02}}</td>
                <td colspan="2" style="font-size: 15px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td>
                <td>{{items.quantity}}</td>
                <td>{{items.grossArea}}</td>
                <td>{{items.grossArea.toFixed(2)}}</td>
                <td colspan="2">{{items.processingNote}}</td>
              </tr>
              <tr class="day-in" >

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

@@ -490,15 +490,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);