修改打印生产单大小片区分

廖井涛

2025-02-13 657c6ae96e46fa2c8b741d19c9454d0a9850c3d3

修改打印生产单大小片区分

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

@@ -36,6 +36,7 @@
})
const getData = () => {
  request.get(`/order/printOrderProductDetail/${props.orderId}/${selectedValues.value}`).then(res => {
    console.log( res.data)
    data.value= res.data
    productIdData.value=data.value.orderProductDetail
    data.value.orderProductDetail.forEach(item => {
@@ -188,6 +189,11 @@
                <td>{{items.orderNumber}}</td>
                <td>{{items.buildingNumber}}</td>
                <td colspan="3" style="font-size: 20px;font-weight: bold;" v-if="items.otherColumns?.S02">{{items.otherColumns?.S02}}</td>
                <td colspan="3" style="font-size: 20px;font-weight: bold;" v-else-if="items.differentSize=1">
                  <template v-for="(orderGlassDetail, index1) in items.orderGlassDetails" >
                  ({{orderGlassDetail.childWidth}}x{{orderGlassDetail.childHeight}})
                  </template>
                </td>
                <td colspan="3" style="font-size: 20px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td>
                <td style="font-size: 20px;font-weight: bold;">{{items.quantity}}</td>
                <td style="font-size: 20px;font-weight: bold;">{{items.grossArea.toFixed(2)}}</td>
@@ -322,7 +328,7 @@
  height: 30px;
}
.contactNumber{
  width: 150px;
  width: 125px;
  height:20px;
  border: none;
  box-shadow: none;

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue

@@ -153,7 +153,8 @@
        <span>{{ item.processingNote }}</span>
      </div>
    </div>
    <div style="width: 20px" v-if="id%2===0"></div>
    <div style="width: 19px" v-if="id%2===0"></div>
      <div class="element-to-break-after" style="width: 1px" v-if="id%2===1"></div>
    </template>
  </div>

@@ -231,7 +232,9 @@
  font-size: 8pt;
}


.element-to-break-after {
  page-break-after: always;
}




 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue

@@ -183,7 +183,8 @@
        <span>{{item.processing_note}}</span>
      </div>
    </div>
      <div style="width: 20px" v-if="id%2===0"></div>
      <div style="width: 19px" v-if="id%2===0"></div>
      <div class="element-to-break-after" style="width: 1px" v-if="id%2===1"></div>
    </template>
  </div>

@@ -280,7 +281,9 @@
}



.element-to-break-after {
  page-break-after: always;
}




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

@@ -613,6 +613,19 @@
            orderProductDetailMap.put("productId",map.get("productId"));
            orderProductDetailMap.put("productName",map.get("productName"));
            List<OrderDetail> orderDetails = orderDetailMapper.getOrderProductByProductId(map.get("productId"),orderId);
            orderDetails.forEach(orderDetail->{

                List<OrderGlassDetail> orderGlassDetails =
                        orderGlassDetailMapper.selectList(
                                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);
            });

            orderProductDetailMap.put("productDetail",orderDetails);
            orderProductDetail.add(orderProductDetailMap);
        });
@@ -631,13 +644,24 @@
        }else{
            orderProductDistinct = orderDetailMapper.getOrderProductDistinctById(orderId);
        }

        List<Map<String,Object>> orderProductDetail = new ArrayList<>();
        orderProductDistinct.forEach(map->{
            Map<String,Object> orderProductDetailMap = new HashMap<>();
            orderProductDetailMap.put("productId",map.get("productId"));
            orderProductDetailMap.put("productName",map.get("productName"));
            List<OrderDetail> orderDetails = orderDetailMapper.getOrderProductByProductId(map.get("productId"),orderId);
            orderDetails.forEach(orderDetail->{

                List<OrderGlassDetail> orderGlassDetails =
                        orderGlassDetailMapper.selectList(
                                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);
            });


            orderProductDetailMap.put("productDetail",orderDetails);