From 399d6c38819678c36282eb8c376416717c5a7f9d Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 24 Nov 2023 15:03:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/BasicBussinessTypeController.java   | 34 +++++++++++++++++++
 .../req/basic/FilterBussinessTypeRequest.java |  6 ++++
 .../inout/FilterOrderDetailResultRequest.java |  1 +
 .../mapper/inout/IoOrderDetailResultDao.xml   |  3 ++
 4 files changed, 44 insertions(+)

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<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,
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<IoOrderDetailResultResponse> 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 @@
             <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>