分支自 igds-v4
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
jiazx0107@163.com
2023-05-31 7a7ccfd74dbdff086d2aabe5117ec1dc6f804d91 
 igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java


@@ -1,5 +1,6 @@


package com.ld.igds.inout.controller;




import ch.qos.logback.classic.pattern.ClassNameOnlyAbbreviator;


import com.bstek.bdf2.core.business.IUser;


import com.ld.igds.check.dto.CheckItemData;


import com.ld.igds.common.manager.CommonManager;


@@ -9,11 +10,11 @@


import com.ld.igds.data.BaseParam;


import com.ld.igds.data.Page;


import com.ld.igds.data.PageResponse;


import com.ld.igds.data.SimpleDepot;


import com.ld.igds.inout.InoutConstant;


import com.ld.igds.inout.dto.*;


import com.ld.igds.inout.manager.InoutCommonManager;


import com.ld.igds.inout.manager.InoutManager;


import com.ld.igds.io.dto.WeightDto;


import com.ld.igds.models.Depot;


import com.ld.igds.models.DicTrigger;


import com.ld.igds.models.InoutConf;


@@ -171,7 +172,6 @@


        }




        ModelAndView view = new ModelAndView();




        IUser user = ContextUtil.getLoginUser();


        view.addObject(Constant.MODEL_KEY_LOGIN_USER, user);




@@ -181,59 +181,52 @@


        view.addObject("deptId", deptId);




        // 仓库列表做下拉框使用


        List<Depot> listDepot = commonManager.listInDepot();


        List<SimpleDepot> listDepot = commonManager.getCacheDeptIn(user.getCompanyId(), deptId);


        view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);




        // 当前流程标签


        view.addObject("progress", InoutConstant.PROGRESS_WEIGHT_TAG);




        //入库流程


        //入库流程配置


        String inoutProgress = inoutCommonManager.getInoutProgressConf(user.getCompanyId(), deptId, InoutConstant.TYPE_IN);


        view.addObject("inoutProgress", inoutProgress);




        //称重结果是否可修改


        String weightEditTag = inoutCommonManager.getWeightEditTag(user.getCompanyId(), ContextUtil.subDeptId(user));


        //称重是否可编辑标签


        String weightEditTag = inoutCommonManager.getWeightEditTag(user.getCompanyId(), deptId);


        view.addObject("weightEditTag", weightEditTag);




        // 粮食品种下拉框


        List<DicTrigger> listFoodVariety = inoutCommonManager.getDicTrigger(Constant.TRIGGER_PARENT_FOOD_VARIETY, user.getCompanyId());


        view.addObject("listFoodVariety", listFoodVariety);




        // 获取出入库配置信息


        // 获取出入库设备配置信息


        List<InoutConf> listInoutConf = inoutCommonManager.getListInoutConf(user.getCompanyId(), deptId);




        //获取所有的地磅列表用于页面用户选择


        List<WeightDto> listWeight = inoutCommonManager.getInoutWeightAll(listInoutConf, InoutConstant.CONF_TYPE_30);


        //根据出入库设备信息筛选地磅配置信息，所有地磅，支持用户手动选择


        List<InoutConf> listWeight = inoutCommonManager.getInoutConf(listInoutConf, InoutConstant.CONF_TYPE_30);


        view.addObject("listWeight", listWeight);




        // 获取当前地磅信息


        WeightDto weightDto = inoutCommonManager.getInoutCurWeight(listWeight, sort);


        // 获取当前地磅


        InoutConf weightDto = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_30);


        view.addObject("weightDto", weightDto);




        // 过程摄像头1


        InoutConf conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_60,


                InoutConstant.PROGRESS_WEIGHT_TAG, 1);


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


        view.addObject("snapDto1", conf);




        // 过程摄像头2


        conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_60,


                InoutConstant.PROGRESS_WEIGHT_TAG, 2);


        conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_60, InoutConstant.PROGRESS_WEIGHT_TAG, 2);


        view.addObject("snapDto2", conf);




        // 过程摄像头3


        conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_60,


                InoutConstant.PROGRESS_WEIGHT_TAG, 3);


        conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_60, InoutConstant.PROGRESS_WEIGHT_TAG, 3);


        view.addObject("snapDto3", conf);




        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);




        view.addObject("cardDto", conf);






        view.setViewName("admin/inout/in-weight");


        return view;


@@ -252,12 +245,13 @@


        IUser user = ContextUtil.getLoginUser();


        view.addObject(Constant.MODEL_KEY_LOGIN_USER, user);




        String deptId = ContextUtil.subDeptId(user);


        view.addObject("bizType", BizType.INOUT_IN.getCode());


        view.addObject("deptId", ContextUtil.subDeptId(user));


        view.addObject("deptId", deptId);


        view.addObject("type", InoutConstant.TYPE_IN);




        // 仓库列表做下拉框使用


        List<Depot> listDepot = commonManager.listInDepot();


        List<SimpleDepot> listDepot = commonManager.getCacheDeptIn(user.getCompanyId(), deptId);


        view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);




        //入库流程


@@ -294,12 +288,13 @@


        IUser user = ContextUtil.getLoginUser();


        view.addObject(Constant.MODEL_KEY_LOGIN_USER, user);




        String deptId = ContextUtil.subDeptId(user);


        view.addObject("bizType", BizType.INOUT_IN.getCode());


        view.addObject("deptId", ContextUtil.subDeptId(user));


        view.addObject("deptId", deptId);


        view.addObject("type", InoutConstant.TYPE_IN);




        // 仓库列表做下拉框使用


        List<Depot> listDepot = commonManager.listInDepot();


        List<SimpleDepot> listDepot = commonManager.getCacheDeptIn(user.getCompanyId(), deptId);


        view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);




        //入库流程


@@ -387,7 +382,7 @@


        view.addObject("deptId", deptId);




        // 仓库列表做下拉框使用


        List<Depot> listDepot = commonManager.listInDepot();


        List<SimpleDepot> listDepot = commonManager.getCacheDeptOut(user.getCompanyId(), deptId);


        view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);




        // 当前流程标签


@@ -409,11 +404,11 @@


        List<InoutConf> listInoutConf = inoutCommonManager.getListInoutConf(user.getCompanyId(), deptId);




        //获取所有的地磅列表用于页面用户选择


        List<WeightDto> listWeight = inoutCommonManager.getInoutWeightAll(listInoutConf, InoutConstant.CONF_TYPE_30);


        List<InoutConf> listWeight = inoutCommonManager.getInoutConf(listInoutConf, InoutConstant.CONF_TYPE_30);


        view.addObject("listWeight", listWeight);




        // 获取当前地磅信息


        WeightDto weightDto = inoutCommonManager.getInoutCurWeight(listWeight, sort);


        InoutConf weightDto = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_30);


        view.addObject("weightDto", weightDto);




        // 过程摄像头1


@@ -454,7 +449,7 @@


        view.addObject("type", InoutConstant.TYPE_OUT);




        // 仓库列表做下拉框使用


        List<Depot> listDepot = commonManager.listOutDepot();


        List<SimpleDepot> listDepot = commonManager.getCacheDeptOut(user.getCompanyId(),deptId);


        view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);




        //出库流程


@@ -489,15 +484,19 @@




        ModelAndView view = new ModelAndView();




        // 仓库列表做下拉框使用


        List<Depot> listDepot = commonManager.listOutDepot();


        view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);




        IUser user = ContextUtil.getLoginUser();




        String deptId =  ContextUtil.subDeptId(user);


        view.addObject(Constant.MODEL_KEY_LOGIN_USER, user);


        view.addObject("bizType", BizType.INOUT_OUT.getCode());


        view.addObject("deptId", ContextUtil.subDeptId(user));


        view.addObject("deptId",deptId);


        view.addObject("type", InoutConstant.TYPE_OUT);






        // 仓库列表做下拉框使用


        List<SimpleDepot> listDepot = commonManager.getCacheDeptOut(user.getCompanyId(),deptId);


        view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);






        //出库流程


        String inoutProgress = inoutCommonManager.getInoutProgressConf(user.getCompanyId(),


@@ -529,6 +528,7 @@


     */


    @RequestMapping("/inout-query")


    public PageResponse<InoutData> inoutQuery(@RequestBody InoutParam param) {


        if(null == param.getCompanyId()) param.setCompanyId(ContextUtil.getCompanyId());


        return inoutManager.inoutQuery(param);


    }