jiazx0107@163.com
2023-05-29 0efbf246a22f7331cf2e16bd659caea22a494102
igds-core/src/main/java/com/ld/igds/view/DepotPR.java
@@ -211,8 +211,9 @@
    // ${dorado.getDataProvider("depotPR#getAllCache").getResult()}
    @DataProvider
    public List<Depot> getAllCache(String name) {
        return depotService.getAllCache(name, null);
        return depotService.getAllCache(name, ContextUtil.getCompanyId());
    }
    // depotPR#ajaxGetAllCache
    @Expose
@@ -223,7 +224,7 @@
    // depotPR#flushCache
    @Expose
    public void flushCache() {
        depotService.flushCache(null);
        depotService.flushCache(ContextUtil.getCompanyId());
    }
    // depotPR#saveOrUpdate
@@ -241,14 +242,7 @@
        if (null == depot.getCompanyId()) {
            depotService.saveDepot(depot);
        } else {
            depotService.updataDepot(depot);
// TODO
//            if (StringUtils.isNotEmpty(depot.getEditTag())) {
//                // 表示修改了仓库状态
//                if (depot.getEditTag().indexOf("depotStatus") >= 0) {
//                    this.pullDepotStatus(depot.getCompanyId(), depot.getId(), depot.getDepotStatus());
//                }
//            }
            depotService.updateDepot(depot);
        }
        flushCache();
@@ -323,38 +317,26 @@
        depotService.updateFreq(freq);
    }
    public void updateByStore(DepotStore data) {
        depotService.updateByStore(data);
    public void updateByStore(DepotStore data) throws Exception {
        Depot depot = depotService.getDepotById(data.getCompanyId(), data.getDepotId());
        if (null == depot) return;
        depot.setStorageReal(data.getStorageReal());
        depot.setDepotStatus(data.getDepotStatus());
        depot.setFoodLevel(data.getFoodLevel());
        depot.setFoodLocation(data.getFoodLocation());
        depot.setFoodVariety(data.getFoodVariety());
        depot.setFoodType(data.getFoodType());
        depot.setFoodYear(data.getFoodYear());
        if (null != data.getStoreDate()) {
            depot.setStoreDate(data.getStoreDate());
    }
    /**
     * 根据仓库初始化一条出入库的流水记录
     * public void initDepotInoutRecord(Depot depot) {
     * InoutRecord data = new InoutRecord();
     * if (StringUtils.isEmpty(depot.getCompanyId())) {
     * depot.setCompanyId(ContextUtil.getCompanyId());
     * }
     * data.setId(depot.getCompanyId() + "-" + depot.getId() + "-"
     * + DateFormatUtils.format(new Date(), "yyyyMMdd"));
     * data.setCheckStatus("PASS");
     * data.setCompanyId(depot.getCompanyId());
     * data.setCompleteTime(new Date());
     * data.setCompleteUser(ContextUtil.getLoginUserCName());
     * data.setDepotId(depot.getId());
     * data.setDeptId(depot.getDeptId());
     * data.setFoodVariety(depot.getFoodVariety());
     * data.setFoodYear(DateFormatUtils.format(new Date(), "yyyy"));
     * data.setProgress("RECORD");
     * data.setRecordStatus("ADD");
     * data.setType("NONE");
     * if (depot.getStorageReal() == null) {
     * data.setCurStorage(0);
     * } else {
     * data.setCurStorage(depot.getStorageReal());
     * }
     * depotService.initInoutRecord(data);
     * }
     */
        depotService.updateDepot(depot);
    }
    public String pullDepotStatus(String companyId, String depotId, String status) {
        // 执行推送