|
|
@ -108,10 +108,14 @@ public class FlowBeforeController {
|
|
|
|
boolean isBatch = FlowNature.BATCH.equals(category);
|
|
|
|
boolean isBatch = FlowNature.BATCH.equals(category);
|
|
|
|
for (FlowTaskListModel task : data) {
|
|
|
|
for (FlowTaskListModel task : data) {
|
|
|
|
FlowBeforeListVO vo = JsonUtil.getJsonToBean(task, FlowBeforeListVO.class);
|
|
|
|
FlowBeforeListVO vo = JsonUtil.getJsonToBean(task, FlowBeforeListVO.class);
|
|
|
|
if (vo.getFlowName().equals("采购订单") || vo.getFlowName().equals("销售订单") || vo.getFlowName().equals("采购收货单") || vo.getFlowName().equals("销售发货单")){
|
|
|
|
if (vo.getFlowName().equals("采购订单") || vo.getFlowName().equals("销售订单") || vo.getFlowName().equals("采购收货单") || vo.getFlowName().equals("销售发货单")|| vo.getFlowName().equals("销售发货单")){
|
|
|
|
BigDecimal netWeight = flowTaskService.getNetWeight(vo.getFlowName(),vo.getProcessId());
|
|
|
|
BigDecimal netWeight = flowTaskService.getNetWeight(vo.getFlowName(),vo.getProcessId());
|
|
|
|
vo.setNetWeight(netWeight);
|
|
|
|
vo.setNetWeight(netWeight);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( vo.getFlowName().equals("付款申请单")){
|
|
|
|
|
|
|
|
BigDecimal netWeight = flowTaskService.getNetWeightPayment(vo.getFlowName(),vo.getProcessId());
|
|
|
|
|
|
|
|
vo.setNetWeight(netWeight);
|
|
|
|
|
|
|
|
}
|
|
|
|
//用户名称赋值
|
|
|
|
//用户名称赋值
|
|
|
|
UserEntity user = userList.stream().filter(t -> t.getId().equals(vo.getCreatorUserId())).findFirst().orElse(null);
|
|
|
|
UserEntity user = userList.stream().filter(t -> t.getId().equals(vo.getCreatorUserId())).findFirst().orElse(null);
|
|
|
|
vo.setUserName(user != null ? user.getRealName() + "/" + user.getAccount() : "");
|
|
|
|
vo.setUserName(user != null ? user.getRealName() + "/" + user.getAccount() : "");
|
|
|
|