feat(all): 配送明细报表

1 增加签收及时率和复核及时率

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/QualityDispatchNumberMapper.xml

@@ -20,10 +20,10 @@
                ifnull(sum(case when t.conditions = 3 then ifnull(t.load_num, 0) end), 0)              loadStockNum,
                ifnull(sum(case when t.conditions = 3 then ifnull(t.sign_num, 0) end), 0)              signStockNum,
                concat(replace(case
-                                  when ifnull(sum(case when t.conditions = 3 then ifnull(t.sign_num, 0) end), 0) = 0 then 0
+                                  when ifnull(sum(case when t.conditions = 3 then ifnull(t.plan_num, 0) end), 0) = 0 then 0
                                   else
                                       ROUND((ifnull(sum(case when t.conditions = 3 then ifnull(t.sign_num, 0) end), 0)
-                                          / ifnull(sum(case when t.conditions = 3 then ifnull(t.sign_num, 0) end), 0)) * 100,
+                                          / ifnull(sum(case when t.conditions = 3 then ifnull(t.plan_num, 0) end), 0)) * 100,
                                             2) end, '.00', ''), '%')                                  signStockRate,
                count(distinct t.plan_reservation_code)                                                customerCount,
                count(distinct case when t.review_num != 0 then t.plan_reservation_code else null end) reviewCustomerCount,
@@ -35,7 +35,15 @@
         then t.plan_reservation_code
         else null end) / count(distinct t.plan_reservation_code) ) *
                                              100, 2) end, '.00',
-                              ''), '%')                                                               reviewRate
+                              ''), '%')                                                               reviewRate,
+        concat(replace(case
+        when sum(ifnull(t.plan_num, 0)) = 0 then 0
+        else ROUND(((sum(ifnull(t.plan_num, 0)) - sum(ifnull(t.qscs, 0))) / sum(ifnull(t.plan_num, 0))) * 100, 2) end, '.00',
+        ''), '%')                                                               signOnTimeRate,
+        concat(replace(case
+        when sum(ifnull(t.plan_num, 0)) = 0 then 0
+        else ROUND(((sum(ifnull(t.plan_num, 0)) - sum(ifnull(t.fhcs, 0))) / sum(ifnull(t.plan_num, 0))) * 100, 2) end, '.00',
+        ''), '%')                                                               reviewOnTimeRate
         from (select t.business_unit,
                      t.warehouse_name,
                      t.brand_name,
@@ -49,7 +57,18 @@
                      sum(ifnull(t.load_num, 0))      load_num,
                      sum(ifnull(t.sign_num, 0))      sign_num,
                      sum(ifnull(t.review_num, 0))    review_num,
-                     sum(ifnull(t.retention_num, 0)) retention_num
+                     sum(ifnull(t.retention_num, 0)) retention_num,
+        sum(case
+        when t.delivery_time is null then t.plan_num
+        WHEN t.delivery_time is not null and t.sign_time IS NULL AND TIMESTAMPDIFF(HOUR, CONCAT(DATE(t.delivery_time), ' 08:00:00'), NOW()) > 24 THEN t.plan_num
+        WHEN t.delivery_time is not null and t.sign_time IS not NULL AND TIMESTAMPDIFF(HOUR, CONCAT(DATE(t.delivery_time), ' 08:00:00'), t.sign_time) > 24 THEN t.sign_num
+        ELSE 0
+        END) qscs,
+        sum(case
+        WHEN t.sign_time is not null and t.review_time IS NULL AND TIMESTAMPDIFF(HOUR, CONCAT(DATE(t.delivery_time), ' 08:00:00'), NOW()) > 48 THEN t.sign_num
+        WHEN t.sign_time is not null and t.review_time IS not NULL AND TIMESTAMPDIFF(HOUR, CONCAT(DATE(t.delivery_time), ' 08:00:00'), t.review_time) > 48 THEN t.sign_num
+        ELSE 0
+        END) fhcs
               from logpm_quality_deliver t
               where t.plan_train_number is not null
               <if test="query.startTaskTime != null and query.startTaskTime != ''">

blade-service/logpm-report/src/main/java/com/logpm/report/vo/qulity/dispatch/QualityDispatchNumberVO.java

@@ -49,6 +49,10 @@ public class QualityDispatchNumberVO implements Serializable {
 	@ExcelProperty("签收率")
 	private String signRate;
 
+	@ApiModelProperty(value = "签收及时率")
+	@ExcelProperty("签收及时率")
+	private String signOnTimeRate;
+
 	@ApiModelProperty(value = "预约库存品件数")
 	@ExcelProperty("预约库存品件数")
 	private Integer planStockNum;
@@ -89,4 +93,8 @@ public class QualityDispatchNumberVO implements Serializable {
 	@ExcelProperty("审核率")
 	private String reviewRate;
 
+	@ApiModelProperty(value = "复核及时率")
+	@ExcelProperty("复核及时率")
+	private String reviewOnTimeRate;
+
 }