修改发货报表

廖井涛

2024-07-28 24eadc222f7a8d4c5305956587da5e2409d844f8

修改发货报表

 north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue

@@ -198,6 +198,7 @@
    {field: 'customer_id',width:120,  title: t('customer.customerNumber')},
    {field: 'customer_name',width:120,  title: t('customer.customerName')},
    {field: 'quantity',width:120,  title: t('order.quantity')},
    {field: 'price',width:120, title: t('order.price'), sortable: true},
    //{field: 'product_id',width:120,  title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'product_name',width:120,  title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'project',width:120,  title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},

 north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryProductReport.vue

@@ -17,6 +17,7 @@
    {field: 'delivery.paymentTerms',width:120, title: t('delivery.paymentTerms'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'delivery.project',width:140, title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'quantity',width:120, title: t('order.quantity'), sortable: true},
    {field: 'price',width:120, title: t('order.price'), sortable: true},
    {field: 'area',width:120, title: t('productStock.totalArea'), sortable: true},
    {field: 'money',width:120, title: t('delivery.money'), sortable: true},
    {field: 'delivery.customerId',width:120, title: t('customer.customerNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},

 north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryReport.vue

@@ -17,13 +17,14 @@
    {field: 'delivery.paymentTerms',width:120, title: t('delivery.paymentTerms'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'delivery.project',width:140, title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'quantity',width:120, title: t('order.quantity'), sortable: true},
    {field: 'price',width:120, title: t('order.price'), sortable: true},
    {field: 'area',width:120, title: t('productStock.totalArea'), sortable: true},
    {field: 'money',width:120, title: t('delivery.money'), sortable: true},
    {field: 'delivery.customerId',width:120, title: t('customer.customerNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'delivery.customerName',width:120, title: t('customer.customerName'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'delivery.deliveryDate',width:120, title: t('delivery.deliveryDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'delivery.payMethod',width:120, title: t('delivery.paymentMethod'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'delivery.payDate',width:120, title: t('delivery.deliveryDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    //{field: 'delivery.payDate',width:120, title: t('delivery.deliveryDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'delivery.salesman',width:120, title: t('delivery.salesman'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'delivery.creator',width:120, title:  t('delivery.shipper'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'delivery.contacts',width:120, title: t('delivery.contacts'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},

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

@@ -28,6 +28,8 @@
    private String project;
    @ExcelProperty("数量")
    private Integer quantity;
    @ExcelProperty("单价")
    private Integer price;
    @ExcelProperty("面积")
    private Double area;
    @ExcelProperty("金额")

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

@@ -27,6 +27,8 @@
    private String project;
    @ExcelProperty("数量")
    private Integer quantity;
    @ExcelProperty("单价")
    private Integer price;
    @ExcelProperty("面积")
    private Double area;
    @ExcelProperty("金额")

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

@@ -66,6 +66,7 @@
        <result column="delivery_number" property="deliveryNumber"/>
        <result column="quantity" property="quantity"/>
        <result column="area" property="area"/>
        <result column="price" property="price"/>
        <result column="money" property="money"/>
        <result column="delivery_detail_remakes" property="deliveryDetailRemakes"/>
        <result column="delivery_detail_state" property="deliveryDetailState"/>
@@ -537,6 +538,7 @@
        dd.order_id,
        dd.order_number,
        dd.area,
        dd.price,
        dd.money,
        dd.quantity,
        dd.delivery_detail_remakes,
@@ -566,6 +568,9 @@
            </if>
            <if test="deliveryDetail.area != null and deliveryDetail.area != ''">
                and dd.area like concat('%', #{deliveryDetail.area},'%')
            </if>
            <if test="deliveryDetail.price != null and deliveryDetail.price != ''">
                and dd.price like concat('%', #{deliveryDetail.price},'%')
            </if>
            <if test="deliveryDetail.money != null and deliveryDetail.money != ''">
                and dd.money like concat('%', #{deliveryDetail.money},'%')
@@ -650,6 +655,9 @@
            <if test="deliveryDetail.area != null and deliveryDetail.area != ''">
                and dd.area like concat('%', #{deliveryDetail.area},'%')
            </if>
            <if test="deliveryDetail.price != null and deliveryDetail.price != ''">
                and dd.price like concat('%', #{deliveryDetail.price},'%')
            </if>
            <if test="deliveryDetail.money != null and deliveryDetail.money != ''">
                and dd.money like concat('%', #{deliveryDetail.money},'%')
            </if>
@@ -724,6 +732,7 @@
        dd.order_id,
        dd.order_number,
        sum(dd.area) as area,
        dd.price,
        sum(dd.money) as money,
        sum(dd.quantity) as quantity,
        dd.delivery_detail_remakes,
@@ -752,6 +761,9 @@
            </if>
            <if test="deliveryDetail.area != null and deliveryDetail.area != ''">
                and dd.area like concat('%', #{deliveryDetail.area},'%')
            </if>
            <if test="deliveryDetail.price != null and deliveryDetail.price != ''">
                and dd.price like concat('%', #{deliveryDetail.price},'%')
            </if>
            <if test="deliveryDetail.money != null and deliveryDetail.money != ''">
                and dd.money like concat('%', #{deliveryDetail.money},'%')
@@ -844,6 +856,9 @@
            </if>
            <if test="deliveryDetail.area != null and deliveryDetail.area != ''">
                and dd.area like concat('%', #{deliveryDetail.area},'%')
            </if>
            <if test="deliveryDetail.price != null and deliveryDetail.price != ''">
                and dd.price like concat('%', #{deliveryDetail.price},'%')
            </if>
            <if test="deliveryDetail.money != null and deliveryDetail.money != ''">
                and dd.money like concat('%', #{deliveryDetail.money},'%')
@@ -1010,6 +1025,7 @@
        dd.order_id,
        dd.order_number,
        dd.area,
        dd.price,
        dd.money,
        dd.quantity,
        dd.delivery_detail_remakes,
@@ -1046,6 +1062,7 @@
               sum(dd.money) as money,
               sum(dd.quantity) as quantity,
               dd.delivery_detail_remakes,
               dd.price,
               dd.create_time
        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