Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss

sgj

8 天以前 22a4f2b58fa1baa233e621d1406df456b516b4b1

 fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java

@@ -48,6 +48,19 @@
    }

    /**
     *     depotPR#getDepotByUserType
     *
     * @return
     */

    @DataProvider
    public List<Depot> getDepotByUserType(String parentId) {
        if (StringUtils.isNotEmpty(parentId)) {
            return depotService.getDepotByUserType(parentId);
        }
        return depotService.getDepotByUserType(null);
    }
    /**
     * depotPR#saveOrUpdate
     *
     * @param data
@@ -64,13 +77,31 @@
    }

    /**
     * 更新库存信息
     * depotPR#saveOrUpdate2
     *
     * @param data
     * @return
     */
    @DataResolver
    @Transactional
    @Log(title = "库存管理", businessType = BusinessType.UPDATE,bizType = BizTypeEnum.SYS)
    public String saveOrUpdate2(Depot data) {

        Depot depot = new Depot();
        BeanUtils.copyProperties(data, depot);
        depotService.updateStorageReal(depot);
        return null;
    }

    /**
     * depotPR#deleteDepot
     *
     * @param data
     */
    @Expose
    @Transactional
    @Log(title = "库区管理", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SYS)
    @Log(title = "仓库管理", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SYS)
    public void deleteDepot(Depot data) {
        Depot depot = new Depot();
        BeanUtils.copyProperties(data, depot);