From 88f7451e392ca42a2a9ee7aa59f02731c007d79a Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Fri, 19 Dec 2025 10:36:14 +0800 Subject: [PATCH] partDesc --- .../mapper/ecss/EcssCommonMapper.xml | 5 ++++- .../resources/templates/packing-template.xlsx | Bin 10839 -> 10923 bytes 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mapper/ecss/EcssCommonMapper.xml b/src/main/resources/mapper/ecss/EcssCommonMapper.xml index ebf66394..ae58571e 100644 --- a/src/main/resources/mapper/ecss/EcssCommonMapper.xml +++ b/src/main/resources/mapper/ecss/EcssCommonMapper.xml @@ -39,6 +39,7 @@ #{destination} as destination, CONVERT(varchar(10), #{readyDate}, 120) AS readyDate, a.salesOrder as salesOrder, + a.part_description as partDesc, CASE WHEN a.modifyFlag = 1 THEN '改单' + @@ -72,10 +73,12 @@ t.destination, t.cmc_comment, t.readyDate, - t.modifyFlagString + t.modifyFlagString, + t.partDesc FROM ( SELECT c.salesOrder AS salesOrder, + c.part_description as partDesc, b.po_no AS customerPO, b.part_no, b.qty, diff --git a/src/main/resources/templates/packing-template.xlsx b/src/main/resources/templates/packing-template.xlsx index ccddbd3085571eb42d8798323e32b992c94a37ba..8911c0fb58bc76c4c59df4135164c849fb953526 100644 GIT binary patch delta 4038 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