修改发货报表以及新增单片周长字段

廖井涛

2024-10-21 e131f6e16de1df9fdcb7ede55cb9f4dc93e48ae8

修改发货报表以及新增单片周长字段

 north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue

@@ -159,7 +159,7 @@
    {field: 'grossArea',width:160,  title: t('order.trueGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
    {field: 'computeArea',width:180,  title: t('order.computeArea'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'computeGrossArea',width:200,  title: t('order.computeGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'perimeter',width:200,  title: t('order.perimeter'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'monolithicPerimeter',width:200,  title: t('order.perimeter'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'shape',width:120,
      title: t('order.shape'),
      editRender: { name: 'input'},

 north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java

@@ -38,6 +38,7 @@
    private Double archRise;
    private Double weight;
    private Double perimeter;
    private Double monolithicPerimeter;
    private String otherColumns;
    private Integer warehouseNum;
    private Integer deliveryNum;

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

@@ -232,6 +232,7 @@
            OrderDetails.get(i).setOrderNumber(i+1);
            OrderDetails.get(i).setOrderId(orderId);
            OrderDetails.get(i).setPerimeter(Double.valueOf(String.format("%.3f",(OrderDetails.get(i).getWidth()+OrderDetails.get(i).getHeight())*2/1000*OrderDetails.get(i).getQuantity())));
            OrderDetails.get(i).setMonolithicPerimeter(Double.valueOf(String.format("%.3f",(OrderDetails.get(i).getWidth()+OrderDetails.get(i).getHeight())*2/1000)));
            Product product = productMapper.selectById(OrderDetails.get(i).getProductId());

            OrderDetails.get(i).setWeight(Double.valueOf(String.format("%.2f",product.getThickness()*OrderDetails.get(i).getWidth()*OrderDetails.get(i).getHeight()/1000000*2.5)));

 north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml

@@ -51,7 +51,7 @@

                where date(d.create_time)>=#{startDate} and date(d.create_time) <= #{endDate}
                and d.customer_id = #{orderDetail.order.customerId}
        group by od.order_id,od.product_id
        group by dd.delivery_id,od.order_id,od.product_id
        limit #{offset},#{pageSize};
    </select>

@@ -65,7 +65,7 @@
        where
             date(d.create_time)>=#{startDate} and date(d.create_time) &lt;= #{endDate}
            and d.customer_id = #{orderDetail.order.customerId}
        group by od.order_id,od.product_id) as zu
        group by dd.delivery_id,od.order_id,od.product_id) as zu
    </select>

    <select id="getSelectCustomerOderDate" >
@@ -242,7 +242,7 @@
        where date(d.create_time) >= #{startDate}
          and date(d.create_time) &lt;= #{endDate}
          and d.customer_id = #{orderDetail.order.customerId}
        group by od.order_id,od.product_id
        group by dd.delivery_id,od.order_id,od.product_id

        UNION ALL


 north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml

@@ -27,6 +27,7 @@
                            arch_rise,
                            weight,
                            perimeter,
                            monolithic_perimeter,
                            other_columns
                          )
        values
@@ -53,6 +54,7 @@
            #{orderDetail.archRise},
            #{orderDetail.weight},
            #{orderDetail.perimeter},
            #{orderDetail.monolithicPerimeter},
            #{orderDetail.otherColumns}
             )
        </foreach>