修改bug

master
wangwei 2 years ago
parent 51dfd9519a
commit 4821fb1ea0

@ -248,7 +248,7 @@ public class InvWarehouseController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spms/sub/inv/warehouse/edit") @PostMapping("/spms/sub/inv/warehouse/edit")
public BaseResponse edit(@RequestBody @Valid InvWarehouseEntity invWarehouseEntity, public BaseResponse edit(@RequestBody @Valid InvWarehouseEntity invWarehouseEntity,
BindingResult bindingResult) { BindingResult bindingResult,FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -256,17 +256,33 @@ public class InvWarehouseController extends BaseController {
if (invWarehouseEntity.getId() == null) { if (invWarehouseEntity.getId() == null) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
} }
boolean b = invWarehouseService.updateInvSubWarehouse(invWarehouseEntity); //判断仓库是否存在
ArrayList<InvWarehouseEntity> list = new ArrayList<>();
filterInvSubWarehouseRequest.setParentId(invWarehouseEntity.getParentId());
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest);
for (InvWarehouseEntity warehouseEntity : invWarehouseEntities) {
if(invWarehouseEntity.name.equals(warehouseEntity.getName()) && invWarehouseEntity.getParentCode().equals(warehouseEntity.getParentCode())){
list.add(warehouseEntity);
}
}
if(list.size()==0){
boolean b = invWarehouseService.updateInvSubWarehouse(invWarehouseEntity);
DeptEntity pEntity = deptService.selectByCode(invWarehouseEntity.getParentId()); DeptEntity pEntity = deptService.selectByCode(invWarehouseEntity.getParentId());
pEntity.setUpdateTime(new Date()); pEntity.setUpdateTime(new Date());
deptService.updateInvWarehouse(pEntity); deptService.updateInvWarehouse(pEntity);
if (!b) { if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK); return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
return ResultVOUtils.success("修改成功!");
}else{
return ResultVOUtils.error(ResultEnum.DATA_REPEAT);
} }
return ResultVOUtils.success("修改成功!");
} }
@AuthRuleAnnotation("") @AuthRuleAnnotation("")

Loading…
Cancel
Save