From 2b6f1fe39bd1202a7637a0a563c6247aeac54b2f Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Fri, 21 Feb 2025 22:19:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=88=B6=E5=89=82=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/IoOrderDetailBizController.java     |  2 +-
 .../mapper/inout/IoOrderDetailBizDao.xml      | 74 ++++++++++---------
 2 files changed, 40 insertions(+), 36 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 91347dfd3..e57b3b20f 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
@@ -1112,7 +1112,7 @@ public class IoOrderDetailBizController extends BaseController {
                 ioCodeLostService.insertOrUpdate(codeLostEntity);
 
                 UdiEntity udiEntityy = FilterUdiUtils.getUdi(addOrderRequest.getCode());
-                BaseResponse response2 = ioOrderDetailBizService.adddDrugOrder(addOrderRequest,udiEntityy,addOrderRequest.getCode());
+                BaseResponse response2 = ioOrderDetailBizService.adddDrugOrder(addOrderRequest, udiEntityy, addOrderRequest.getCode());
 
                 if (response2.getCode() != 20000) {
                     return response2;
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
index f97fdf76d..f50b16bda 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
@@ -184,40 +184,44 @@
 
 
         <select id="orderOutRecordPage" resultType="com.glxp.api.res.inout.IoOrderDetailBizResponse">
-        select io_order_detail_biz.*,
-                io.action,
-                io.updateTime
-        from io_order_detail_biz
-        left join io_order io on io.billNo = io_order_detail_biz.orderIdFk
-        <where>
-            AND ( io.action  = 'SC72197936495755' OR io.action  = 'SC72249388338364' )
-            <if test="batchNo != null and batchNo != ''">
-                AND batchNo = #{batchNo}
-            </if>
-            <if test="action != null and action != ''">
-                AND io.action = #{action}
-            </if>
-            <if test="productName != null and productName != ''">
-                AND io_order_detail_biz.coName like concat('%', #{productName}, '%')
-            </if>
-            <if test="cpmctymc != null and cpmctymc != ''">
-                AND io_order_detail_biz.coName like concat('%', #{cpmctymc}, '%')
-            </if>
-            <if test="nameCode != null and nameCode != ''">
-                AND io_order_detail_biz.nameCode like concat('%', #{nameCode}, '%')
-            </if>
-            <if test="ggxh != null and ggxh != ''">
-                AND io_order_detail_biz.spec like concat('%', #{ggxh}, '%')
-            </if>
-            <if test="keyWords != null and keyWords != ''">
-                AND (
-                io_order_detail_biz.coName like concat('%', #{keyWords}, '%')
-                OR io_order_detail_biz.spec like concat('%', #{keyWords}, '%')
-                OR io_order_detail_biz.batchNo like concat('%', #{keyWords}, '%')
-                )
-            </if>
-        </where>
-        order by updateTime desc
-    </select>
+            select io_order_detail_biz.*,
+                   io.action,
+                   io.updateTime,
+                   bp.prepnSpec
+            from io_order_detail_biz
+                     left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
+                     left join basic_products bp on bu.uuid = bp.uuid
+                     left join io_order io on io.billNo = io_order_detail_biz.orderIdFk
+            <where>
+                AND (io.action = 'SC72197936495755' OR io.action = 'SC72249388338364')
+                <if test="batchNo != null and batchNo != ''">
+                    AND batchNo = #{batchNo}
+                </if>
+                <if test="action != null and action != ''">
+                    AND io.action = #{action}
+                </if>
+                <if test="productName != null and productName != ''">
+                    AND io_order_detail_biz.coName like concat('%', #{productName}, '%')
+                </if>
+                <if test="cpmctymc != null and cpmctymc != ''">
+                    AND io_order_detail_biz.coName like concat('%', #{cpmctymc}, '%')
+                </if>
+                <if test="nameCode != null and nameCode != ''">
+                    AND io_order_detail_biz.nameCode like concat('%', #{nameCode}, '%')
+                </if>
+                <if test="ggxh != null and ggxh != ''">
+                    AND io_order_detail_biz.spec like concat('%', #{ggxh}, '%')
+                </if>
+                <if test="keyWords != null and keyWords != ''">
+                    AND (
+                        io_order_detail_biz.coName like concat('%', #{keyWords}, '%')
+                            OR io_order_detail_biz.spec like concat('%', #{keyWords}, '%')
+                            OR io_order_detail_biz.batchNo like concat('%', #{keyWords}, '%')
+                        )
+                </if>
+            </where>
+            GROUP BY io_order_detail_biz.id
+            order by updateTime desc
+        </select>
 
 </mapper>