|
@@ -202,7 +202,7 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
|
|
|
|
|
|
//当前用户信息
|
|
|
SysUserVo currentUser = CXCommonUtils.getCurrentUser();
|
|
|
- apsProcessOperationProcessEquDao.publish(productionOrderIds,currentUser.getId(),currentUser.getName());
|
|
|
+ apsProcessOperationProcessEquDao.publish(productionOrderIds, currentUser.getId(), currentUser.getName());
|
|
|
// 更新坯料计划的生产状态
|
|
|
apsBlankOrderDao.publish(productionOrderIds);
|
|
|
// 更新产品明细的生产状态
|
|
@@ -229,7 +229,7 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
|
|
|
apsProcessOperationDao.publishCancel(productionOrderIds);
|
|
|
//当前用户信息
|
|
|
SysUserVo currentUser = CXCommonUtils.getCurrentUser();
|
|
|
- apsProcessOperationProcessEquDao.publishCancel(productionOrderIds,currentUser.getId(),currentUser.getName());
|
|
|
+ apsProcessOperationProcessEquDao.publishCancel(productionOrderIds, currentUser.getId(), currentUser.getName());
|
|
|
// 更新坯料计划的生产状态
|
|
|
apsBlankOrderDao.publishCancel(productionOrderIds);
|
|
|
// 更新产品明细的生产状态
|
|
@@ -557,10 +557,10 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
|
|
|
throw new RuntimeException("执行流程失败,请刷新页面后重试");
|
|
|
}
|
|
|
}
|
|
|
- }catch (Exception e){
|
|
|
- log.error("异常信息:",e);
|
|
|
- }
|
|
|
- finally {
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error("异常信息:", e);
|
|
|
+ throw e;
|
|
|
+ } finally {
|
|
|
log.debug("校验-订单提交完毕,从map中清空当前订单锁,订单ID:{}", id);
|
|
|
productOrderLock.remove(id);
|
|
|
}
|