只返回当前农场已出库农资

guoshilong

2022-08-15 6eff17f08affd763b4acdb6d515b470691d56946

只返回当前农场已出库农资

 src/main/java/org/springblade/modules/soldr/controller/SoldrController.java

@@ -287,8 +287,8 @@
     * @return
     */
    @GetMapping("/selectSol")
    public R selectSol() {
        List<SoldrVO> soldrVOS = soldrService.selectSol();
    public R selectSol(String farmId) {
        List<SoldrVO> soldrVOS = soldrService.selectSol(farmId);
        for (int i = 0; i < soldrVOS.size(); i++) {
            String specs1 = soldrVOS.get(i).getSpecs1();
            String dic1 = soldrVOS.get(i).getDic1();

 src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.java

@@ -45,7 +45,7 @@
    List<SoldrVO> selectLists(IPage page, SoldrVO soldr);
    void  del(Long id);
    void  dels(Long id);
    List<SoldrVO> selectSol();
    List<SoldrVO> selectSol(@Param("farmId") String farmId);
    List<Map<String, Object>> selectCz(Long sid);
    /**
     * 根据stockId、specs1、specs_val1、specs_val2、sid          找到soldr表中对应的数据

 src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml

@@ -107,6 +107,9 @@
                            WHERE CODE = 'stockType' AND is_deleted = 0) a ON
            a.dict_key = stf.type
        WHERE st.is_deleted = 0
        <if test="farmId != null and farmId !=''">
            AND st.dept_id = #{farmId}
        </if>
    </select>

    <!--查询是否存在已出库农资-->

 src/main/java/org/springblade/modules/soldr/service/ISoldrService.java

@@ -43,7 +43,7 @@
    IPage<SoldrVO> selectLists(IPage<SoldrVO> page, SoldrVO soldr);
    void  del(Long id);
    void  dels(Long id);
    List<SoldrVO> selectSol();
    List<SoldrVO> selectSol(String farmId);
    List<Map<String, Object>> selectCz(Long sid);

    /**

 src/main/java/org/springblade/modules/soldr/service/impl/SoldrServiceImpl.java

@@ -57,8 +57,8 @@
    }

    @Override
    public List<SoldrVO> selectSol() {
        return baseMapper.selectSol();
    public List<SoldrVO> selectSol(String farmId) {
        return baseMapper.selectSol(farmId);
    }

    @Override