diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index f52e2fdf..26afe92f 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -443,14 +443,12 @@ public class InvWarehouseController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/warehouse/invRelBusType/manageList") public BaseResponse getManageList(@RequestBody @Valid FilterInvLinkDataRequest filterInvLinkDataRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - - InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(filterInvLinkDataRequest.getCode()); - //1.获取所有单据类型 FilterBussinessTypeRequest filterBussinessTypeRequest = new FilterBussinessTypeRequest(); filterBussinessTypeRequest.setEnable(true); @@ -461,9 +459,7 @@ public class InvWarehouseController extends BaseController { if (StrUtil.isEmpty(filterInvLinkDataRequest.getCode())) return ResultVOUtils.error(500, "仓库编码不能为空!"); List warehouseBussniessTypeList = warehouseBussinessTypeService.getWarehouseBussniessTypeList(filterInvLinkDataRequest); - basicBussinessTypeEntities.forEach(basicBussinessTypeEntity -> - { for (WarehouseBussinessTypeEntity warehouseBussinessTypeEntity : warehouseBussniessTypeList) { if (warehouseBussinessTypeEntity.getAction().equals(basicBussinessTypeEntity.getAction())) { diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index 771ce485..096ebe09 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -260,11 +260,11 @@ public class IoOrderResponse { public String getFromName() { - - if (StrUtil.isNotEmpty(fromInvName)) - return fromInvName; if (StrUtil.isNotEmpty(fromCorpName)) return fromCorpName; + if (StrUtil.isNotEmpty(fromInvName)) + return fromInvName; + return fromName; } }