1.修复做单扫码查询产品是否存在问题

src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java

@@ -5,6 +5,7 @@ import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.res.inout.IoOrderInvoiceResponse;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -20,4 +21,15 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus<IoOrderDetailBizDao,
 
     List<IoOrderInvoiceResponse> filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest);
 
+    /**
+     * 查询单条单据业务详情
+     *
+     * @param orderId     单据号
+     * @param relId       产品ID
+     * @param batchNo     批次号
+     * @param productDate 生产日期
+     * @param expireDate  失效日期
+     * @return
+     */
+    IoOrderDetailBizEntity selectOrderDetailBiz(@Param("orderId") String orderId, @Param("relId") Long relId, @Param("batchNo") String batchNo, @Param("productDate") String productDate, @Param("expireDate") String expireDate);
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java

@@ -85,16 +85,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
 
     @Override
     public IoOrderDetailBizEntity findByUnique(String orderId, Long relId, String bacthNo, String productDate, String expireDate) {
-        return ioOrderDetailBizDao.selectOne(new QueryWrapper<IoOrderDetailBizEntity>()
-                .eq("orderIdFk", orderId).eq("bindRlFk", relId)
-                .eq(StrUtil.isNotEmpty(bacthNo), "batchNo", bacthNo)
-                .isNull(StrUtil.isEmpty(bacthNo), "batchNo")
-                .eq(StrUtil.isNotEmpty(productDate), "productDate", productDate)
-                .isNull(StrUtil.isEmpty(productDate), "productDate")
-                .eq(StrUtil.isNotEmpty(expireDate), "expireDate", expireDate)
-                .isNull(StrUtil.isEmpty(expireDate), "expireDate")
-
-        );
+        return ioOrderDetailBizDao.selectOrderDetailBiz(orderId, relId, bacthNo, productDate, expireDate);
     }
 
     @Override

src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml

@@ -46,4 +46,34 @@
         </where>
         GROUP BY ic.id
     </select>
+
+    <select id="selectOrderDetailBiz" resultType="com.glxp.api.entity.inout.IoOrderDetailBizEntity">
+        select * from io_order_detail_biz
+        <where>
+            <if test="orderId != null and orderId != ''">
+                AND orderIdFk = #{orderId}
+            </if>
+            <if test="relId != null">
+                AND bindRlFk = #{relId}
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND batchNo = #{batchNo}
+            </if>
+            <if test="batchNo == null || batchNo == ''">
+                AND (batchNo is null or batchNo = '')
+            </if>
+            <if test="productDate != null and productDate != ''">
+                AND productDate = #{productDate}
+            </if>
+            <if test="productDate == null or productDate == ''">
+                AND (productDate is null or productDate = '')
+            </if>
+            <if test="expireDate != null and expireDate != ''">
+                AND expireDate = #{expireDate}
+            </if>
+            <if test="expireDate == null || expireDate == ''">
+                AND (expireDate is null or expireDate = '')
+            </if>
+        </where>
+    </select>
 </mapper>