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/mapper/DistrilbutionBillStockMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml index 77d701067..b2d7cba79 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 @@ -357,7 +357,8 @@ end as clerkCheck, CASE WHEN ldbl.conditions = 30 THEN ldbl.update_time - end as clerkUpdateTime + end as clerkUpdateTime, + 1 AS num FROM logpm_distrilbution_bill_lading ldbl LEFT JOIN logpm_distrilbution_bill_package ldbp on ldbl.id = ldbp.bill_lading_id LEFT JOIN logpm_distribution_parcel_list ldpl ON ldbp.parce_list_id = ldpl.id