| | |
| | | } |
| | | /** |
| | | * 只更新状态,不更新其他字段 |
| | | * @param plan |
| | | * @param order |
| | | * 更新状态 如果有在执行中的任务,不让暂停 |
| | | * @return |
| | | */ |
| | | /* @Transactional |
| | | public int updateStatus(PrOrder plan) { |
| | | if(plan.status == PlanStatusEnum.NORMAL.getCode()){ |
| | | PrAssemblyPlan assemblyPlan = assemblyDao.selectByPrimaryKey(plan.id); |
| | | assemblyPlan.status = plan.status; |
| | | extractedCheck(assemblyPlan); |
| | | @Transactional |
| | | public int updateStatus(PrOrder order) { |
| | | if(order.status == OrderStatusEnum.NORMAL.getCode()){ |
| | | PrOrder prOrder = orderDao.selectByPrimaryKey(order.id); |
| | | prOrder.status = order.status; |
| | | //extractedCheck(prOrder); |
| | | } |
| | | PrAssemblyPlan param = new PrAssemblyPlan(); |
| | | param.id =plan.id; |
| | | param.status = plan.status; |
| | | return assemblyDao.updateByPrimaryKeySelective(param); |
| | | PrOrder param = new PrOrder(); |
| | | param.id =order.id; |
| | | param.status = order.status; |
| | | return orderDao.updateByPrimaryKeySelective(param); |
| | | } |
| | | private void extractedCheck(PrAssemblyPlan plan) { |
| | | /*private void extractedCheck(PrOrder order) { |
| | | PrProductionProcess process = processDao.selectByPrimaryKey(plan.processId); |
| | | if(process == null || !process.proId.equals(plan.proId)){ |
| | | throw new RuntimeException("产品与生产流程不匹配"); |