|
|
@ -341,6 +341,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService |
|
|
|
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
qw.eq("useOrgSid", query.getUseOrgSid()); |
|
|
|
qw.eq("isDelete", "0"); |
|
|
|
qw.orderByDesc("createTime"); |
|
|
|
return qw; |
|
|
@ -598,7 +599,6 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService |
|
|
|
String salesOrderSid = data.getSalesOrderSid(); |
|
|
|
//根据销售订单sid 查询采购系统sid
|
|
|
|
BusSalesOrderDetailsVo orderDetailsVo = busSalesOrderFeign.fetchDetailsBySid(salesOrderSid).getData(); |
|
|
|
|
|
|
|
if (null != orderDetailsVo && StringUtils.isNotBlank(orderDetailsVo.getPurchaseSystemSid()) && StringUtils.isNotBlank(orderDetailsVo.getUseOrgSid())) { |
|
|
|
ResultBean<FinCompanyInvoicingDetailsVo> detailsByUseOrgAndSystem = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(orderDetailsVo.getUseOrgSid(), orderDetailsVo.getPurchaseSystemSid()); |
|
|
|
if (detailsByUseOrgAndSystem.getData() != null) { |
|
|
@ -627,7 +627,6 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService |
|
|
|
} else { |
|
|
|
pdfVo.setLinKNo(linkNo); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pdfVo.getConfirmDate())) { |
|
|
|
String confirmDate = pdfVo.getConfirmDate(); |
|
|
@ -725,11 +724,9 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService |
|
|
|
String[] arr = str.split("\\."); |
|
|
|
char[] chars = arr[0].toCharArray(); |
|
|
|
StringBuffer sb = new StringBuffer(); |
|
|
|
|
|
|
|
for (int i = 0; i < chars.length; ++i) { |
|
|
|
sb.append(numChinese[Integer.valueOf(String.valueOf(chars[i])).intValue()]).append(chinese[chars.length - i - 1]); |
|
|
|
} |
|
|
|
|
|
|
|
if (arr.length == 1) { |
|
|
|
return sb.toString() + "元整"; |
|
|
|
} else if (arr[1].length() > 2) { |
|
|
@ -737,7 +734,6 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService |
|
|
|
} else { |
|
|
|
sb.append("元"); |
|
|
|
char[] chars1 = arr[1].toCharArray(); |
|
|
|
|
|
|
|
for (int i = 0; i < chars1.length; ++i) { |
|
|
|
sb.append(numChinese[Integer.valueOf(String.valueOf(chars1[i])).intValue()]).append(afterChinese[i]); |
|
|
|
} |
|
|
|