rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
@@ -117,7 +117,9 @@ } } } } else { String uuid16 = CommonUtil.randomUUID16(); saveFields(params, uuid16); } } } rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
@@ -47,7 +47,7 @@ public R page(@RequestBody Map<String, Object> map) { BaseParam baseParam = buildParam(map, BaseParam.class); PageParam<Matnr, BaseParam> pageParam = new PageParam<>(baseParam, Matnr.class); return R.ok().add( matnrService.getMatnrPage(pageParam)); return R.ok().add(matnrService.getMatnrPage(pageParam)); } @PreAuthorize("hasAuthority('manager:matnr:list')") @@ -76,7 +76,7 @@ if (Objects.isNull(matnr)) { throw new CoolException("参数不能为空!!"); } if (Objects.isNull(matnr.get("matnr"))) { if (Objects.isNull(matnr.get("name"))) { throw new CoolException("名称不能为空!!"); } if (Objects.isNull(matnr.get("groupId"))) { @@ -124,9 +124,10 @@ if (!matnrService.updateById(matnr)) { return R.error("Update Fail"); } if (!Objects.isNull(params.get("fieldsIndex"))) { if (!FieldsUtils.getFieldsSta().isEmpty()) { FieldsUtils.updateFieldsValue(params); } return R.ok("Update Success").add(matnr); } rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
@@ -73,6 +73,14 @@ if (Objects.isNull(warehouse.getName())) { throw new CoolException("仓库名称不能为空!!"); } List<Warehouse> warehouses = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getName, warehouse.getName())); if (!warehouses.isEmpty()) { throw new CoolException("仓库名称已存在!!"); } if (!warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, warehouse.getCode())).isEmpty()) { throw new CoolException("仓库编码已存在!!"); } warehouse.setCreateBy(getLoginUserId()); warehouse.setUpdateBy(getLoginUserId()); if (!warehouseService.save(warehouse)) { @@ -92,6 +100,15 @@ throw new CoolException("仓库名称不能为空!!"); } warehouse.setUpdateBy(getLoginUserId()); List<Warehouse> warehouses = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getName, warehouse.getName())); if (!warehouses.isEmpty()) { throw new CoolException("仓库名称已存在!!"); } if (!warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, warehouse.getCode())).isEmpty()) { throw new CoolException("仓库编码已存在!!"); } if (!warehouseService.updateById(warehouse)) { return R.error("Update Fail"); } rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
@@ -280,7 +280,7 @@ // null // 备注 // ); public String getTypeId$(){ public String getTypeIds$(){ if (null == this.type){ return null; } String[] split = this.type.split(","); List<String> asList = Arrays.asList(split);