Fancy
2024-07-15 9b29965e8f21c197de95bc36a30e8b302429dc6b
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
@@ -155,11 +155,16 @@
        if (workLasts.size() > 0) {
            List<StaAssemblyWorkLast> userStationList = workLasts.stream().filter(item -> userId == item.getUserId()).collect(Collectors.toList());
            if (userStationList.size() == 0) {
                throw new RuntimeException("员工(" + workLasts.get(0).getUserName() + ")编码:" + workLasts.get(0).getUserId() + "已经绑定该工站(" + workLasts.get(0).getStationName() + ")编码:" + workLasts.get(0).getStationId() + ".请先让其解绑");
                //删除工站登录信息
                for (int i = 0; i < workLasts.size(); i++) {
                    logout(workLasts.get(i).getId().toString());
                }
                //throw new RuntimeException("员工(" +userInfo.getName() + ")编码:" + workLasts.get(0).getUserId() + "已经绑定该工站(" + stationInfo.getName() + ")编码:" + workLasts.get(0).getStationId() + ".请先让其解绑");
            } else {
                BeanUtils.copyProperties(userStationList.get(0), result);
            }
        } else {
        }
        if (result.getId() == null) {
            result.setUserId(userInfo.getId());
            result.setUserName(userInfo.getName());
            result.setStationId(stationInfo.getId());
@@ -170,9 +175,13 @@
    }
    public StaAssemblyWorkLast getWorkLast(String workId) {
        if (StringUtils.isBlank(workId)) {
            throw new RuntimeException("登录ID为空,请联系管理员查看并解决问题.");
        }
        StaAssemblyWorkLast result = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(workId));
        if (result == null) {
            return null;
            throw new RuntimeException("系统中没有该条登录信息");
            //return null;
        }
        BaUser userInfo = getUserInfo(result.getUserId().toString());
        PltStation stationInfo = getStationInfo(result.getStationId().toString());
@@ -184,30 +193,32 @@
            //直接删除记录
            logout(result.getId().toString());
            result.setId(null);
            if(userInfo == null){
            result.setStatus(STATUS_WORK_LAST_LOGOUT);
            if (userInfo == null) {
                result.setUserId(null);
                result.setUserName("");
            }
            if(stationInfo == null){
            if (stationInfo == null) {
                result.setStationId(null);
                result.setStationName("");
            }
            if(assyPlan == null){
            if (assyPlan == null) {
                result.setPlanId(null);
                result.setPlanName("");
            }
            if(!hasNodeId){
            if (!hasNodeId) {
                result.setNodeId(null);
                result.setNodeName("");
            }
            return result;
        }else {
        } else {
            result.setPlanName(assyPlan.getName());
            result.setProcessName(assyPlan.getProcessName());
            result.setNodeName(assyPlan.getProcess().getNodes().get(0).getContent());
            //找到对应的产品信息
            PltProduct  product = productDao.selectByPrimaryKey(assyPlan.getProId());
            PltProduct product = productDao.selectByPrimaryKey(assyPlan.getProId());
            if (product != null) {
                result.setProId(product.getId());
                result.setProName(product.getName());
                String devicePrefix = "110" + product.getCode() + assyPlan.getBatchNo();
                result.setDevicePrefix(devicePrefix);
@@ -233,7 +244,7 @@
        param.setStatus(STATUS_NORMAL);
        List<StaAssemblyWorkLast> workLasts = assemblyWorkLastDao.selectList(param);
        if (workLasts.size() > 0) {
            result =  getWorkLast(workLasts.get(0).getId().toString());
            result = getWorkLast(workLasts.get(0).getId().toString());
        }
        result.setStationId(stationInfo.getId());
        result.setStationName(stationInfo.getName());
@@ -291,10 +302,11 @@
        result.setProcessName(assyPlan.getProcessName());
        result.setNodeName(assyPlan.getProcess().getNodes().get(0).getContent());
        //找到对应的产品信息
        PltProduct  product = productDao.selectByPrimaryKey(assyPlan.getProId());
        PltProduct product = productDao.selectByPrimaryKey(assyPlan.getProId());
        if (product == null) {
            throw new RuntimeException("产品信息有误或被其他人员修改,请登录管理系统查看任务关联产品ID为:" + assyPlan.getProId());
        }
        result.setProId(product.getId());
        result.setProName(product.getName());
        String devicePrefix = "110" + product.getCode() + assyPlan.getBatchNo();
        result.setDevicePrefix(devicePrefix);
@@ -331,28 +343,6 @@
            });
        });*/
        return planList;
    }
    //workId   assistants 传的是单个的userId  必传参数
    public List<BaUser> updateAssistant(QueryVo vo) {
        //找到workId
        StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(vo.getWorkId());
        if (workLast == null) {
            throw new RuntimeException("系统中没有该条登录信息,请检查或重新登录");
        }
        //如果assistants 有101 则删掉
        StringBuilder sb = new StringBuilder();
        String[] assistantArr = vo.getAssistants().split(",");
        for (String item : assistantArr) {
            if (item.startsWith(USER_PREFIX)) {
                sb.append(item.substring(3)).append(",");
            } else {
                sb.append(item).append(",");
            }
        }
        String assistantStr = assistantArr.length > 0 ? sb.deleteCharAt(sb.length() - 1).toString() : "";
        List<BaUser> userInfo = baUserDao.selectByAssistants(vo.getAssistants());
        return userInfo;
    }
    public int addAssistant(String workId, String assistant) {
@@ -417,6 +407,4 @@
        List<BaUser> assistantList = baUserDao.selectByAssistants(workLast.getAssistants());
        return assistantList;
    }
}