Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-11-04 43ce77a85d8297a53dc25430fff10ead57296167

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

@@ -7,6 +7,7 @@
import com.ld.igds.constant.RespCodeEnum;
import com.ld.igds.data.Page;
import com.ld.igds.data.PageResponse;
import com.ld.igds.data.SimpleDepot;
import com.ld.igds.file.dto.FileData;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.dto.InoutData;
@@ -28,6 +29,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;

import javax.annotation.Resource;
import java.net.URLDecoder;
import java.util.Date;
@@ -126,7 +128,7 @@
        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);

        //入库流程
@@ -202,7 +204,7 @@
        view.addObject("deptId", deptId);

        // 仓库列表做下拉框使用
        List<Depot> listDepot = commonManager.listOutDepot();
        List<SimpleDepot> listDepot = commonManager.getCacheDeptOut(user.getCompanyId(), deptId);
        view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);

        //入库流程
@@ -270,50 +272,24 @@
        return inoutManager2.pageInoutData(param);
    }

    /**
     * 2022年11月15日 暂停使用
     * 入库的往来单位下拉框 -- 从入库通知单或往来单位表中查询
     *
     * @param param 查询关键字可以是ID也可能是名称
     * @return

     @RequestMapping("/list-in-customer") public PageResponse<List<InoutCustomer>> listInCustomer(@RequestBody InoutParam param) {

     return inoutManager2.listCustomerIn(param);
     }
     */


    /**
     * 入库通知单-获取没有完成的通知单列表
     *
     * @return
     */
    @RequestMapping("/list-notice—in")
    @RequestMapping("/list-notice-in")
    public PageResponse<List<InoutNoticeIn>> listNoticeIn(@RequestBody NoticeParam param) {
        return inoutManager2.listNoticeIn(param);
    }

    /**
     *
     * 2022年11月15日 暂停使用
     * 出库的往来单位下拉框 -- 从出库通知单或往来单位表中查询
     *
     * @param param
     * @return
     @RequestMapping("/list-out-customer") public PageResponse<List<InoutCustomer>> listOutCustomer(
     @RequestBody InoutParam param) {

     return inoutManager2.listCustomerOut(param);
     }
     */

    /**
     * 出库通知单-获取没有完成的通知单列表
     *
     * @return
     */
    @RequestMapping("/list-notice—out")
    @RequestMapping("/list-notice-out")
    public PageResponse<List<InoutNoticeOut>> listNoticeOut(@RequestBody NoticeParam param) {
        return inoutManager2.listNoticeOut(param);
    }
@@ -338,7 +314,7 @@
        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);

        // 粮食品种下拉框
@@ -379,7 +355,7 @@
        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);

        //入库流程
@@ -410,11 +386,11 @@
                .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
@@ -456,7 +432,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);

        // 粮食品种下拉框
@@ -495,7 +471,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);

        //入库流程
@@ -526,11 +502,11 @@
                .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