diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java index e5df8332..d09952e1 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java @@ -1885,7 +1885,8 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { ecHeader.getPriceInfluenceConfirm().equals("Y") ? "是" : "否"); template.addVar("royaltyPaymentsConfirm", StringUtils.isEmpty(ecHeader.getRoyaltyPaymentsConfirm()) ? "" : ecHeader.getRoyaltyPaymentsConfirm().equals("Y") ? "是" : "否"); - template.addVar("remark", stringInput(ecHeader.getRemark())+data.getVoyage()); + template.addVar("remark", stringInput(ecHeader.getRemark())+ + (notifyHeader.getBuNo().equals("04-MHM")?data.getVoyage():"")); List detailList = coDelMapper.exportDeclarationDetailTX(data); for (int i = 0; i < detailList.size(); i++) {