3/7 优化1.3

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}

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>

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

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>

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" />

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>
+</mapper>