rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
@@ -73,9 +73,6 @@ if (Objects.isNull(matnrGroup.getCode())) { throw new CoolException("分组编码不能为空！！"); } if (Objects.isNull(matnrGroup.getParCode())) { throw new CoolException("上级编码不能为空！!"); } matnrGroup.setCreateBy(getLoginUserId()); matnrGroup.setUpdateBy(getLoginUserId());
@@ -10,11 +10,13 @@ import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.KeyValVo; import com.vincent.rsf.server.common.domain.PageParam; import com.vincent.rsf.server.manager.controller.params.WarehouseAreaParam; import com.vincent.rsf.server.manager.entity.Loc; import com.vincent.rsf.server.manager.entity.WarehouseAreas; import com.vincent.rsf.server.manager.service.LocService; import com.vincent.rsf.server.manager.service.WarehouseAreasService; import com.vincent.rsf.server.system.controller.BaseController; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -89,6 +91,24 @@ } @PreAuthorize("hasAuthority('manager:warehouseAreas:update')") @ApiOperation("库区批量修改") @PostMapping("/warehouseAreas/batch/update") public R batchUpdate(@RequestBody WarehouseAreaParam params) { if (Objects.isNull(params)) { return R.error("参数不能为空！！"); } if (Objects.isNull(params.getIds()) && params.getIds().isEmpty()) { return R.error("库区ID不能为空！！"); } if (warehouseAreasService.batchUpdate(params, getLoginUserId())) { return R.ok("修改成功！！"); } else { return R.error("修改失败！！"); } } @PreAuthorize("hasAuthority('manager:warehouseAreas:update')") @OperationLog("Update 库区信息表") @PostMapping("/warehouseAreas/update") public R update(@RequestBody WarehouseAreas warehouseAreas) { rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/WarehouseAreaParam.java
New file @@ -0,0 +1,22 @@ package com.vincent.rsf.server.manager.controller.params; import com.vincent.rsf.server.manager.entity.WarehouseAreas; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.util.List; @Data @ApiModel(value = "WarehouseAreaParam", description = "库区请求参数") public class WarehouseAreaParam implements Serializable { @ApiModelProperty("库区ID") private List<Long> ids; @ApiModelProperty("修改库区信息") private WarehouseAreas warehouseAreas; } rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
@@ -4,6 +4,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.vincent.rsf.server.manager.service.CompanysService; import com.vincent.rsf.server.manager.service.ShipperService; import com.vincent.rsf.server.manager.service.WarehouseService; @@ -122,6 +123,7 @@ * 添加时间 */ @ApiModelProperty(value= "添加时间") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date createTime; @@ -135,6 +137,7 @@ * 修改时间 */ @ApiModelProperty(value= "修改时间") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date updateTime;
@@ -1,8 +1,10 @@ package com.vincent.rsf.server.manager.service; import com.baomidou.mybatisplus.extension.service.IService; import com.vincent.rsf.server.manager.controller.params.WarehouseAreaParam; import com.vincent.rsf.server.manager.entity.WarehouseAreas; public interface WarehouseAreasService extends IService<WarehouseAreas> { boolean batchUpdate(WarehouseAreaParam params, Long loginUserId); } rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WarehouseAreasServiceImpl.java
@@ -1,12 +1,49 @@ package com.vincent.rsf.server.manager.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.server.manager.controller.params.WarehouseAreaParam; import com.vincent.rsf.server.manager.mapper.WarehouseAreasMapper; import com.vincent.rsf.server.manager.entity.WarehouseAreas; import com.vincent.rsf.server.manager.service.WarehouseAreasService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; import java.util.Objects; @Service("warehouseAreasService") public class WarehouseAreasServiceImpl extends ServiceImpl<WarehouseAreasMapper, WarehouseAreas> implements WarehouseAreasService { /** * 批量修改库区 * * @param params * @param loginUserId * @return */ @Override public boolean batchUpdate(WarehouseAreaParam params, Long loginUserId) { List<Long> ids = params.getIds(); if (ids.isEmpty()) { throw new CoolException("库区不能为空！！"); } List<WarehouseAreas> warehouseAreas = this.list(new LambdaQueryWrapper<WarehouseAreas>().in(WarehouseAreas::getId, ids)); if (warehouseAreas.isEmpty()) { throw new CoolException("所选库区不存在！！"); } WarehouseAreas areas = params.getWarehouseAreas(); if (!this.update(new LambdaUpdateWrapper<WarehouseAreas>().in(WarehouseAreas::getId, ids) .set(!Objects.isNull(areas.getName()), WarehouseAreas::getName, areas.getName()) .set(!Objects.isNull(areas.getCode()), WarehouseAreas::getCode, areas.getCode()) .set(!Objects.isNull(areas.getFlagMix()), WarehouseAreas::getFlagMix, areas.getFlagMix()) .set(!Objects.isNull(areas.getFlagMinus()), WarehouseAreas::getFlagMinus, areas.getFlagMinus()) .set(WarehouseAreas::getUpdateBy, loginUserId) .set(!Objects.isNull(areas.getWarehouseId()), WarehouseAreas::getWarehouseId, areas.getWarehouseId()) )) { throw new CoolException("批量修改失败"); } return true; } }
