diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java index 364dc183..3dd474c0 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java @@ -1724,10 +1724,10 @@ public class CoDelServiceImpl implements CoDelService { public void downloadContract(HttpServletResponse response, EcssDeclarationHeaderData data) { try { ExcelTemplate template = ExcelTemplate.load(new ClassPathResource("templates/declaration-contract-template.xlsx").getInputStream()); - EcssDeclarationHeaderData ecHeader = coDelMapper.getDeclarationHeader(data); // 发货通知单 EcssCoDelNotifyHeaderData notifyHeader = coDelMapper.getEcssCoDelNotifyHeader(data.getSite(), data.getDelNo()); template.addVar("cmcInvoice", notifyHeader.getCmcInvoice()); + template.addVar("readyDate", DateUtils.format(notifyHeader.getReadyDate(), "yyyy/MM/dd")); List notifyDetailGroup = coDelMapper.getNotifyDetailGroup(data); BigDecimal totalQty = BigDecimal.ZERO; BigDecimal totalAmount = BigDecimal.ZERO; diff --git a/src/main/resources/templates/declaration-contract-template.xlsx b/src/main/resources/templates/declaration-contract-template.xlsx index 80e64288..42c8eb16 100644 Binary files a/src/main/resources/templates/declaration-contract-template.xlsx and b/src/main/resources/templates/declaration-contract-template.xlsx differ