Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-11-04 43ce77a85d8297a53dc25430fff10ead57296167

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

@@ -197,6 +197,10 @@
                Constant.TRIGGER_PARENT_FOOD_VARIETY, user.getCompanyId());
        view.addObject("listFoodVariety", listFoodVariety);

        // 粮食性质下拉框
        List<DicTrigger> listFoodType = inoutCommonManager.getDicTrigger(Constant.TRIGGER_PARENT_FOOD_TYPE, user.getCompanyId());
        view.addObject("listFoodType", listFoodType);

        // 粮食等级下拉框
        List<DicTrigger> listFoodLevel = inoutCommonManager.getDicTrigger(
                Constant.TRIGGER_PARENT_FOOD_LEVEL, user.getCompanyId());
@@ -287,6 +291,8 @@
        if (null != conf) conf.setSort(sort);
        view.addObject("cardDto", conf);

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

        view.setViewName("admin/inout/in-weight");
        return view;
@@ -692,9 +698,34 @@
        return inoutManager.submitComplete(data);
    }

    /**
     * 根据质检单号获取出入库信息
     *
     * @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