Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

zhou zhou

昨天 fb98cd280dd1158e542cc8b94003612700ae4ea4

 rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/FlowStepInstanceServiceImpl.java

@@ -13,47 +13,47 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

@Service("flowStepInstanceService")
public class FlowStepInstanceServiceImpl extends ServiceImpl<FlowStepInstanceMapper, FlowStepInstance> implements FlowStepInstanceService {

    @Autowired
    private TaskService taskService;
    @Autowired
    private FlowInstanceService flowInstanceService;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean jumpCurrent(Long id) {
        try{
            FlowStepInstance flowStepInstance = getById(id);
            if (flowStepInstance == null || flowStepInstance.getFlowInstanceId() == null) {
                return false;
            }
            if (flowStepInstance == null || flowStepInstance.getFlowInstanceId() == null) return false;
            Date now = new Date();
            String taskNo = flowStepInstance.getTaskNo();
            Task one = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getTaskCode, taskNo));

            //检测当前步骤
            FlowInstance flowInstance = flowInstanceService.getById(flowStepInstance.getFlowInstanceId());
            List<String> flowInstanceNoList = new ArrayList<>();
            List<FlowInstance> flowInstanceList = flowInstanceService.list(new LambdaQueryWrapper<FlowInstance>().eq(FlowInstance::getTaskId, flowInstance.getTaskId()));
            flowInstanceList.forEach(flowInstance1 -> flowInstanceNoList.add(flowInstance1.getFlowInstanceNo()));
            FlowStepInstance flowStepInstanceNow = getOne(new LambdaQueryWrapper<FlowStepInstance>()
                    .eq(FlowStepInstance::getWmsNowTaskStatus, one.getTaskStatus())
                    .eq(FlowStepInstance::getTaskNo, taskNo)
                    .eq(FlowStepInstance::getFlowInstanceNo, flowStepInstance.getFlowInstanceNo())
                    .in(FlowStepInstance::getFlowInstanceNo, flowInstanceNoList)
                    .ge(FlowStepInstance::getStatus, (short) 1)
                    .ne(FlowStepInstance::getStatus, (short) 3).last("limit 1"));
            if (flowStepInstanceNow == null) {
                return false;
            }
            if (flowStepInstanceNow == null) return false;
            int stepOrderDifference = flowStepInstanceNow.getStepOrder() - flowStepInstance.getStepOrder();
            if (stepOrderDifference>0) {//回退
                for (int i = 1; i <= stepOrderDifference; i++) {
                    FlowStepInstance flowStepInstanceUpdate = getOne(new LambdaQueryWrapper<FlowStepInstance>()
                            .eq(FlowStepInstance::getTaskNo, taskNo)
                            .eq(FlowStepInstance::getStepOrder, flowStepInstance.getStepOrder()+i)
                            .eq(FlowStepInstance::getFlowInstanceNo, flowStepInstance.getFlowInstanceNo())
                            .in(FlowStepInstance::getFlowInstanceNo, flowInstanceNoList)
                            .last("limit 1"));
                    if (flowStepInstanceUpdate==null) {
                        return false;
                    }
                    if (flowStepInstanceUpdate==null) return false;
                    flowStepInstanceUpdate.setStatus((short)0);
                    flowStepInstanceUpdate.setErrorMessage(flowStepInstanceUpdate.getErrorMessage()+now+"人工调整;");
                    flowStepInstanceUpdate.setErrorCode(now.toString());
@@ -65,11 +65,9 @@
                    FlowStepInstance flowStepInstanceUpdate = getOne(new LambdaQueryWrapper<FlowStepInstance>()
                            .eq(FlowStepInstance::getTaskNo, taskNo)
                            .eq(FlowStepInstance::getStepOrder, flowStepInstance.getStepOrder()-i)
                            .eq(FlowStepInstance::getFlowInstanceNo, flowStepInstance.getFlowInstanceNo())
                            .in(FlowStepInstance::getFlowInstanceNo, flowInstanceNoList)
                            .last("limit 1"));
                    if (flowStepInstanceUpdate==null) {
                        return false;
                    }
                    if (flowStepInstanceUpdate==null) return false;
                    flowStepInstanceUpdate.setStatus((short)3);
                    flowStepInstanceUpdate.setErrorMessage(flowStepInstanceUpdate.getErrorMessage()+now+"人工调整;");
                    flowStepInstanceUpdate.setErrorCode(now.toString());
@@ -77,25 +75,16 @@
                    updateById(flowStepInstanceUpdate);
                }
            }

            flowStepInstance.setErrorMessage(flowStepInstance.getErrorMessage()+now+"人工调整;");
            flowStepInstance.setErrorCode(now.toString());
            flowStepInstance.setUpdateTime(now);
            flowStepInstance.setStatus((short)1);
            updateById(flowStepInstance);


            one.setTaskStatus(flowStepInstance.getWmsNowTaskStatus());
            taskService.updateById(one);
        } catch (Exception e) {
            throw new RuntimeException("人工调整出错：" + e);
        }
//        FlowInstance flowInstance = new FlowInstance();
//        flowInstance.setId(flowStepInstance.getFlowInstanceId());
//        flowInstance.setCurrentStepCode(flowStepInstance.getStepCode());
//        flowInstance.setCurrentStepOrder(flowStepInstance.getStepOrder());
//        flowInstance.setUpdateTime(new java.util.Date());
//        flowInstanceService.updateById(flowInstance);
        return true;
    }