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 7bd7886b6..b488215d6 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -1,6 +1,8 @@ package com.glxp.api.controller.basic; import cn.hutool.core.bean.BeanUtil; +import com.glxp.api.constant.Constant; +import com.glxp.api.service.auth.InvWarehouseService; import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; @@ -182,6 +184,38 @@ public class BasicBussinessTypeController extends BaseController { } + @Resource + InvWarehouseService invWarehouseService; + + /** + * 获取出入库明细单据类型 + * + * @param bussinessTypeRequest + * @param bindingResult + * @return + */ + @AuthRuleAnnotation("") + @GetMapping("/udiwms/orderDetail/busTypes") + public BaseResponse orderDetailBusTypes(FilterBussinessTypeRequest bussinessTypeRequest, + BindingResult bindingResult) { + + String detailType = bussinessTypeRequest.getDetailType(); + List bussinessTypeResponses = new ArrayList<>(); + if (detailType.equals("norDetail")) { + } else if (detailType.equals("preDetail")) { + bussinessTypeRequest.setCode(Constant.INV_PRE_CODE); + } else if (detailType.equals("preInDetail")) { + bussinessTypeRequest.setCode(Constant.INV_PRE_IN_CODE); + } + bussinessTypeResponses = basicBussinessTypeService.filterJoinByInv(bussinessTypeRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(bussinessTypeResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(bussinessTypeResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + @AuthRuleAnnotation("") @GetMapping("/udiwms/localBusType/filterJoinByUser") public BaseResponse filterJoinByUser(FilterBussinessTypeRequest bussinessTypeFilterRequest, 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 81a80ea3d..1a7f06d63 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java @@ -125,4 +125,10 @@ public class FilterBussinessTypeRequest extends ListPageRequest { private String deptCode; private Integer inPreInBack; + + /** + * 出入库明细类型 + */ + private String detailType; + } diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java index 24e5b8981..b9457926c 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java @@ -53,4 +53,5 @@ public class FilterOrderDetailResultRequest extends ListPageRequest { private List list; private String action; private String mainAction; + private Integer inoutPrintStatus; } diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml index 5b86ba39b..856d9cb14 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml @@ -47,6 +47,9 @@ AND a2.nameCode = #{nameCode} + + AND a2.inoutPrintStatus = #{inoutPrintStatus} + AND a1.action = #{action}