From 1364cb6ad6cf5cbb489b19923b416593b22f2c26 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 13 May 2024 14:36:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=8C=85=E4=BB=B6=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E5=8C=85=E4=BB=B6?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/excel/DistributionBillOrderPackExcel.java | 3 +++ .../logpm/distribution/mapper/DistrilbutionBillStockMapper.xml | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) 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