diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java index 89b97a59..2c776b1b 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java @@ -395,6 +395,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl getSupplierCodesByCenter(BirRoiCostDTO costDTO, String centerType, List centerIds) { if(CollUtil.isEmpty(centerIds)){ + //Todo 成本中心发货 return null; } if(centerType.equals("customer")){ diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java index c2ae8b49..1206ec48 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java @@ -383,8 +383,9 @@ public class BmsRegionController { return R.error("预算含当前成本中心,删除失败"); } //删除商品限制 -// bmsRuleRegionService.removeByRegionId(id); - boolean result = bmsRegionService.removeById(id); + + bmsRuleRegionService.removeByRegionId(id); + bmsRegionService.removeById(id); //清空临时表 hisUserSupplierService.cleanTable(); return R.ok(); diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java index 29d77acf..b31e190a 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java @@ -14,6 +14,7 @@ import com.qs.serve.modules.bms.entity.vo.BmsSubjectTreeVo; import com.qs.serve.modules.bms.mapper.BmsSubjectMapper; import com.qs.serve.modules.bms.mapper.BmsSupplierMapper; import com.qs.serve.modules.bms.service.*; +import com.qs.serve.modules.goods.entity.GoodsCategory; import com.qs.serve.modules.tbs.entity.TbsActivitySubject; import com.qs.serve.modules.tbs.service.TbsActivitySubjectService; import lombok.AllArgsConstructor; @@ -48,10 +49,27 @@ public class BmsSubjectController { private BmsSupplierService bmsSupplierService; /** - * 树查询 - * @param supplierId + * 返回树节点列表 + * @apiNote 用于模板,通过ids查询 + * @param param * @return */ + @PostMapping("/listByParam") + public R> listTreeVoBySelect(@RequestBody BmsSubject param) { + if(CollectionUtil.isEmpty(param.getSelectIds())){ + return R.ok(); + } + LambdaQueryWrapper subjectWrapper = new LambdaQueryWrapper<>(); + subjectWrapper.in(BmsSubject::getId,param.getSelectIds()); + List subjectList = bmsSubjectService.list(subjectWrapper); + return R.ok(subjectList); + } + + /** + * 树查询 + * @param supplierId + * @return + */ @GetMapping("/tree") @PreAuthorize("hasRole('bms:subject:query')") public R> getPage(String supplierId,Integer slottingFlag){ diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSubject.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSubject.java index 748b3f68..660c4a3f 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSubject.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSubject.java @@ -122,5 +122,8 @@ public class BmsSubject implements Serializable { /** 行政区域 */ @TableField(exist = false) private List bizRegionInfos; + + @TableField(exist = false) + private List selectIds; } diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java index cde982b6..23757576 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java @@ -57,19 +57,19 @@ public class BmsRegionServiceImpl extends ServiceImpl @Override public boolean updateBmsRegionById(BmsRegion param){ BmsRegion ori = this.getById(param.getId()); + String[] paths = ori.getPathIds().split("_"); + for (String path : paths) { + if(path.equals(ori.getPid())){ + Assert.throwEx("不能选子节点为父级节点"); + } + } param = this.flushSetLevel(param); boolean changePid = !ori.getPid().equals(param.getPid()); -// if(changePid){ -// Assert.throwEx("当前版本限制上下级变更"); -// } boolean b = this.updateById(param); if(!ori.getName().equals(param.getName())||changePid) { - BmsRegion parentRegion = this.updatePathByPid(param.getId()); + //更新相关表(网点) + this.updatePathByPid(param.getId()); if(changePid){ - //hisUserSupplierService.cleanTable(); - /*停用的逻辑 - hisUserChannelPointService.removeRegion(2,ori.getPathIds()); - hisUserChannelPointService.flushRegion(2,parentRegion.getPathIds());*/ //更新客户 BmsRegion currentRegion = this.getById(param.getId()); List regionSupplierList = bmsSupplierApplicationService.listByRegionIds(Arrays.asList(ori.getId()),ori.getLevel()); @@ -271,6 +271,11 @@ public class BmsRegionServiceImpl extends ServiceImpl this.updateById(param); } + /** + * 更新含路径相关的表,如网点 + * @param pid + * @return + */ private BmsRegion updatePathByPid(String pid){ BmsRegion parRegion = this.getById(pid); List regionList = this.listChild(pid);