diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java index 08608fa63f4c82aff3e2cb1118ea49768df4ef8c..3b55d0094604947bf6f5c30cf68b927e6bec7fa5 100644 --- a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java +++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java @@ -421,7 +421,7 @@ public class EntryCommandServiceImpl implements EntryCommandService { throw new RuntimeException("宸茬粡鍏ヨ处鐨勫洖鍗曚笉鍏佽鍐嶆鍏ヨ处"); } List<EntryBillFlowEntity> flowEntityList = new ArrayList<>(); - Long entryNo = IdUtil.getSnowflakeNextId(); + Long entryNo = incomeId;//IdUtil.getSnowflakeNextId(); if(StringUtils.isNotEmpty(cmd.getVoucherCode())&& ObjectUtil.isNotEmpty(cmd.getVoucherDate())){ JSONObject json = voucherUtil.getVoucherRpc(cmd.getVoucherCode(), cmd.getVoucherDate()); //2.淇濆瓨鍑瘉 diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/utils/FileUtil.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/utils/FileUtil.java index 04713bfe515bb14c2a88a73560921e152e018ce4..62cbbf828ba5b1a5e05bafe09fbba3497ef6fd7e 100644 --- a/ServiceSite/src/main/java/com/seasky/ledgerincome/utils/FileUtil.java +++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/utils/FileUtil.java @@ -213,8 +213,13 @@ public class FileUtil { //鏀规垚鍏ヨ处鐢宠鍗曞彿锛坕d锛� String type = FileTypeUtil.getFileTypeByMimetypesFileTypeMap(tempFile.getName()); String billNo = incomeAggregate.getReceiptBillVo().getBillNo(); - fileCommandService.SaveFileInfo(incomeId, null, incomeId+"",entryBillFlowId.toString(), - FileTypeEmun.鍏ヨ处鐢宠鍗�.getCode(), convertFileToBytes(tempFile), type, tempFile.getName(), userName,entryBillFlowId); + if(smallTile.equals("鏆傚瓨鍏ヨ处")){ + fileCommandService.SaveFileInfo(incomeId, null, entryBillFlowId.toString(),billNo, + FileTypeEmun.鍏ヨ处鐢宠鍗�.getCode(), convertFileToBytes(tempFile), type, tempFile.getName(), userName,entryBillFlowId); + }else{ + fileCommandService.SaveFileInfo(incomeId, null, incomeId+"",billNo, + FileTypeEmun.鍏ヨ处鐢宠鍗�.getCode(), convertFileToBytes(tempFile), type, tempFile.getName(), userName,entryBillFlowId); + } } if (!tempFile.delete()) { throw new RuntimeException("鍒犻櫎鏂囦欢鍑洪敊");