|
@@ -344,7 +344,12 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}else if (nb.getProcessState()==OrderChangeProcess.DSZ.getCode()){
|
|
}else if (nb.getProcessState()==OrderChangeProcess.DSZ.getCode()){
|
|
|
- nb.setStatus(2);
|
|
|
|
|
|
|
+ if (nb.getType()==OrderChangeType.TDTK.getCode()||nb.getType()==OrderChangeType.TDBTK.getCode()) {
|
|
|
|
|
+ nb.setStatus(2);
|
|
|
|
|
+ }else {
|
|
|
|
|
+ completeChange(remarks, nb);
|
|
|
|
|
+ return 1;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|