出入库明细单据类型

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<BasicBussinessTypeResponse> 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<BasicBussinessTypeResponse> pageInfo;
+        pageInfo = new PageInfo<>(bussinessTypeResponses);
+        PageSimpleResponse<BasicBussinessTypeResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(bussinessTypeResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/localBusType/filterJoinByUser")
     public BaseResponse filterJoinByUser(FilterBussinessTypeRequest bussinessTypeFilterRequest,

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;
+
 }

src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java

@@ -53,4 +53,5 @@ public class FilterOrderDetailResultRequest extends ListPageRequest {
     private List<IoOrderDetailResultResponse> list;
     private String action;
     private String mainAction;
+    private Integer inoutPrintStatus;
 }

src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml

@@ -47,6 +47,9 @@
             <if test="nameCode != null and nameCode != ''">
                 AND a2.nameCode = #{nameCode}
             </if>
+            <if test="inoutPrintStatus != null">
+                AND a2.inoutPrintStatus = #{inoutPrintStatus}
+            </if>
             <if test="action != null and action != ''">
                 AND a1.action = #{action}
             </if>