|
|
@@ -1403,6 +1403,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
addBackOrder(orderNo, reason);
|
|
|
}
|
|
|
TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(orderNo);
|
|
|
+ order.setProcessStatus(t.getProcessStatus());
|
|
|
pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),t2.getApproval());
|
|
|
//新增特批催款信息
|
|
|
return tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
@@ -1730,9 +1731,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
approvalType="[特批]";
|
|
|
}
|
|
|
//只有到技术总监是派单,其他都是审核
|
|
|
- if (order.getProcessStatus()==null||(!order.getProcessStatus().equals(ProcessStatus.YPZXSGLY))){
|
|
|
+ if (order.getProcessStatus()==null||(!order.getProcessStatus().equals(ProcessStatus.YPZXSGLY.getCode()))){
|
|
|
str=str.append("[审核]");
|
|
|
- }else {
|
|
|
+ }else if (order.getProcessStatus().equals(ProcessStatus.YPZXSGLY.getCode())){
|
|
|
str=str.append("[派单]");
|
|
|
}
|
|
|
str=str.append(approvalType).append(noticeTypeName).append(":");
|