Browse Source

移动端金融调差申请修改

master
fanzongzhe0036 3 months ago
parent
commit
f9ba0976b5
  1. 24
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppDetailsVo.java
  2. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java
  3. 24
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyDetailsVo.java

24
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppDetailsVo.java

@ -51,8 +51,28 @@ public class AppDetailsVo {
private String staffName; private String staffName;
private String taskId; private String taskId;
/** /**
* 合计订单贴息金额100上传贴息金额200差额100已调整金额50当前差额2本次调整金额20 * 差额
*/ */
private String total; private String adjustmentMoneyTotal;
/**
* 已调整金额
*/
private String alreadyMoneyTotal;
/**
* 订单贴息金额
*/
private String estimateRebateTotal;
/**
* 本次调整金额
*/
private String nowAdjustmentMoneyTotal;
/**
* 当前差额
*/
private String nowDiffAmountTotal;
/**
* 上传贴息金额
*/
private String uploadMoneyTotal;
} }

8
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java

@ -1143,7 +1143,6 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
if (!scmFileVos.isEmpty() && scmFileVos.size() > 0) { if (!scmFileVos.isEmpty() && scmFileVos.size() > 0) {
List<String> files = new ArrayList<>(); List<String> files = new ArrayList<>();
for (ScmFileVo scmFileVo : scmFileVos) { for (ScmFileVo scmFileVo : scmFileVos) {
QueryUrl url = new QueryUrl();
String filePath = scmFileVo.getFilePath(); String filePath = scmFileVo.getFilePath();
String urlPrefix = fileUploadComponent.getUrlPrefix(); String urlPrefix = fileUploadComponent.getUrlPrefix();
filePath = urlPrefix + filePath; filePath = urlPrefix + filePath;
@ -1179,7 +1178,12 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
} }
vo.setList(list); vo.setList(list);
} }
vo.setTotal("订单贴息金额:" + d + ",上传贴息金额:" + s + ",差额:" + c + ",已调整金额:" + y + ",当前差额:" + d + ",本次调整金额:" + b); vo.setEstimateRebateTotal(t.toString());
vo.setUploadMoneyTotal(s.toString());
vo.setAdjustmentMoneyTotal(c.toString());
vo.setAlreadyMoneyTotal(y.toString());
vo.setNowDiffAmountTotal(d.toString());
vo.setNowAdjustmentMoneyTotal(b.toString());
} }
return rb.success().setData(vo); return rb.success().setData(vo);
} }

24
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyDetailsVo.java

@ -56,7 +56,27 @@ public class AdjustApplyDetailsVo implements Vo {
private String staffName; private String staffName;
private String taskId; private String taskId;
/** /**
* 合计订单贴息金额100上传贴息金额200差额100已调整金额50当前差额2本次调整金额20 * 差额
*/ */
private String total; private String adjustmentMoneyTotal;
/**
* 已调整金额
*/
private String alreadyMoneyTotal;
/**
* 订单贴息金额
*/
private String estimateRebateTotal;
/**
* 本次调整金额
*/
private String nowAdjustmentMoneyTotal;
/**
* 当前差额
*/
private String nowDiffAmountTotal;
/**
* 上传贴息金额
*/
private String uploadMoneyTotal;
} }

Loading…
Cancel
Save