From 8fdd2a487db9e8c2f945be2bff7559323dce6a90 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 2 Aug 2024 11:16:14 +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      |  4 ++++
 .../req/inout/FilterOrderDetailResultRequest.java |  4 ++++
 .../res/inout/IoOrderDetailResultResponse.java    |  5 ++++-
 .../mapper/inout/IoOrderDetailResultDao.xml       | 15 +++++++++++++--
 4 files changed, 25 insertions(+), 3 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 cab5c45e6..8c2b669ff 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
@@ -370,6 +370,10 @@ public class IoOrderDetailResultController extends BaseController {
             ioOrderDetailResultData.put("confirmEndTime", filterOrderDetailResultRequest.getConfirmEndTime() == null ? ' ' : filterOrderDetailResultRequest.getConfirmEndTime());
             ioOrderDetailResultData.put("employeeName", filterOrderDetailResultRequest.getEmployeeName() == null ? ' ' : filterOrderDetailResultRequest.getEmployeeName());
             ioOrderDetailResultData.put("fromInvName", ioOrderDetailResultResponse.getFromInvName() == null ? ' ' : ioOrderDetailResultResponse.getFromInvName());
+            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 3d3f4d110..34185e09e 100644
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
@@ -64,4 +64,8 @@ public class FilterOrderDetailResultRequest extends ListPageRequest {
     private String confirmStarTime;  //发票确认起始日期
     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 4d3f8e2c6..47b0d886f 100644
--- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
@@ -189,6 +189,7 @@ public class IoOrderDetailResultResponse {
     private String mainAction;
     @ExcelProperty(value = "出入库时间", index = 12)
     private Date auditTime;
+    private Date productionDate;
     private String fromInvName;
 
     @ExcelProperty(value = "往来单位", index = 0)
@@ -217,8 +218,10 @@ public class IoOrderDetailResultResponse {
 
     @ExcelProperty(value = "配送商", index = 7)
     private String corpName;
-    private Boolean isStack;
 
+    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 7ff417d36..3e058416c 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
@@ -26,24 +26,32 @@
     <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
-                ,
+               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
         <where>
             a1.status = 7
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND a2.orderIdFk = #{orderIdFk}
             </if>
+            <if test="groupBuy != null ">
+                AND bu.groupBuy = #{groupBuy}
+            </if>
             <if test="keyWords != null and keyWords != ''">
                 AND (aw.name like concat('%', #{keyWords}, '%') or b1.name like concat('%', #{keyWords}, '%'))
             </if>
@@ -71,6 +79,9 @@
             <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>