|
|
@@ -638,17 +638,19 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
ton.setDeleteSign(2);
|
|
|
tOrderNewMapper.updateByPrimaryKeySelective(ton);
|
|
|
TOrderNewBo tOrderNew = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
|
|
|
- if (tOrderNew.getManagerName()!=null){
|
|
|
- noc.setProcessState(OrderChangeProcess.YXJL.getCode());
|
|
|
- }else {
|
|
|
- OrderChangeLog cl=new OrderChangeLog();
|
|
|
- cl.setAuditor(TokenManager.getAdminId());
|
|
|
- cl.setOrderNo(t.getOrderNo());
|
|
|
- cl.setRemarks("未设置营销经理自动通过");
|
|
|
- cl.setChangeId(noc.getId());
|
|
|
- cl.setStatus(2);
|
|
|
- orderChangeLogMapper.insertSelective(ocl);
|
|
|
- noc.setProcessState(OrderChangeProcess.YXGLY.getCode());
|
|
|
+ if (t.getType()!=OrderChangeType.JBGGT.getCode()){
|
|
|
+ if (tOrderNew.getManagerName()!=null){
|
|
|
+ noc.setProcessState(OrderChangeProcess.YXJL.getCode());
|
|
|
+ }else {
|
|
|
+ OrderChangeLog cl=new OrderChangeLog();
|
|
|
+ cl.setAuditor(TokenManager.getAdminId());
|
|
|
+ cl.setOrderNo(t.getOrderNo());
|
|
|
+ cl.setRemarks("未设置营销经理自动通过");
|
|
|
+ cl.setChangeId(noc.getId());
|
|
|
+ cl.setStatus(2);
|
|
|
+ orderChangeLogMapper.insertSelective(cl);
|
|
|
+ noc.setProcessState(OrderChangeProcess.YXGLY.getCode());
|
|
|
+ }
|
|
|
}
|
|
|
sendNotice(0, t);
|
|
|
}else if (changeType==2) {
|