rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
@@ -118,23 +118,26 @@ String index = fieldsIndex.toString(); FieldsItemService fieldsItemService = SpringUtils.getBean(FieldsItemService.class); for (Fields field : fields) { if (!Objects.isNull(params.get(field.getFields()))) { FieldsItem indexItem = fieldsItemService.getOne(new LambdaQueryWrapper<FieldsItem>() .eq(FieldsItem::getUuid, index) .eq(FieldsItem::getFieldsId, field.getId())); //如果子表为空，执行插入操作，否则就执行修改操作 if (Objects.isNull(indexItem)) { FieldsItem item = new FieldsItem(); item.setUuid(index) .setFieldsId(field.getId()) .setValue(params.get(field.getFields()).toString()); if (fieldsItemService.save(item)) { throw new CoolException("扩展字段修改失败！！"); } } else { indexItem.setValue(params.get(field.getFields()).toString()); if (fieldsItemService.updateById(indexItem)) { throw new CoolException("扩展字段修改失败！！"); Map<String, String> extendFields = (Map<String, String>) params.get("extendFields"); if (!Objects.isNull(extendFields)) { if (!Objects.isNull(extendFields.get(field.getFields()))) { FieldsItem indexItem = fieldsItemService.getOne(new LambdaQueryWrapper<FieldsItem>() .eq(FieldsItem::getUuid, index) .eq(FieldsItem::getFieldsId, field.getId())); //如果子表为空，执行插入操作，否则就执行修改操作 if (Objects.isNull(indexItem)) { FieldsItem item = new FieldsItem(); item.setUuid(index) .setFieldsId(field.getId()) .setValue(extendFields.get(field.getFields()).toString()); if (!fieldsItemService.save(item)) { throw new CoolException("扩展字段修改失败！！"); } } else { indexItem.setValue(extendFields.get(field.getFields()).toString()); if (!fieldsItemService.updateById(indexItem)) { throw new CoolException("扩展字段修改失败！！"); } } } } rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java
@@ -59,6 +59,9 @@ if (Objects.isNull(locType.getName())) { throw new CoolException("库位类型不能为空！！"); } if (Objects.isNull(locType.getCode())) { throw new CoolException("库位编码不为空！！"); } if (Objects.isNull(locType.getRegex())) { throw new CoolException("库位规则表达式不能为空！！"); } rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
@@ -62,11 +62,10 @@ return R.ok().add(matnrService.listByIds(Arrays.asList(ids))); } @PreAuthorize("hasAuthority('manager:matnr:list')") @GetMapping("/matnr/{id}") public R get(@PathVariable("id") Long id) { return R.ok().add(matnrService.getById(id)); return R.ok(matnrService.selectMatnrById(id)); } @PreAuthorize("hasAuthority('manager:matnr:save')") @@ -105,6 +104,8 @@ return R.error("Update Fail"); } if (!FieldsUtils.getFieldsSta().isEmpty()) { Matnr matnr1 = matnrService.getById(matnr.getId()); params.put("fieldsIndex", matnr1.getFieldsIndex()); FieldsUtils.updateFieldsValue(params); }
@@ -28,6 +28,7 @@ @Autowired private WarehouseAreasService warehouseAreasService; @Autowired private LocService locService; @PreAuthorize("hasAuthority('manager:warehouseAreas:list')") @@ -60,6 +61,25 @@ @OperationLog("Create 库区信息表") @PostMapping("/warehouseAreas/save") public R save(@RequestBody WarehouseAreas warehouseAreas) { if (Objects.isNull(warehouseAreas)) { throw new CoolException("参数不能为空！！"); } if (Objects.isNull(warehouseAreas.getName())) { throw new CoolException("库区名称不能为空！！"); } if (Objects.isNull(warehouseAreas.getCode())) { throw new CoolException("库区编码不能为空！！"); } List<WarehouseAreas> list = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getName, warehouseAreas.getName())); if (!list.isEmpty()) { throw new CoolException("库区名称已存在！！"); } if (!warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getCode, warehouseAreas.getCode())).isEmpty()) { throw new CoolException("库区编码已存在！！"); } warehouseAreas.setCreateBy(getLoginUserId()); warehouseAreas.setUpdateBy(getLoginUserId()); if (!warehouseAreasService.save(warehouseAreas)) { rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocType.java
@@ -35,6 +35,12 @@ private Long id; /** * 编码 */ @ApiModelProperty("编码") private String code; /** * 标识 */ @ApiModelProperty(value= "标识") rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
@@ -388,7 +388,7 @@ } } public String getIsLabelMange$(){ public String getFlagLabelMange$(){ if (null == this.flagLabelMange){ return null; } switch (this.flagLabelMange){ case 0: rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java
@@ -16,5 +16,7 @@ R saveMatnrs(Map<String, Object> matnr); IPage<Map<String, Object>> getMatnrPage(PageParam<Matnr, BaseParam> pageParam); PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam); Matnr selectMatnrById(Long id); } rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
@@ -54,6 +54,8 @@ boolean update = this.update(new LambdaUpdateWrapper<Loc>() .in(Loc::getId, locs.getId()) .eq(Loc::getStatus, 1) .set(!Objects.isNull(loc.getAreaId()), Loc::getAreaId, loc.getAreaId()) .set(!Objects.isNull(loc.getWarehouseId()), Loc::getWarehouseId, loc.getWarehouseId()) .set(!Objects.isNull(loc.getUseStatus()), Loc::getUseStatus, loc.getUseStatus()) .set(!Objects.isNull(loc.getType()), Loc::getType, loc.getType()) .set(!Objects.isNull(loc.getLength()), Loc::getLength, loc.getLength()) rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
@@ -99,7 +99,7 @@ } @Override public IPage<Map<String, Object>> getMatnrPage(PageParam<Matnr, BaseParam> pageParam) { public PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam) { IPage<Map<String, Object>> reulst = this.baseMapper.selectMatnrs(pageParam, pageParam.buildWrapper(true)); /**获取物料分页信息 */ List<Map<String, Object>> mapList = reulst.getRecords(); @@ -110,17 +110,30 @@ } }); } List<Matnr> matnrs = JSONArray.parseArray(JSON.toJSONString(mapList), Matnr.class); // PageParam<Matnr, BaseParam> page = this.page(pageParam, pageParam.buildWrapper(true)); // List<Matnr> records = page.getRecords(); // for (Matnr record : records) { // if (!Objects.isNull(record.getFieldsIndex())) { // Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex()); // record.setExtendFields(fields); // } // } // page.setRecords(records); return reulst; PageParam<Matnr, BaseParam> page = this.page(pageParam, pageParam.buildWrapper(true)); List<Matnr> records = page.getRecords(); for (Matnr record : records) { if (!Objects.isNull(record.getFieldsIndex())) { Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex()); record.setExtendFields(fields); } } page.setRecords(records); return page; } @Override public Matnr selectMatnrById(Long id) { Matnr matnr = this.baseMapper.selectById(id); if (Objects.isNull(matnr)) { throw new CoolException("当前物料不存在！！"); } if (!Objects.isNull(matnr.getFieldsIndex())) { Map<String, String> fields = FieldsUtils.getFields(matnr.getFieldsIndex()); matnr.setExtendFields(fields); } return matnr; } /** @@ -134,8 +147,6 @@ Matnr matnr1 = JSONObject.parseObject(JSONObject.toJSONString(matnr), Matnr.class); if (Objects.isNull(matnr1.getCode())) { String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_MATNR_CODE, null); System.out.println("=========>"); System.out.println(ruleCode); matnr1.setCode(ruleCode); } /** @@ -146,9 +157,9 @@ FieldsUtils.saveFields(matnr, uuid16); matnr1.setFieldsIndex(uuid16); } if (!this.save(matnr1)) { if (!this.saveOrUpdate(matnr1)) { return R.error("Save Fail"); } return R.ok("保存成功!!"); return R.ok(matnr1); } }
