rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
@@ -98,7 +98,6 @@ @Transactional(rollbackFor = Exception.class) public R update(@RequestBody Loc loc) { loc.setUpdateBy(getLoginUserId()); String join = StringUtils.join(loc.getTypeIds(), ","); loc.setType(join); @@ -166,8 +165,8 @@ if (Objects.isNull(locs)) { throw new CoolException("参数不能为空！！"); } locs.setCreateBy(getLoginUser().getId()); locs.setUpdateBy(getLoginUser().getId()); locs.setCreateBy(getLoginUserId()); locs.setUpdateBy(getLoginUserId()); return locService.batchBindLocs(locs); }
@@ -13,6 +13,7 @@ import com.vincent.rsf.server.common.domain.KeyValVo; import com.vincent.rsf.server.common.domain.PageParam; import com.vincent.rsf.server.manager.entity.MatnrGroup; import com.vincent.rsf.server.manager.entity.Warehouse; import com.vincent.rsf.server.manager.service.MatnrGroupService; import com.vincent.rsf.server.system.controller.BaseController; import io.swagger.annotations.Api; @@ -92,7 +93,20 @@ @PostMapping("/matnrGroup/update") public R update(@RequestBody MatnrGroup matnrGroup) { matnrGroup.setUpdateBy(getLoginUserId()); matnrGroup.setUpdateTime(new Date()); MatnrGroup matGroup = matnrGroupService.getById(matnrGroup.getId()); if (!matnrGroup.getName().equals(matGroup.getName())) { List<MatnrGroup> areasList = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getName, matnrGroup.getName())); if (!areasList.isEmpty()) { throw new CoolException("仓库名已存在！！"); } } if (!matnrGroup.getCode().equals(matGroup.getCode())) { List<MatnrGroup> areasList = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getCode, matnrGroup.getCode())); if (!areasList.isEmpty()) { throw new CoolException("仓库编码已存在！！"); } } if (!matnrGroupService.updateById(matnrGroup)) { return R.error("Update Fail"); } rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java
@@ -93,7 +93,23 @@ @PostMapping("/warehouseAreas/update") public R update(@RequestBody WarehouseAreas warehouseAreas) { warehouseAreas.setUpdateBy(getLoginUserId()); warehouseAreas.setUpdateTime(new Date()); WarehouseAreas areas = warehouseAreasService.getById(warehouseAreas.getWarehouseId()); if (Objects.isNull(areas)) { throw new CoolException("数据错误：仓库库区不存在！！"); } if (!warehouseAreas.getName().equals(areas.getName())) { List<WarehouseAreas> areasList = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getName, areas.getName())); if (!areasList.isEmpty()) { throw new CoolException("仓库名已存在！！"); } } if (!warehouseAreas.getCode().equals(areas.getCode())) { List<WarehouseAreas> areasList = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getCode, areas.getCode())); if (!areasList.isEmpty()) { throw new CoolException("仓库编码已存在！！"); } } if (!warehouseAreasService.updateById(warehouseAreas)) { return R.error("Update Fail"); } rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
@@ -59,9 +59,7 @@ @PostMapping("/warehouseAreasItem/save") public R save(@RequestBody WarehouseAreasItem warehouseAreasItem) { warehouseAreasItem.setCreateBy(getLoginUserId()); warehouseAreasItem.setCreateTime(new Date()); warehouseAreasItem.setUpdateBy(getLoginUserId()); warehouseAreasItem.setUpdateTime(new Date()); if (!warehouseAreasItemService.save(warehouseAreasItem)) { return R.error("Save Fail"); } rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
@@ -101,14 +101,21 @@ } warehouse.setUpdateBy(getLoginUserId()); List<Warehouse> warehouses = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getName, warehouse.getName())); if (!warehouses.isEmpty()) { throw new CoolException("仓库名称已存在！！"); Warehouse warehouse1 = warehouseService.getById(warehouse.getId()); if (!warehouse.getName().equals(warehouse1.getName())) { List<Warehouse> areasList = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getName, warehouse1.getName())); if (!areasList.isEmpty()) { throw new CoolException("仓库名已存在！！"); } } if (!warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, warehouse.getCode())).isEmpty()) { throw new CoolException("仓库编码已存在！！"); if (!warehouse.getCode().equals(warehouse1.getCode())) { List<Warehouse> areasList = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, warehouse1.getCode())); if (!areasList.isEmpty()) { throw new CoolException("仓库编码已存在！！"); } } if (!warehouseService.updateById(warehouse)) { return R.error("Update Fail"); } rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocMapper.java
@@ -3,10 +3,13 @@ import com.vincent.rsf.server.manager.entity.Loc; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Update; import org.springframework.stereotype.Repository; @Mapper @Repository public interface LocMapper extends BaseMapper<Loc> { @Update("truncate table man_loc") boolean deleteAll(); } rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
@@ -76,9 +76,8 @@ @Transactional(rollbackFor = Exception.class) public R initLocs(LocMastInitParam param) { //清空表 if (this.baseMapper.delete(new LambdaUpdateWrapper<>()) < 0) { throw new CoolException("数据库初始化失败：老数据删除失败！！"); } this.baseMapper.deleteAll(); WarehouseAreas warehouseAreas = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>() .eq(WarehouseAreas::getWarehouseId, param.getWarehouseId()) .eq(WarehouseAreas::getId, param.getAreaId())); rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrGroupServiceImpl.java
@@ -1,12 +1,17 @@ package com.vincent.rsf.server.manager.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.server.manager.mapper.MatnrGroupMapper; import com.vincent.rsf.server.manager.entity.MatnrGroup; import com.vincent.rsf.server.manager.service.MatnrGroupService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.Objects; @Service("matnrGroupService") public class MatnrGroupServiceImpl extends ServiceImpl<MatnrGroupMapper, MatnrGroup> implements MatnrGroupService { }
