From d55358b8cd6a11e11c12566ec7bdb488b631007b Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 9 May 2023 15:49:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/IoOrderDetailBizController.java     |  3 +-
 .../mapper/inout/IoOrderInvoiceMapper.xml     | 28 +++++++++++++------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
index 88be98cfe..a64b72d80 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
@@ -648,7 +648,8 @@ public class IoOrderDetailBizController extends BaseController {
             String msg = "";
             IoOrderInvoiceRequest ioOrderInvoiceEntity = new IoOrderInvoiceRequest();
             ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailCodeRespons.getOrderIdFk());
-            ioOrderInvoiceEntity.setBizIdFk(ioOrderDetailCodeRespons.getId());
+            ioOrderInvoiceEntity.setBatchNo(ioOrderDetailCodeRespons.getBatchNo());
+            ioOrderInvoiceEntity.setBindRlFk(ioOrderDetailCodeRespons.getBindRlFk().toString());
             List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList = ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceEntity);
             for (IoOrderInvoiceEntity obj : ioOrderInvoiceEntityList) {
                 if (StrUtil.isNotEmpty(obj.getInvoiceEncode())) {
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml
index de5cb763f..2984b40cd 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml
@@ -12,18 +12,30 @@
 
     <select id="selectOrderInvoice" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
             resultType="com.glxp.api.entity.inout.IoOrderInvoiceEntity">
-        select *
-        from io_order_invoice
+        SELECT ic.*,
+        (select cpmctymc from basic_products where basic_products.uuid = bu.uuid) cpmctymc,
+        (select ggxh from basic_products where basic_products.uuid = bu.uuid)     ggxh
+        FROM io_order_invoice ic
+        LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
+        LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
         <where>
-            <if test="id != null">
-                AND id = #{id}
+            <if test="orderIdFk != null and orderIdFk != ''">
+                AND ic.orderIdFk = #{orderIdFk}
             </if>
-            <if test="bizIdFk != null">
-                AND bizIdFk = #{bizIdFk}
+            <if test="orderIdFk == null || orderIdFk == ''">
+                AND (ic.orderIdFk is null or ic.orderIdFk = '')
             </if>
-            <if test="orderIdFk != null and orderIdFk != ''">
-                AND orderIdFk = #{orderIdFk}
+            <if test="bindRlFk != null">
+                AND ic.bindRlFk = #{bindRlFk}
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND ic.batchNo = #{batchNo}
             </if>
+            <if test="batchNo == null || batchNo == ''">
+                AND (ic.batchNo is null or ic.batchNo = '')
+            </if>
+
         </where>
+        GROUP BY ic.id
     </select>
 </mapper>