修改订单保存表头以及发货报表导出

廖井涛

2024-10-08 7c630cad69350f9bc3a3c67eb13b8d6bbef3c9ee

修改订单保存表头以及发货报表导出

 north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java

@@ -34,6 +34,12 @@
    private Double area;
    @ExcelProperty("其他金额")
    private Double otherMoney;
    @ExcelProperty("运费金额")
    private Double freight;
    @ExcelProperty("运费单价")
    private Double freightPrice;
    @ExcelProperty("运费数量")
    private Double freightQuantity;
    @ExcelProperty("金额")
    private Double money;
    @ExcelProperty("客户编号")

 north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailProductDTO.java

@@ -33,6 +33,12 @@
    private Double area;
    @ExcelProperty("其他金额")
    private Double otherMoney;
    @ExcelProperty("运费金额")
    private Double freight;
    @ExcelProperty("运费单价")
    private Double freightPrice;
    @ExcelProperty("运费数量")
    private Double freightQuantity;
    @ExcelProperty("金额")
    private Double money;
    @ExcelProperty("客户编号")

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java

@@ -46,4 +46,6 @@
    Integer selectOrderIdYear(String oldOrderId);

    Boolean updateOrderId(String oldOrderId,String newOrderId);

    Order selectOrderId(String orderId);
}

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

@@ -112,6 +112,9 @@
            log.setOperatorId(order.getCreatorId());
            log.setContent(orderMap.toString());
            log.setFunction("saveOrderTitle保存表头:"+order.getOrderId());
            
            Order order1 = orderMapper.selectOrderId(order.getOrderId());
            order.setCalculateType(order1.getCalculateType());

            LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();
            updateWrapper.eq(Order::getOrderId, order.getOrderId());

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

@@ -1096,7 +1096,10 @@
        dd.quantity,
        dd.delivery_detail_remakes,
        dd.create_time,
        o.other_money
        o.other_money,
        d.freight,
        d.freight_price,
        d.freight_quantity
        from sd.delivery_detail dd
        left join sd.delivery d on dd.delivery_id=d.delivery_id
        left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
@@ -1132,7 +1135,10 @@
               dd.delivery_detail_remakes,
               dd.price,
               dd.create_time,
               o.other_money
               o.other_money,
               d.freight,
               d.freight_price,
               d.freight_quantity
        from sd.delivery_detail dd left join delivery d on dd.delivery_id=d.delivery_id
                                   left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
                                   left join sd.`order` o on dd.order_id=o.order_id

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

@@ -62,7 +62,9 @@
        select count(*) from sd.`order` where order_id=#{oldOrderId} and SUBSTR(#{oldOrderId},5,2)=000001
    </select>


    <select id="selectOrderId">
        select * from sd.`order` where order_id=#{orderId}
    </select>

    <update id="updateOrderId">
        update sd.`order` set order_id=#{newOrderId} where order_id=#{oldOrderId}