diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index 33143f1a..8b063898 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -137,7 +137,7 @@ public class BasicBussinessTypeController { * @param files * @return */ - @PostMapping("/udiwms/busstiness/file/upload") + @PostMapping("/udiwms/bussinessType/file/upload") public BaseResponse uploadProducts(@RequestParam("file") List files) { for (int i = 0; i < files.size(); i++) { MultipartFile file = files.get(i); @@ -166,7 +166,7 @@ public class BasicBussinessTypeController { * * @param res */ - @PostMapping("udiwms/busstiness/file/export") + @PostMapping("udiwms/bussinessType/file/export") public void exportXml(HttpServletResponse res) { FilterBussinessTypeRequest bussinessTypeFilterRequest = new FilterBussinessTypeRequest(); bussinessTypeFilterRequest.setEnable(true); @@ -193,14 +193,14 @@ public class BasicBussinessTypeController { * * @return */ - @GetMapping("/warehouse/bussinessType/candidateBussinessType") - public BaseResponse candidateBussinessType(CandidateRequest cndidateRequest) { - if (StrUtil.isBlank(cndidateRequest.getMainAction())) { + @GetMapping("/udiwms/bussinessType/candidateBusType") + public BaseResponse candidateBussinessType(CandidateRequest candidateRequest) { + if (StrUtil.isBlank(candidateRequest.getMainAction())) { return ResultVOUtils.error(ResultEnum.DATA_ERROR); } - List bussinessTypeEntities = basicBussinessTypeService.candidateBussinessType(cndidateRequest.getMainAction()); - if (StrUtil.isNotBlank(cndidateRequest.getCurAction())) { - BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(cndidateRequest.getCurAction()); + List bussinessTypeEntities = basicBussinessTypeService.candidateBussinessType(candidateRequest.getMainAction()); + if (StrUtil.isNotBlank(candidateRequest.getCurAction())) { + BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(candidateRequest.getCurAction()); bussinessTypeEntities.add(bussinessTypeEntity); } //查询补单单据类型 diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java index 61300f01..a1d36e1d 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java @@ -36,7 +36,7 @@ public class BasicBussinessTypeEntity { private String name; /** - * 是否启用 + * 是否启用, 0:未启用 1:启用 */ private Boolean enable; diff --git a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java index 968583bc..f7628f8d 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java @@ -12,7 +12,7 @@ import java.util.List; public class FilterBussinessTypeRequest extends ListPageRequest { /** - * 是否启用 + * 是否启用, 0:未启用 1:启用 */ private Boolean enable; diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java index c945afd7..3815de8c 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java @@ -8,16 +8,30 @@ import lombok.Data; @Data public class BasicBussinessTypeResponse { + /** + * 单据类型ID + */ private Integer id; + + /** + * 单据类型编码 + */ private String action; + + /** + * 单据类型名称 + */ private String name; + + /** + * 是否启用 + */ private Boolean enable; private String remark; private String mainAction; private String thirdSysFk; private String thirdId; private String thirdName; - private Boolean enabled; /** * 是否根据业务单据类型校验