diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml index 13a0a41b5..14f752c76 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml @@ -12,6 +12,7 @@ packet_bar_code, train_number, sign_num, + brand, firsts, second, third_product, @@ -33,6 +34,7 @@ t.packet_bar_code, dsa.train_number, 1 sign_num, + dpl.brand_name brand, dpl.firsts, dpl.second, dpl.third_product, @@ -62,6 +64,7 @@ packet_bar_code, train_number, sign_num, + brand, firsts, second, third_product, @@ -83,6 +86,7 @@ '' packet_bar_code, dsa.train_number, 1 sign_num, + dpl.brand_name brand, '' firsts, '' second, '' third_product, @@ -113,6 +117,7 @@ packet_bar_code, train_number, sign_num, + brand, firsts, second, third_product, @@ -134,6 +139,7 @@ dpl.order_package_code packet_bar_code, dsa.train_number, dbls.quantity sign_num, + dpl.brand_name brand, dpl.firsts, dpl.second, dpl.third_product, diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml index 93cdc687b..115015632 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml @@ -343,6 +343,9 @@ signing_status, signing_time, sign_num, + sign_type, + loading_mode, + brand, examine_user_name, abnormal_signing, abnormal_loading, @@ -376,6 +379,7 @@ ldsa.customer_address delivery_address, wi.consignee consignee, 1 sign_num, + dpl.brand_name brand, wi.consignee_name consignee_name, wi.consignee_mobile consignee_mobile, dpl.waybill_number waybill_no, @@ -411,6 +415,26 @@ ldl.scan_user un_administrators_name, ldl.signing_time sjsigning_time, ldl.signing_user lds_signee_name, + case when ldl.signfor_type = 1 THEN + '扫描签收' + when ldl.signfor_type = 2 then + '文员签收' + when ldl.signfor_type = 3 then + '一键签收' + else + '' + end sign_type, + case when ldl.scan_status = 2 THEN + '扫描装车' + when ldl.scan_status = 3 THEN + '订单装车' + when ldl.scan_status = 4 THEN + '一键装车' + when ldl.scan_status = 5 THEN + '补录装车' + else + '' + END loading_mode, CASE WHEN lds.signing_status = 1 THEN @@ -457,7 +481,9 @@ where drp.packet_bar_status != 2 and obj.reservation_status != 4 and obj.id is not null - and dpl.id is not null) t + and dpl.id is not null + and ldl.scan_status > 1 + ) t ${ew.customSqlSegment} and @@ -513,6 +539,9 @@ signing_status, signing_time, sign_num, + sign_type, + loading_mode, + brand, examine_user_name, abnormal_signing, abnormal_loading, @@ -526,6 +555,7 @@ obj.reservation_date task_time, dpl.warehouse warehouse_name, dpl.warehouse_id warehouse_id, + dpl.brand_name brand, CASE WHEN obj.delivery_type = 1 THEN '商配' @@ -580,7 +610,26 @@ ldl.received_quantity sign_num, ldl.scan_time unload_time, ldl.scan_user un_administrators_name, - + case when ldl.signfor_type = 1 THEN + '扫描签收' + when ldl.signfor_type = 2 then + '文员签收' + when ldl.signfor_type = 3 then + '一键签收' + else + '' + end sign_type, + case when ldl.scan_status = 2 THEN + '扫描装车' + when ldl.scan_status = 3 THEN + '订单装车' + when ldl.scan_status = 4 THEN + '一键装车' + when ldl.scan_status = 5 THEN + '补录装车' + else + '' + END loading_mode, lds.sjsigning_time sjsigning_time, lds.signee_name lds_signee_name, CASE @@ -631,6 +680,7 @@ and obj.reservation_status != 4 and obj.id is not null and dpl.id is not null + and ldl.scan_status > 1 ) t ${ew.customSqlSegment} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingDetailsVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingDetailsVO.java index 65d2fa2fa..5b1d08217 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingDetailsVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingDetailsVO.java @@ -25,6 +25,10 @@ public class BillLoadingDetailsVO implements Serializable { private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "品牌") + @ExcelProperty("品牌") + private String brand; + @ApiModelProperty(value = "自提批次号") @ExcelProperty("自提批次号") private String pickupBatch; diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportDetailVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportDetailVO.java index 67c955615..b3a693518 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportDetailVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportDetailVO.java @@ -29,6 +29,10 @@ public class ReportDetailVO implements Serializable { @ExcelProperty("车次") private String trainNumber; + @ApiModelProperty(value = "品牌") + @ExcelProperty("品牌") + private String brand; + @ApiModelProperty(value = "预约单号") @ExcelProperty("预约单号") private String reservationCode; @@ -197,4 +201,12 @@ public class ReportDetailVO implements Serializable { @ExcelProperty("审核时间") private String auditingTime; + @ApiModelProperty(value = "装车方式") + @ExcelProperty("装车方式") + private String loadingMode; + + @ApiModelProperty(value = "签收方式") + @ExcelProperty("签收方式") + private String signType; + }