ERP_override.git

parent: 24eadc22 | 补丁 | 提交 | ignore whitespace

廖井涛

2024-07-28 dffdcaa14f32c51a63b4ab2cc7a38eebf17f8f44

修改发货报表

6个文件已修改

	north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryProductReport.vue	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryReport.vue	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailProductDTO.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/entity/sd/DeliveryDetail.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -19,6 +19,7 @@
    {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: 'order.otherMoney',width:120, title: t('basicData.otherAmounts'), 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},

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

@@ -19,6 +19,7 @@
    {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: 'order.otherMoney',width:120, title: t('basicData.otherAmounts'), 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},

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

@@ -32,6 +32,8 @@
    private Integer price;
    @ExcelProperty("面积")
    private Double area;
    @ExcelProperty("其他金额")
    private Double otherMoney;
    @ExcelProperty("金额")
    private Double money;
    @ExcelProperty("客户编号")
@@ -67,4 +69,5 @@




}

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

@@ -31,6 +31,8 @@
    private Integer price;
    @ExcelProperty("面积")
    private Double area;
    @ExcelProperty("其他金额")
    private Double otherMoney;
    @ExcelProperty("金额")
    private Double money;
    @ExcelProperty("客户编号")
@@ -62,4 +64,5 @@
    @ExcelProperty("报表日期")
    private LocalDate createTime;


}

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

@@ -27,5 +27,6 @@
    private LocalDate updateTime;
    private  Delivery delivery;
    private  OrderDetail orderDetail;
    private  Order order;

}

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

@@ -88,6 +88,8 @@
        <result column="product_id" property="orderDetail.productId"/>
        <result column="product_name" property="orderDetail.productName"/>

        <result column="other_money" property="order.otherMoney"/>



    </resultMap>
@@ -542,10 +544,12 @@
        dd.money,
        dd.quantity,
        dd.delivery_detail_remakes,
        dd.create_time
        dd.create_time,
        o.other_money
        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
        left join sd.`order` o on dd.order_id=o.order_id
        <where>
               and date(dd.create_time)>=#{startDate} and date(dd.create_time) &lt;= #{endDate}
            <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
@@ -632,6 +636,7 @@
        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
        left join sd.`order` o on dd.order_id=o.order_id
        <where>
            and date(dd.create_time)>=#{startDate} and date(dd.create_time) &lt;= #{endDate}
            <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
@@ -736,9 +741,11 @@
        sum(dd.money) as money,
        sum(dd.quantity) as quantity,
        dd.delivery_detail_remakes,
        dd.create_time
        dd.create_time,
        o.other_money
        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
        <where>
            and date(dd.create_time)>=#{startDate} and date(dd.create_time) &lt;= #{endDate}
            <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
@@ -834,6 +841,7 @@
        select dd.id as id
        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
        <where>
            and date(dd.create_time)>=#{startDate} and date(dd.create_time) &lt;= #{endDate}
            <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
@@ -1029,10 +1037,12 @@
        dd.money,
        dd.quantity,
        dd.delivery_detail_remakes,
        dd.create_time
        dd.create_time,
        o.other_money
        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
        left join sd.`order` o on dd.order_id=o.order_id
        left join sd.customer c on d.customer_id=c.id
        where  date(d.create_time)>=#{dates[0]} and date(d.create_time) &lt;= #{dates[1]}
    </select>
@@ -1063,9 +1073,11 @@
               sum(dd.quantity) as quantity,
               dd.delivery_detail_remakes,
               dd.price,
               dd.create_time
               dd.create_time,
               o.other_money
        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
                                   left join sd.customer c on d.customer_id=c.id
        where  date(d.create_time)>=#{dates[0]} and date(d.create_time) &lt;= #{dates[1]}
        group by dd.delivery_id,od.product_id

			@@ -19,6 +19,7 @@
			{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: 'order.otherMoney',width:120, title: t('basicData.otherAmounts'), 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},

			@@ -32,6 +32,8 @@
			private Integer price;
			@ExcelProperty("面积")
			private Double area;
			@ExcelProperty("其他金额")
			private Double otherMoney;
			@ExcelProperty("金额")
			private Double money;
			@ExcelProperty("客户编号")
			@@ -67,4 +69,5 @@




			}

			@@ -31,6 +31,8 @@
			private Integer price;
			@ExcelProperty("面积")
			private Double area;
			@ExcelProperty("其他金额")
			private Double otherMoney;
			@ExcelProperty("金额")
			private Double money;
			@ExcelProperty("客户编号")
			@@ -62,4 +64,5 @@
			@ExcelProperty("报表日期")
			private LocalDate createTime;


			}

			@@ -27,5 +27,6 @@
			private LocalDate updateTime;
			private Delivery delivery;
			private OrderDetail orderDetail;
			private Order order;

			}

			@@ -88,6 +88,8 @@
			<result column="product_id" property="orderDetail.productId"/>
			<result column="product_name" property="orderDetail.productName"/>

			<result column="other_money" property="order.otherMoney"/>



			</resultMap>
			@@ -542,10 +544,12 @@
			dd.money,
			dd.quantity,
			dd.delivery_detail_remakes,
			dd.create_time
			dd.create_time,
			o.other_money
			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
			left join sd.`order` o on dd.order_id=o.order_id
			<where>
			and date(dd.create_time)>=#{startDate} and date(dd.create_time) <= #{endDate}
			<if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
			@@ -632,6 +636,7 @@
			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
			left join sd.`order` o on dd.order_id=o.order_id
			<where>
			and date(dd.create_time)>=#{startDate} and date(dd.create_time) <= #{endDate}
			<if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
			@@ -736,9 +741,11 @@
			sum(dd.money) as money,
			sum(dd.quantity) as quantity,
			dd.delivery_detail_remakes,
			dd.create_time
			dd.create_time,
			o.other_money
			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
			<where>
			and date(dd.create_time)>=#{startDate} and date(dd.create_time) <= #{endDate}
			<if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
			@@ -834,6 +841,7 @@
			select dd.id as id
			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
			<where>
			and date(dd.create_time)>=#{startDate} and date(dd.create_time) <= #{endDate}
			<if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
			@@ -1029,10 +1037,12 @@
			dd.money,
			dd.quantity,
			dd.delivery_detail_remakes,
			dd.create_time
			dd.create_time,
			o.other_money
			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
			left join sd.`order` o on dd.order_id=o.order_id
			left join sd.customer c on d.customer_id=c.id
			where date(d.create_time)>=#{dates[0]} and date(d.create_time) <= #{dates[1]}
			</select>
			@@ -1063,9 +1073,11 @@
			sum(dd.quantity) as quantity,
			dd.delivery_detail_remakes,
			dd.price,
			dd.create_time
			dd.create_time,
			o.other_money
			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
			left join sd.customer c on d.customer_id=c.id
			where date(d.create_time)>=#{dates[0]} and date(d.create_time) <= #{dates[1]}
			group by dd.delivery_id,od.product_id