attend user

Fancy

2025-01-07 28f6317f7189d5c4a7e64f57dd6c7fc2011f8632

 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java

@@ -41,8 +41,8 @@
    private static final String WORK_TYPE_INSPECTION = "3";
    private static final String WORK_TYPE_REPAIR = "4";

    private static final String USER_PREFIX = "101";
    private static final String STATION_PREFIX = "103";
//    private static final String USER_PREFIX = "101";
//    private static final String STATION_PREFIX = "103";

    private PrAssemblyPlanMapper assemblyDao;
    private BaUserMapper baUserDao;
@@ -99,7 +99,7 @@
            throw new RuntimeException("员工编码不能为空");
        }
        //用户101
        if (id.startsWith(USER_PREFIX)) {
        if (id.startsWith(QrCodeConstant.TypeWorker)) {
            userId = Long.parseLong(id.toString().substring(3));
        } else {
            userId = Long.parseLong(id.toString());
@@ -120,7 +120,7 @@
            throw new RuntimeException("工站编码不能为空");
        }
        //工站103
        if (id.startsWith(STATION_PREFIX)) {
        if (id.startsWith(QrCodeConstant.TypeStation)) {
            stationId = Long.parseLong(id.toString().substring(3));
        } else {
            stationId = Long.parseLong(id.toString());
@@ -149,12 +149,12 @@
            throw new RuntimeException("工站编码或员工编码均不能为空,请检查");
        }
        //工站103
        if (vo.getStationId().startsWith(USER_PREFIX)) {
        if (vo.getStationId().startsWith(QrCodeConstant.TypeWorker)) {
            userInfo = getUserInfo(vo.getStationId());
        } else {
            stationInfo = getStationInfo(vo.getStationId());
        }
        if (vo.getUserId().startsWith(STATION_PREFIX)) {
        if (vo.getUserId().startsWith(QrCodeConstant.TypeStation)) {
            stationInfo = getStationInfo(vo.getUserId());
        } else {
            userInfo = getUserInfo(vo.getUserId());
@@ -242,9 +242,11 @@
                }
                return result;
            } else {
                List<PrProductionNode> nodeInfo = assyPlan.getProcess().getNodes().stream()
                        .filter(node -> node.id.equals(result.getNodeId())).collect(Collectors.toList());
                result.setPlanName(assyPlan.getName());
                result.setProcessName(assyPlan.getProcessName());
                result.setNodeName(assyPlan.getProcess().getNodes().get(0).getContent());
                result.setNodeName(nodeInfo.get(0).getContent());
                //找到对应的产品信息
                PltProduct product = productDao.selectByPrimaryKey(assyPlan.getProId());
                if (product != null) {
@@ -305,6 +307,8 @@
        //查询到当前的信息 如果登录信息一模一样,不会更新
        if (checkResult.getId() != null) {
            BeanUtils.copyProperties(checkResult, result);//checkResult拷贝到result
            result.setDt(new Date());
            assemblyWorkLastDao.updateByPrimaryKeySelective(result);
        }else{
            //逐个封装保存
            BeanUtils.copyProperties(vo, result);//vo拷贝到result
@@ -328,7 +332,7 @@
                    .filter(node -> node.id.equals(vo.getNodeId())).collect(Collectors.toList());
            result.setPlanName(assyPlan.getName());
            result.setProcessName(assyPlan.getProcessName());
            result.setNodeName(assyPlan.getProcess().getNodes().get(0).getContent());
            result.setNodeName(nodeInfo.get(0).getContent());
            //找到对应的产品信息
            PltProduct product = productDao.selectByPrimaryKey(assyPlan.getProId());
            if (product == null) {
@@ -383,7 +387,7 @@
        }
        BaUser userInfo = getUserInfo(assistant);
        //当前登录人不能是辅助人员
        if (workLast.getUserId() == userInfo.getId()) {
        if (workLast.getUserId().intValue() == userInfo.getId().intValue()) {
            throw new RuntimeException(userInfo.getName() + "是当前登录人员,不必添加为辅助人员.");
        }
        String userId = userInfo.getId().toString();
@@ -410,7 +414,7 @@
        if (workLast == null) {
            throw new RuntimeException("系统中没有当前登录信息,请检查或重新登录");
        }
        if ((!StringUtils.isBlank(assistant)) && assistant.startsWith(USER_PREFIX)) {
        if ((!StringUtils.isBlank(assistant)) && assistant.startsWith(QrCodeConstant.TypeWorker)) {
            assistant = assistant.substring(3);
        }
        if (!StringUtils.isBlank(workLast.getAssistants())) {