diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingDetailExportVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingDetailExportVO.java index 87512aacf..15a0ebc82 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingDetailExportVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingDetailExportVO.java @@ -1,9 +1,11 @@ package com.logpm.trunkline.vo; import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; +import java.util.Date; @Data public class LoadingDetailExportVO implements Serializable { @@ -62,4 +64,12 @@ public class LoadingDetailExportVO implements Serializable { @ExcelProperty(value = "是否补录") private String isSupple; + @ExcelProperty(value = "装车时间") + @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date loadingTime; + + @ExcelProperty(value = "卸车时间") + @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date unloadTime; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/CustomMessageConverter.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/CustomMessageConverter.java index c6394d2e0..805f2e75b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/CustomMessageConverter.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/CustomMessageConverter.java @@ -73,7 +73,10 @@ public class CustomMessageConverter extends AllowedListDeserializingMessageConve Map headers = properties.getHeaders(); HttpHeaders httpHeaders = new HttpHeaders(); for (Map.Entry entry : headers.entrySet()) { - if (StrUtil.equals("Blade-Auth", entry.getKey()) || StrUtil.equals("Authorization", entry.getKey())) { + if (StrUtil.equals("Blade-Auth", entry.getKey()) + || StrUtil.equals("Authorization", entry.getKey()) + || StrUtil.equals("blade-auth", entry.getKey()) + || StrUtil.equals("authorization", entry.getKey())) { List value = (List) entry.getValue(); for (Object o : value) { httpHeaders.add(entry.getKey(), String.valueOf(o)); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillOrderPackExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillOrderPackExcel.java index 8cf5ebc19..68c51fd5d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillOrderPackExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillOrderPackExcel.java @@ -55,6 +55,9 @@ public class DistributionBillOrderPackExcel { @ExcelProperty("物料名称") private String materialName; @ColumnWidth(20) + @ExcelProperty("数量") + private Integer num; + @ColumnWidth(20) @ExcelProperty("托盘码") private String pallet; @ColumnWidth(20) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java index faeae066e..03040c59b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java @@ -68,6 +68,13 @@ public class DistributionDeliveryListExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("客户名称") private String consignee; + + /** + * 仓库 + */ + @ColumnWidth(20) + @ExcelProperty("订单自编号") + private String orderCode; /** * 仓库 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 792df3355..fd099d700 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -1169,7 +1169,7 @@ IF ( ldl.id IS NOT NULL, 1, ldl.id ) AS is_loading, 1 is_out, - ldpl.conditions AS goods_type, + IF(ldpl.conditions = 1, 0 ,ldpl.conditions) AS goods_type, ldl.received_quantity AS signNum, 5 AS broke_state FROM @@ -1200,7 +1200,7 @@ IF ( ldl.id IS NOT NULL, 1, ldl.id ) AS is_loading, 1 is_out, - ldpl.conditions AS goods_type, + IF(ldpl.conditions = 1, 0 ,ldpl.conditions) AS goods_type, ldl.received_quantity AS signNum, 5 AS broke_state FROM @@ -1234,7 +1234,7 @@ ldl.signing_time AS sign_time, 1 AS is_out, ldsl.quantity_stock AS num, - 3 AS goods_type, + 2 AS goods_type, ldl.received_quantity AS sign_num, 4 AS broke_state FROM @@ -1269,7 +1269,7 @@ ldl.signing_time AS sign_time, 1 AS is_out, ldsl.quantity_stock AS num, - 3 AS goods_type, + 2 AS goods_type, ldl.received_quantity AS sign_num, 4 AS broke_state FROM diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index 56e275b55..8d5ec4e8d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml @@ -905,7 +905,7 @@ ldbls.update_time AS update_time, ldbls.quantity AS num, ldbls.quantity AS signNum, - 3 AS goods_type + 2 AS goods_type FROM logpm_distribution_bill_lading_scan AS ldbls LEFT JOIN logpm_dis_stock_list_detail AS ldsld ON ldbls.bill_lading_id = ldsld.reservation_id AND ldsld.is_deleted = 0 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml index 77d701067..d154c16a8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml @@ -141,7 +141,7 @@ where ldpl.material_name is not null and ldpl.stock_article_id = ldbs.stock_article_id) materialName, (select IFNULL(sum(lds.stock_quantity),0) from logpm_distribution_stock lds - where lds.stock_article = ldbs.stock_article_id ) preparedQuantity , + where lds.stock_article = ldbs.stock_article_id AND lds.bill_lading_id = ldbl.id ) preparedQuantity , (select COALESCE(GROUP_CONCAT(DISTINCT lwtg.tray_code SEPARATOR ','), '') from logpm_distribution_parcel_list ldpl LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id and lwtg.association_type = '3' @@ -156,12 +156,12 @@ logpm_distrilbution_bill_lading AS ldbl LEFT JOIN logpm_distrilbution_bill_stock ldbs ON ldbs.bill_lading_id = ldbl.id LEFT JOIN logpm_distribution_stock_article ldsa on ldbs.stock_article_id = ldsa.id - LEFT JOIN logpm_distribution_stock lds on lds.stock_article = ldbs.stock_article_id + LEFT JOIN logpm_distribution_bill_lading_scan AS ldbls ON ldbl.id = ldbls.bill_lading_id ldbs.is_deleted = 0 and ldbs.bill_lading_id = #{param.billLadingId} and ldbs.order_status in (1,3) - GROUP BY ldbl.id + GROUP BY ldbl.id,ldbs.stock_article_id - select * - from logpm_warehouse_waybill - where is_deleted = 0 + select lww.* + from logpm_warehouse_waybill lww + left join (select ltwt.waybill_id,GROUP_CONCAT(DISTINCT ltwt.warehouse_id) warehouse_ids from logpm_trunkline_waybill_track ltwt group by ltwt.waybill_id) t on t.waybill_id = lww.id + where lww.is_deleted = 0 - and waybill_no not in + and lww.waybill_no not in #{item} - and (departure_warehouse_id = #{param.warehouseId} or destination_warehouse_id = #{param.warehouseId}) + and Locate(#{param.warehouseId},t.warehouse_ids) > 0 - and Locate(#{param.waybillNo},waybill_no) > 0 + and Locate(#{param.waybillNo},lww.waybill_no) > 0 - and Locate(#{param.orderNo},order_no) > 0 + and Locate(#{param.orderNo},lww.order_no) > 0 - and Locate(#{param.destinationWarehouseName},destination_warehouse_name) > 0 + and Locate(#{param.destinationWarehouseName},lww.destination_warehouse_name) > 0 - and Locate(#{param.departureWarehouseName},departure_warehouse_name) > 0 + and Locate(#{param.departureWarehouseName},lww.departure_warehouse_name) > 0 - and Locate(#{param.customerTrain},customer_train) > 0 + and Locate(#{param.customerTrain},lww.customer_train) > 0 - and Locate(#{param.brand},brand) > 0 + and Locate(#{param.brand},lww.brand) > 0 - and Locate(#{param.shipper},shipper) > 0 + and Locate(#{param.shipper},lww.shipper) > 0 - and Locate(#{param.shipperName},shipper_name) > 0 + and Locate(#{param.shipperName},lww.shipper_name) > 0 - and Locate(#{param.shipperMobile},shipper_mobile) > 0 + and Locate(#{param.shipperMobile},lww.shipper_mobile) > 0 - and Locate(#{param.consignee},consignee) > 0 + and Locate(#{param.consignee},lww.consignee) > 0 - and Locate(#{param.consigneeName},consignee_name) > 0 + and Locate(#{param.consigneeName},lww.consignee_name) > 0 - and Locate(#{param.consigneeMobile},consignee_mobile) > 0 + and Locate(#{param.consigneeMobile},lww.consignee_mobile) > 0 - and Locate(#{param.destination},destination) > 0 + and Locate(#{param.destination},lww.destination) > 0 - and Locate(#{param.departure},departure) > 0 + and Locate(#{param.departure},lww.departure) > 0 - and pay_type = #{param.payType} + and lww.pay_type = #{param.payType} - and pay_way = #{param.payWay} + and lww.pay_way = #{param.payWay} - and delivery_way = #{param.deliveryWay} + and lww.delivery_way = #{param.deliveryWay} - and urgency = #{param.urgency} + and lww.urgency = #{param.urgency} - and transport_type = #{param.transportType} + and lww.transport_type = #{param.transportType} - and transport_type = #{param.transportType} + and lww.transport_type = #{param.transportType} - and waybill_status = #{param.waybillStatus} + and lww.waybill_status = #{param.waybillStatus} - and pickup_complete_or_not = #{param.pickupCompleteOrNot} + and lww.pickup_complete_or_not = #{param.pickupCompleteOrNot} - and trunkline_complete_or_not = #{param.trunklineCompleteOrNot} + and lww.trunkline_complete_or_not = #{param.trunklineCompleteOrNot} - and document_making_time >= #{param.documentMakingTimeStartDate} + and lww.document_making_time >= #{param.documentMakingTimeStartDate} - and document_making_time <= #{param.documentMakingTimeEndDate} + and lww.document_making_time <= #{param.documentMakingTimeEndDate} - and create_time >= #{param.createTimeStartDate} + and lww.create_time >= #{param.createTimeStartDate} - and create_time <= #{param.createTimeEndDate} + and lww.create_time <= #{param.createTimeEndDate} - and Locate(#{param.agent},agent) > 0 + and lww.Locate(#{param.agent},agent) > 0 - and Locate(#{param.goodsName},goods_name) > 0 + and lww.Locate(#{param.goodsName},goods_name) > 0 - and freeze_status = #{param.freezeStatus} + and lww.freeze_status = #{param.freezeStatus} - and abolish_status = #{param.abolishStatus} + and lww.abolish_status = #{param.abolishStatus} - and Locate(#{param.remark},remark) > 0 + and Locate(#{param.remark},lww.remark) > 0 - and Locate(#{param.consigneeAddress},consignee_address) > 0 + and Locate(#{param.consigneeAddress},lww.consignee_address) > 0 - and total_count = #{param.totalCount} + and lww.total_count = #{param.totalCount} - and total_weight = #{param.totalWeight} + and lww.total_weight = #{param.totalWeight} - and total_volume = #{param.totalVolume} + and lww.total_volume = #{param.totalVolume} - and abolish_time >= #{param.abolishTimeStartDate} + and lww.abolish_time >= #{param.abolishTimeStartDate} - and abolish_time <= #{param.abolishTimeEndDate} + and lww.abolish_time <= #{param.abolishTimeEndDate} - and freeze_time >= #{param.freezeTimeStartDate} + and lww.freeze_time >= #{param.freezeTimeStartDate} - and freeze_time <= #{param.freezeTimeEndDate} + and lww.freeze_time <= #{param.freezeTimeEndDate} - order by create_time desc + order by lww.create_time desc