From 4b6ac18da9bd4129bcf127d00f6de21176c98cd7 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 2 Aug 2024 14:18:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B8=A6=E7=A5=A8=E5=87=BA=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/IoOrderDetailResultController.java  |  1 -
 .../inout/FilterOrderDetailResultRequest.java |  1 -
 .../inout/IoOrderDetailResultResponse.java    |  2 +-
 .../mapper/inout/IoOrderDetailResultDao.xml   | 36 ++++++++-----------
 4 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
index 8c2b669ff..89f55776c 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
@@ -373,7 +373,6 @@ public class IoOrderDetailResultController extends BaseController {
             ioOrderDetailResultData.put("isStack", ioOrderDetailResultResponse.getIsStack() == null ? ' ' : ioOrderDetailResultResponse.getIsStack());
             ioOrderDetailResultData.put("groupBuy", ioOrderDetailResultResponse.getGroupBuy() == null ? ' ' : ioOrderDetailResultResponse.getGroupBuy());
             ioOrderDetailResultData.put("invoiceCodes", ioOrderDetailResultResponse.getInvoiceCodes() == null ? ' ' : ioOrderDetailResultResponse.getInvoiceCodes());
-            ioOrderDetailResultData.put("fromOutName", ioOrderDetailResultResponse.getFromOutName() == null ? ' ' : ioOrderDetailResultResponse.getFromOutName());
             if (thrProductsEntity != null) {
                 ioOrderDetailResultData.put("cplb", thrProductsEntity.getCplb() == null ? ' ' : thrProductsEntity.getCplb());
             }
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 34185e09e..502761d1d 100644
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
@@ -65,7 +65,6 @@ public class FilterOrderDetailResultRequest extends ListPageRequest {
     private String confirmEndTime;   //发票确认结束日期
     private String corpName;//供应商名字
 
-    private String fromOutName;//出库科室
 
     private Boolean groupBuy;          //是否集采产品
 }
diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
index 47b0d886f..83c49f26a 100644
--- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
@@ -221,7 +221,7 @@ public class IoOrderDetailResultResponse {
 
     private Boolean isStack;
     private Boolean groupBuy;
-    private String fromOutName;
+
     public String getFromName() {
         if (StrUtil.isNotEmpty(fromCorpName))
             return fromCorpName;
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
index 3e058416c..3afd30e08 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
@@ -25,25 +25,22 @@
 
     <select id="filterOrderList" resultType="com.glxp.api.res.inout.IoOrderDetailResultResponse">
         SELECT a2.*,
-               aw.name                                                                  as fromInvName,
-              aw2.name                                                                  as fromOutName,
-               a1.mainAction,
-               a1.confirmTime,
-               a1.auditTime,
-               bu.isStack,
-               bu.groupBuy,
-               GROUP_CONCAT(ioi.invoiceEncode ORDER BY ioi.invoiceEncode SEPARATOR ',') AS invoiceCodes,
-               b1.NAME                                                                  AS fromCorpName,
-               basic_bussiness_type.name                                                   billTypeName
+                aw.name                                                                  as fromInvName,
+                a1.mainAction,
+                a1.confirmTime,
+                a1.auditTime,
+                bu.isStack,
+                bu.groupBuy,
+                GROUP_CONCAT(ioi.invoiceEncode ORDER BY ioi.invoiceEncode SEPARATOR ',') AS invoiceCodes,
+                b1.NAME                                                                  AS fromCorpName,
+                basic_bussiness_type.name                                                   billTypeName
         FROM io_order_detail_result a2
-                     LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk
-                     LEFT JOIN io_order a3 ON a3.ullageSupNo = a2.orderIdFk
-                     LEFT JOIN basic_corp b1 ON b1.erpId = a1.fromCorp
-                     LEFT JOIN basic_udirel bu ON a2.bindRlFk = bu.id
-                     left join basic_bussiness_type on a1.action = basic_bussiness_type.action
-                     LEFT JOIN io_order_invoice ioi ON a1.billNo = ioi.orderIdFk
-                     left join auth_warehouse aw on aw.code = a1.fromInvCode
-                     left join auth_warehouse aw2 on aw2.code = a3.fromInvCode
+        LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk
+        LEFT JOIN basic_corp b1 ON b1.erpId = a1.fromCorp
+        LEFT JOIN basic_udirel bu ON a2.bindRlFk = bu.id
+        left join basic_bussiness_type on a1.action = basic_bussiness_type.action
+        LEFT JOIN io_order_invoice ioi ON a1.billNo = ioi.orderIdFk
+        left join auth_warehouse aw on aw.code = a1.fromInvCode
         <where>
             a1.status = 7
             <if test="orderIdFk != null and orderIdFk != ''">
@@ -79,9 +76,6 @@
             <if test="spec != null and spec != ''">
                 AND a2.spec like concat('%', #{spec}, '%')
             </if>
-            <if test="fromOutName != null and fromOutName != ''">
-                AND aw2.name like concat('%', #{fromOutName}, '%')
-            </if>
             <if test="fromCorp != null and fromCorp != ''">
                 AND a1.fromCorp = #{fromCorp}
             </if>