Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-11-04 43ce77a85d8297a53dc25430fff10ead57296167

 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java

@@ -214,36 +214,6 @@
        return data;
    }

    private InoutData updateFiles(InoutData data) throws Exception {
        List<FileData> files = data.getFiles();
        if (null == files) {
            return data;
        }

        for (FileData fileData : files) {
            fileData.setFileId(ContextUtil.getUUID());
            fileData.setCompanyId(data.getCompanyId());
            fileData.setBizId(data.getId());
            if ("HANDLE".equals(fileData.getBizTag())) {
                if (data.getEmptyWeightTime().before(data.getFullWeightTime())) {
                    fileData.setCreateTime(DateUtils.addMinutes(data.getFullWeightTime(), -20));
                } else {
                    fileData.setCreateTime(DateUtils.addMinutes(data.getEmptyWeightTime(), -20));
                }
            }
            if ("WEIGHT_EMPTY".equals(fileData.getBizTag())) {
                fileData.setCreateTime(data.getEmptyWeightTime());
            }
            if ("WEIGHT_FULL".equals(fileData.getBizTag())) {
                fileData.setCreateTime(data.getFullWeightTime());
            }
            fileData.setCreateTime(new Date());
            coreFileService.addRecord(fileData);
        }

        return data;
    }

    /**
     * 从缓存中获取下一流程
     *
@@ -286,7 +256,9 @@
        }

        if (InoutConstant.PROGRESS_CHECK.equals(data.getProgress())) {
            data.setCheckUser(ContextUtil.getLoginUserCName());
            if (StringUtils.isEmpty(data.getCheckUser())) {
                data.setCheckUser(ContextUtil.getLoginUserCName());
            }
            data.setProgress(nextProgress);
            return data;
        }
@@ -427,11 +399,22 @@
        }

        String loginUser = ContextUtil.getLoginUserCName();
        data.setRegisterUser(loginUser);
        data.setFullWeightUser(loginUser);
        data.setEmptyWeightUser(loginUser);
        data.setHandleUser(loginUser);
        data.setCompleteUser(loginUser);
        if (StringUtils.isEmpty(data.getRegisterUser())) {
            data.setRegisterUser(loginUser);
        }
        if (StringUtils.isEmpty(data.getFullWeightUser())) {
            data.setFullWeightUser(loginUser);
        }
        if (StringUtils.isEmpty(data.getEmptyWeightUser())) {
            data.setEmptyWeightUser(loginUser);
        }
        if (StringUtils.isEmpty(data.getHandleUser())) {
            data.setHandleUser(loginUser);
        }
        if (StringUtils.isEmpty(data.getCompleteUser())) {
            data.setCompleteUser(loginUser);
        }

        if (null == data.getCompleteTime()) {
            data.setCompleteTime(new Date());
        }
@@ -444,7 +427,7 @@
        if (null == data.getIntelCard()) {
            data.setIntelCard(data.getUserId());
        }
        if (null != data.getCheckItems()) {
        if (null != data.getCheckItems() && StringUtils.isEmpty(data.getCheckUser())) {
            data.setCheckUser(loginUser);
        }

@@ -493,8 +476,7 @@
        if (InoutConstant.TYPE_IN.equals(data.getType())) {
            this.updateCheckItems(data, true);
        }
        this.updateFiles(data);

        fileService.saveInoutFiles(data.getFiles(), data.getCompanyId(), data.getId(), null);
        return null;
    }

@@ -542,9 +524,9 @@

        data = inoutService.inoutQueryById(param);

        if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
            return "流程结束的数据不支持异常处理！";
        }
//        if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
//            return "流程结束的数据不支持异常处理！";
//        }
        if (InoutConstant.RECORD_STATUS_DEL.equals(data.getRecordStatus())) {
            return "当前信息已做异常处理，不支持重复执行！";
        }
@@ -645,7 +627,7 @@
            return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
                    "提示：当前库区未配置出入库流程信息，请联系管理员", data);
        }

        List<FileData> files = data.getFiles();
        // 获取下一个流程状态
        String curProgress = data.getProgress();
        String nextProgress = getNextProgress(curProgress, data.getType(),
@@ -659,8 +641,10 @@
            return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg, data);
        }

        // 执行附件信息
        fileService.saveInoutFiles(data.getFiles(), data.getCompanyId(), data.getId(), curProgress);
        if (null != files && files.size() > 0) {
            // 执行附件信息
            fileService.saveInoutFiles(files, data.getCompanyId(), data.getId(), curProgress);
        }

        //登记完成事件
        inoutEventControl.onInoutRegister(data);
@@ -677,7 +661,7 @@
            return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
                    "提示：当前系统中流程配置异常，请联系管理员", data);
        }

        List<FileData> files = data.getFiles();
        // 获取下一个流程状态
        String curProgress = data.getProgress();
        String nextProgress = getNextProgress(curProgress, data.getType(),
@@ -695,8 +679,10 @@
                    data);
        }

        // 执行附件信息
        fileService.saveInoutFiles(data.getFiles(), data.getCompanyId(), data.getId(), curProgress);
        if (null != files && files.size() > 0) {
            // 执行附件信息
            fileService.saveInoutFiles(files, data.getCompanyId(), data.getId(), curProgress);
        }

        // 称重完成事件
        inoutEventControl.onInoutWeight(data, curProgress, nextProgress);
@@ -891,6 +877,7 @@
            curData.setCheckTime(new Date());
            data.setCheckTime(new Date());
        }
        curData.setCheckUser(data.getCheckUser());
        curData.setCheckStatus(data.getCheckStatus());
        curData.setFoodYear(data.getFoodYear());

@@ -914,6 +901,7 @@
        curData.setCheckItems(data.getCheckItems());
        curData.setCheckTime(data.getCheckTime());
        curData.setDepotId(data.getDepotId());
        curData.setFoodType(data.getFoodType());

        if (StringUtils.isEmpty(data.getCheckUser())) {
            curData.setCheckUser(ContextUtil.getLoginUserCName());