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}
- 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}, '%'))
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 @@
AND a1.productType = #{productType}
-
-
-
AND a2.nameCode = #{nameCode}
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 @@
AND ipd.invSpaceCode = #{invSpaceCode}
-
-
-
group by ip.id
@@ -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
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 @@
-
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 @@
-
\ No newline at end of file
+