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

@@ -256,7 +256,9 @@
        }

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

        String loginUser = ContextUtil.getLoginUserCName();
        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());
        }
@@ -414,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);
        }

@@ -864,6 +877,7 @@
            curData.setCheckTime(new Date());
            data.setCheckTime(new Date());
        }
        curData.setCheckUser(data.getCheckUser());
        curData.setCheckStatus(data.getCheckStatus());
        curData.setFoodYear(data.getFoodYear());

@@ -887,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());