船运问题修改2

YYC

2023-10-19 723f54708d7c2b71f916e40952ebc818629e66ab

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

@@ -93,14 +93,14 @@
        InoutConf conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_10, InoutConstant.PROGRESS_REGISTER, 1);
        view.addObject("lprDto", conf);

        //初始化车牌识别
        inoutManager.initLpr(conf);
        //登记初始化
        inoutManager.initInoutRegister(conf);

        view.setViewName("admin/inout/in-register");
        return view;
    }
    
    


    /**
     * 扦样页面
     *
@@ -287,6 +287,8 @@
        if (null != conf) conf.setSort(sort);
        view.addObject("cardDto", conf);

        //称重页面初始化
        inoutManager.initInoutWeight(listInoutConf,sort);

        view.setViewName("admin/inout/in-weight");
        return view;
@@ -405,7 +407,7 @@
        view.addObject("lprDto", conf);

        //初始化车牌识别
        inoutManager.initLpr(conf);
        inoutManager.initInoutRegister(conf);

        view.setViewName("admin/inout/out-register");
        return view;
@@ -663,6 +665,8 @@
    @RequestMapping("/submit-handle")
    @Transactional
    public PageResponse<InoutData> submitHandle(@RequestBody InoutData data) throws Exception {

        log.debug("-------------submitHandle------------------");
        return inoutManager.submitHandle(data);
    }

@@ -691,6 +695,43 @@
    }

    /**
     * 根据质检单号获取出入库信息
     * @param param
     * @return
     */
    @RequestMapping("/inout-check-scan-code")
    public PageResponse<InoutCheckData> inoutDataByCheckId(@RequestBody InoutCheckParam param) {
        if (null == param.getCompanyId()) {
            param.setCompanyId(ContextUtil.getCompanyId());
        }
        return inoutManager.inoutDataByCheckId(param);
    }

    /**
     * 质检页面仅提交保存化验信息
     *
     * @param data
     * @return
     */
    @RequestMapping("/submit-checkItem")
    @Transactional
    public PageResponse<InoutCheckData> submitCheckItem(@RequestBody InoutCheckData data)throws Exception {
        return inoutManager.submitCheckData(data);
    }

    /**
     * 质检页面提交下一流程
     *
     * @param data
     * @return
     */
    @RequestMapping("/submit-check")
    @Transactional
    public PageResponse<InoutCheckData> submitCheck(@RequestBody InoutCheckData data) throws Exception {
        return inoutManager.submitCheck(data);
    }

    /**
     * 更新用户选择地磅，根据用户IP保存期选择
     *
     * @param param 用参数中的key作为选择
@@ -716,8 +757,6 @@
    }


   

    /**
     * 分页获取扦样数据
     *
@@ -728,7 +767,6 @@
    public PageResponse<Page<InoutCheckData>> pageSampleData(@RequestBody InoutCheckParam param) {
        return inoutManager.pageSampleData(param);
    }



    /**
@@ -753,17 +791,6 @@
        return inoutManager.getCheckItemData(param);
    }

    /**
     * 化验页面提交更新
     *
     * @param data
     * @return
     */
    @RequestMapping("/update-check")
    public PageResponse<InoutCheckData> updateCheck1(@RequestBody InoutCheckData data) {

        return inoutManager.updateCheckData(data);
    }

    /**
     * 根据粮食等级及粮食品种获取粮食定价