|
|
@@ -224,8 +224,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
t.setOrderDep(adminMapper.selectByPrimaryKey(TokenManager.getAdminId()).getDepartmentId());
|
|
|
}
|
|
|
if (isSubmit==1) {//订单提交
|
|
|
- t.setOrderStatus(OrderNewState.QDDS.getCode());
|
|
|
- t.setProcessStatus(ProcessStatus.YPYXGLY.getCode());
|
|
|
+ if(t2.getProcessStatus()<ProcessStatus.YPYXGLY.getCode()) {
|
|
|
+ t.setOrderStatus(OrderNewState.QDDS.getCode());
|
|
|
+ t.setProcessStatus(ProcessStatus.YPYXGLY.getCode());
|
|
|
+ }
|
|
|
if (t2.getApproval()==ApprovalNewState.BH.getCode()){
|
|
|
t.setApproval(ApprovalNewState.DSH.getCode());
|
|
|
}
|