purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化商品类型里面的重复判断逻辑，增加上级目录的条件

Browse Source
This commit is contained in:
jishenghua
2025-10-28 17:21:58 +08:00
parent 390c2d34e1
commit 13a9ec92dd
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialCategoryController.java
View File

@@ -97,10 +97,12 @@ public class MaterialCategoryController extends BaseController {
@GetMapping(value = "/checkIsNameExist") @GetMapping(value = "/checkIsNameExist")
@ApiOperation(value = "检查名称是否存在") @ApiOperation(value = "检查名称是否存在")
public String checkIsNameExist(@RequestParam Long id, @RequestParam(value ="name", required = false) String name, public String checkIsNameExist(@RequestParam Long id,
@RequestParam(value ="name", required = false) String name,
@RequestParam(value ="parentId", required = false) Long parentId,
HttpServletRequest request)throws Exception { HttpServletRequest request)throws Exception {
Map<String, Object> objectMap = new HashMap<>(); Map<String, Object> objectMap = new HashMap<>();
int exist = materialCategoryService.checkIsNameExist(id, name); int exist = materialCategoryService.checkIsNameExist(id, name, parentId);
if(exist > 0) { if(exist > 0) {
objectMap.put("status", true); objectMap.put("status", true);
} else { } else {

6
jshERP-boot/src/main/java/com/jsh/erp/service/MaterialCategoryService.java
View File

@@ -204,9 +204,13 @@ public class MaterialCategoryService {
return result; return result;
} }
public int checkIsNameExist(Long id, String name)throws Exception { public int checkIsNameExist(Long id, String name, Long parentId)throws Exception {
MaterialCategoryExample example = new MaterialCategoryExample(); MaterialCategoryExample example = new MaterialCategoryExample();
if(parentId!=null) {
example.createCriteria().andIdNotEqualTo(id).andNameEqualTo(name).andParentIdEqualTo(parentId).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
} else {
example.createCriteria().andIdNotEqualTo(id).andNameEqualTo(name).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.createCriteria().andIdNotEqualTo(id).andNameEqualTo(name).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
}
List<MaterialCategory> list=null; List<MaterialCategory> list=null;
try{ try{
list= materialCategoryMapper.selectByExample(example); list= materialCategoryMapper.selectByExample(example);

1
jshERP-web/src/views/material/MaterialCategoryList.vue
View File

@@ -375,6 +375,7 @@ export default {
validateName(rule, value, callback){ validateName(rule, value, callback){
let params = { let params = {
name: value, name: value,
parentId: this.form.getFieldValue('parentId'),
id: this.model.id?this.model.id:0 id: this.model.id?this.model.id:0
}; };
checkMaterialCategory(params).then((res)=>{ checkMaterialCategory(params).then((res)=>{

1
jshERP-web/src/views/material/modules/MaterialCategoryModal.vue
View File

@@ -154,6 +154,7 @@
validateName(rule, value, callback){ validateName(rule, value, callback){
let params = { let params = {
name: value, name: value,
parentId: this.form.getFieldValue('parentId'),
id: this.model.id?this.model.id:0 id: this.model.id?this.model.id:0
}; };
checkMaterialCategory(params).then((res)=>{ checkMaterialCategory(params).then((res)=>{