From 974e26a3e9c764ccd013b7a1555e8543cc9c0ad4 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 15 May 2023 20:40:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=88=B7=E6=96=B0=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=B9=81=E5=BF=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/IoOrderInvoiceController.java           |  3 +--
 .../mybatis/mapper/inout/IoOrderInvoiceMapper.xml | 15 +++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java
index bffa41e7..18b9ef0d 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java
@@ -25,7 +25,6 @@ import java.util.List;
 public class IoOrderInvoiceController {
     @Resource
     IoOrderInvoiceService ioOrderInvoiceService;
-    RefreshInoiceRequest refreshInoiceRequest;
     @Resource
     IoOrderDetailCodeService orderDetailCodeService;
 
@@ -37,7 +36,7 @@ public class IoOrderInvoiceController {
 
         IoOrderInvoiceRequest orderInvoiceRequest = new IoOrderInvoiceRequest();
         BeanUtils.copyProperties(refreshInoiceRequest, orderInvoiceRequest);
-        List<IoOrderInvoiceEntity> orderInvoiceEntities = ioOrderInvoiceService.selectOrderInvoice(orderInvoiceRequest);
+        List<IoOrderInvoiceEntity> orderInvoiceEntities = ioOrderInvoiceService.findByBillNo(orderInvoiceRequest.getOrderIdFk());
         List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderInvoiceRequest.getOrderIdFk());
 
         RefreshInoiceResponse response = new RefreshInoiceResponse();
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml
index 2421b41c..f60f7cf2 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml
@@ -13,18 +13,18 @@
     <select id="selectOrderInvoice" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
             resultType="com.glxp.api.entity.inout.IoOrderInvoiceEntity">
         SELECT ic.*,
-        (select cpmctymc from basic_products where basic_products.uuid = bu.uuid GROUP BY	basic_products.uuid) cpmctymc,
-        (select ggxh from basic_products where basic_products.uuid = bu.uuid GROUP BY	basic_products.uuid)     ggxh
+               (select cpmctymc
+                from basic_products
+                where basic_products.uuid = bu.uuid
+                GROUP BY basic_products.uuid)                                                                     cpmctymc,
+               (select ggxh from basic_products where basic_products.uuid = bu.uuid GROUP BY basic_products.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
+                     LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
+                     LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND ic.orderIdFk = #{orderIdFk}
             </if>
-            <if test="orderIdFk == null || orderIdFk == ''">
-                AND (ic.orderIdFk is null or ic.orderIdFk = '')
-            </if>
             <if test="bindRlFk != null">
                 AND ic.bindRlFk = #{bindRlFk}
             </if>
@@ -34,7 +34,6 @@
             <if test="batchNo == null || batchNo == ''">
                 AND (ic.batchNo is null or ic.batchNo = '')
             </if>
-
         </where>
         GROUP BY ic.id
     </select>