From 8fc140193c73ed44ad6203cd4076d9722a6334b6 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 7 Mar 2025 15:16:33 +0800
Subject: [PATCH] =?UTF-8?q?3/7=20=E4=BC=98=E5=8C=961.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mybatis/mapper/inout/IoOrderDao.xml      | 4 ++--
 .../mybatis/mapper/inout/IoOrderDetailResultDao.xml         | 3 ---
 .../mybatis/mapper/inout/IoSplitFifoCodeMapper.xml          | 1 -
 src/main/resources/mybatis/mapper/inv/invProductDao.xml     | 6 +-----
 .../mapper/thrsys/ThrConsumeMaterialCategoryMapper.xml      | 1 -
 src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml     | 2 +-
 6 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index 33c103e42..abb7044f3 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -468,8 +468,8 @@
                 AND syncStatus = #{syncStatus}
             </if>
             <if test="unionRemark != null and unionRemark != ''">
-                AND (io.remark like concat('%', #{unionRemark}, '%')
-                or io.outSickInfo like concat('%', #{unionRemark}, '%'))
+                AND (io_order.remark like concat('%', #{unionRemark}, '%')
+                or io_order.outSickInfo like concat('%', #{unionRemark}, '%'))
             </if>
             <if test="busType != null">
                 AND busType = #{busType}
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
index 61c234702..a46b9a7d1 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
@@ -56,9 +56,6 @@
             <if test="productType != null and productType != ''">
                 AND a1.productType = #{productType}
             </if>
-<!--            <if test="keyWords != null and keyWords != ''">-->
-<!--                AND (aw.name like concat('%', #{keyWords}, '%') or b1.name like concat('%', #{keyWords}, '%'))-->
-<!--            </if>-->
             <if test="nameCode != null and nameCode != ''">
                 AND a2.nameCode = #{nameCode}
             </if>
diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml
index 1ac2ec043..649e88e77 100644
--- a/src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml
@@ -70,7 +70,6 @@
                bp.measname,
                bu.useLevelUnit,
                bp.zczbhhzbapzbh,
-
                bp.zxxsdycpbs
         FROM io_split_fifo_code
                  LEFT JOIN basic_udirel bu ON bu.id = io_split_fifo_code.relId
diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
index 9fde2cc8f..768fda0cf 100644
--- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
@@ -286,9 +286,6 @@
             <if test="invSpaceCode != null and invSpaceCode != ''">
                 AND ipd.invSpaceCode = #{invSpaceCode}
             </if>
-            <!--            <if test="supId != null and supId != ''">-->
-            <!--                AND ipd.supId = #{supId}-->
-            <!--            </if>-->
         </where>
         group by ip.id
     </select>
@@ -304,12 +301,11 @@
                inv_product.inCount,
                inv_product.outCount,
                inv_product.reCount,
-               -- sum(inv_product.inCount - inv_product.outCount) reCount,
                basic_products.cpmctymc
         from inv_product_detail
                  left join inv_product on inv_product_detail.relId = inv_product.relIdFk
             and inv_product.invCode = inv_product_detail.invCode
-            AND IFNULL(inv_product.batchNo, 'empty') = IFNULL(inv_product_detail.batchNo, 'empty')
+            AND COALESCE(inv_product.batchNo, 'empty') = COALESCE(inv_product_detail.batchNo, 'empty')
                  left join basic_udirel on inv_product_detail.relId = basic_udirel.id
                  left join basic_products on basic_products.uuid = basic_udirel.uuid
         <where>
diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrConsumeMaterialCategoryMapper.xml b/src/main/resources/mybatis/mapper/thrsys/ThrConsumeMaterialCategoryMapper.xml
index 72ae3b5ef..56855fccc 100644
--- a/src/main/resources/mybatis/mapper/thrsys/ThrConsumeMaterialCategoryMapper.xml
+++ b/src/main/resources/mybatis/mapper/thrsys/ThrConsumeMaterialCategoryMapper.xml
@@ -3,7 +3,6 @@
 <mapper namespace="com.glxp.api.dao.thrsys.ThrConsumeMaterialCategoryMapper">
   <resultMap id="BaseResultMap" type="com.glxp.api.entity.thrsys.ThrConsumeMaterialCategory">
     <!--@mbg.generated-->
-    <!--@Table thr_consume_material_category-->
     <id column="categoryId" jdbcType="BIGINT" property="categoryId" />
     <result column="parentCategoryId" jdbcType="BIGINT" property="parentCategoryId" />
     <result column="categoryName" jdbcType="VARCHAR" property="categoryName" />
diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml
index 2ff056e75..6481e7d26 100644
--- a/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml
+++ b/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml
@@ -184,4 +184,4 @@
     <select id="selectByLastTime" resultType="com.glxp.api.entity.thrsys.ThrDeptEntity">
         select * from thr_dept where updateTime >= #{lastUpdateTime}
     </select>
-</mapper>
\ No newline at end of file
+</mapper>