出入库优化-登记2

jiazx0107@163.com

2023-05-30 2495e9ab75e6c45af1d6e14414711d8cc79fe2ca

 igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java

@@ -92,7 +92,6 @@

        // 车牌识别参数封装
        InoutConf conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_10, InoutConstant.PROGRESS_REGISTER, 1);
        if(null != conf) conf.setSort(sort);
        view.addObject("lprDto", conf);

        //初始化车牌识别
@@ -228,13 +227,13 @@
                InoutConstant.PROGRESS_WEIGHT_TAG, 3);
        view.addObject("snapDto3", conf);

         conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_70,
        conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_70,
                InoutConstant.PROGRESS_WEIGHT_TAG, 1);

        view.addObject("gateDto", conf);
        // 智慧卡
        conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_80, InoutConstant.PROGRESS_WEIGHT_TAG, 1);
        if(null != conf) conf.setSort(sort);
        if (null != conf) conf.setSort(sort);

        view.addObject("cardDto", conf);

@@ -557,6 +556,14 @@
    @Transactional
    public PageResponse<InoutData> inoutNextStep(@RequestBody InoutData data) {
        try {
            IUser user = ContextUtil.getLoginUser();
            if (StringUtils.isEmpty(data.getCompanyId())) {
                data.setCompanyId(user.getCompanyId());
            }
            if (StringUtils.isEmpty(data.getDeptId())) {
                data.setDeptId(ContextUtil.subDeptId(user));
            }

            if (InoutConstant.TYPE_IN.equals(data.getType())) {
                return inoutManager.inNextStep(data);
            } else {
@@ -571,6 +578,31 @@
            return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
                    "后台异常：" + e.getMessage());
        }
    }

    /**
     * 出入库数据保存，登记提交
     *
     * @param data
     * @return
     */
    @RequestMapping("/submit-register")
    @Transactional
    public PageResponse<InoutData> submitRegister(@RequestBody InoutData data) throws Exception {
        IUser user = ContextUtil.getLoginUser();
        if (StringUtils.isEmpty(data.getCompanyId())) {
            data.setCompanyId(user.getCompanyId());
        }
        if (StringUtils.isEmpty(data.getDeptId())) {
            data.setDeptId(ContextUtil.subDeptId(user));
        }

        //如果注册时候没有使用智慧卡，默认使用身份证号作为智慧卡号
        if (StringUtils.isEmpty(data.getIntelCard())) {
            data.setIntelCard(data.getUserId());
        }

        return inoutManager.submitRegisterInout(data);
    }

    /**
@@ -659,6 +691,7 @@

        return null;
    }

    /**
     * 更新用户选择地磅，根据用户IP保存期选择
     *