From 0617359bca3ebc0f4207b8a4a07827b9c2da87d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Wed, 12 Jul 2023 10:45:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E9=83=A8=E7=A0=81=E6=89=93=E5=8D=B0bu?=
 =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mybatis/mapper/inv/InnerOrderDetailDao.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/inv/InnerOrderDetailDao.xml b/src/main/resources/mybatis/mapper/inv/InnerOrderDetailDao.xml
index 49b2490c1..2f783ecc2 100644
--- a/src/main/resources/mybatis/mapper/inv/InnerOrderDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InnerOrderDetailDao.xml
@@ -12,8 +12,8 @@
         basic_products.measname,
         basic_products.manufactory
         FROM inv_inner_order_detail
-        INNER JOIN basic_udirel on inv_inner_order_detail.productId = basic_udirel.id
-        INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid
+        left JOIN basic_udirel on inv_inner_order_detail.productId = basic_udirel.id
+        left JOIN basic_products on basic_udirel.uuid = basic_products.uuid
         <where>
             <if test="orderIdFk != '' and orderIdFk != null">
                 AND orderIdFk = #{orderIdFk}
@@ -22,7 +22,7 @@
                 AND productId = #{productId}
             </if>
         </where>
-        GROUP BY basic_products.uuid
+        group by inv_inner_order_detail.id
     </select>
 
     <insert id="insert" keyProperty="id"
@@ -107,6 +107,9 @@
             <if test="batchNo != '' and batchNo != null">
                 AND batchNo = #{batchNo}
             </if>
+            <if test="batchNo == '' or batchNo == null">
+                AND (batchNo is null or batchNo = '')
+            </if>
         </where>
 
     </select>