廖井涛
2025-04-09 80ca08209323f27348ae4bf72fc6c3bb9c64baad
订单重量显示修改
3个文件已修改
16 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderDTO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
@@ -124,7 +124,7 @@
const getWeight = (productList) => {
  let weight = 0
  productList.forEach(item => {
    weight += item.weight
    weight += item.weight*item.quantity
  })
  return parseFloat(weight.toFixed(2))
}
north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderDTO.java
@@ -27,6 +27,8 @@
    private Double grossArea;
    @ExcelProperty("结算总面积")
    private Double computeGrossArea;
    @ExcelProperty("重量")
    private Double weights;
    @ExcelProperty("形状")
    private String shape;
    @ExcelProperty("磨边类型")
north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -97,6 +97,7 @@
        <result column="levelTwo" property="levelTwo"/>
        <result column="total_thickness" property="totalThickness"/>
        <result column="createTime" property="createTime"/>
        <result column="weights" property="weight"/>
        <result column="order_type" property="order.orderType"/>
        <result column="customer_name" property="order.customerName"/>
@@ -266,10 +267,11 @@
    <select id="getOrderReport" resultMap="orderMap">
        SELECT
            *,
            round(a.weight*a.quantity,2) as weights,
            a.create_time as createTime,
            d.type_name as levelOne,
            e.type_name as levelTwo
        from order_detail as a
        from sd.order_detail as a
        left join sd.`order` as b
            on b.order_id = a.order_id
        left join sd.product as c
@@ -552,11 +554,12 @@
    <select id="exportOrderReport"  >
        SELECT
            *,
            round(a.weight*a.quantity,2) as weights,
            b.processing_note as processingNotes,
            a.create_time as createTime,
            d.type_name as level_one,
            e.type_name as level_two
        from order_detail as a
        from sd.order_detail as a
         left join sd.`order` as b
                   on b.order_id = a.order_id
         left join sd.product as c
@@ -566,6 +569,7 @@
         left join sd.basic_glass_type as e
                   on e.type_id = d.belong
        where  date(a.create_time)>=#{dates[0]} and date(a.create_time) &lt;= #{dates[1]} and b.order_review>0
        order by b.order_id desc
    </select>
@@ -587,7 +591,7 @@
        a.edging_type,
        b.pack_type,
        round(sum(a.perimeter),2) as perimeter,
        round(sum(a.weight),2) as weight,
        round(sum(a.weight*a.quantity),2) as weights,
        a.price,
        sum(a.gross_amount ) as gross_amount,
        b.al_type,
@@ -916,7 +920,7 @@
               a.remarks,
               a.bend_radius,
               a.edging_type,
               a.weight,
               round(sum(a.weight*a.quantity),2) as weights,
               a.perimeter,
               a.other_columns,
               a.warehouse_num,