|
|
@@ -546,10 +546,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
@Override
|
|
|
public int updateApprovalOrder(String orderNo,Integer confirm,String reason) {
|
|
|
TOrderNew t=new TOrderNew();
|
|
|
+ TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(orderNo);
|
|
|
t.setOrderNo(orderNo);
|
|
|
if (confirm==2) {
|
|
|
t.setApproval(2);
|
|
|
- t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
|
+ if(t2.getOutsource()==0)t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
|
addOrderLog(orderNo, OrderLogProcess.TP.getCode());
|
|
|
} else {
|
|
|
t.setApproval(3);
|