diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/utils/OrderCommonUtils.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/utils/OrderCommonUtils.java index 9a395c3..8f63a8b 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/utils/OrderCommonUtils.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/utils/OrderCommonUtils.java @@ -1742,7 +1742,7 @@ public class OrderCommonUtils { * @return */ public static String getFileName(OrderInvoiceInfo orderInvoiceInfo, String wjlx) { - StringBuilder stringBuilder = new StringBuilder("dzfp"); + StringBuilder stringBuilder = new StringBuilder(); String fpzlDm = orderInvoiceInfo.getFpzlDm(); String fphm = orderInvoiceInfo.getFphm(); @@ -1754,8 +1754,26 @@ public class OrderCommonUtils { String finalGfMc = ""; - //文件名称调整,单张文件命名规范:dzfp-发票号码-购方名称(收购变销方名称)-开票日期(yyyymmddHHMMSS).后缀名 + //文件名称调整,单张文件命名规范:购方名称_数电专票_发票号码_金额_开票日期(yyyymmddHHMMSS).后缀名 + //补全购方名称 + if (StringUtils.isBlank(finalGfMc)) { + if (StringUtils.isNotBlank(stringBuilder.toString())) { + stringBuilder.append(ConfigureConstant.STRING_LINE); + } + + //收购发票,销方名称对应是数据库中ghfMc + finalGfMc = ghfMc; + stringBuilder.append(finalGfMc); + } + + if (StringUtils.isNotBlank(fpzlDm)){ + OrderInfoEnum codeValue = OrderInfoEnum.getCodeValue(fpzlDm); + if (codeValue != null){ + stringBuilder.append(ConfigureConstant.STRING_LINE); + stringBuilder.append(codeValue.getValue()); + } + } //补全号码 if (OrderCommonUtils.judgeSdPz(fpzlDm)) { if (StringUtils.isNotBlank(stringBuilder.toString())) { @@ -1769,18 +1787,12 @@ public class OrderCommonUtils { stringBuilder.append(fphm); } - //补全购方名称 - if (StringUtils.isBlank(finalGfMc)) { - if (StringUtils.isNotBlank(stringBuilder.toString())) { - stringBuilder.append(ConfigureConstant.STRING_LINE); - } - - //收购发票,销方名称对应是数据库中ghfMc - finalGfMc = ghfMc; - stringBuilder.append(finalGfMc); + //补全金额 + if (StringUtils.isNotBlank(orderInvoiceInfo.getHjbhsje())){ + stringBuilder.append(ConfigureConstant.STRING_LINE); + stringBuilder.append(orderInvoiceInfo.getHjbhsje()); } - //补全开票日期 if (ObjectUtil.isNotNull(kprq)) { if (StringUtils.isNotBlank(stringBuilder.toString())) {