diff --git a/src/main/resources/mybatis/mapper/inv/InvPreinOrderDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreinOrderDao.xml index 774b1746..0f8258ed 100644 --- a/src/main/resources/mybatis/mapper/inv/InvPreinOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvPreinOrderDao.xml @@ -3,33 +3,42 @@ diff --git a/src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml b/src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml index 7179c568..27c37d97 100644 --- a/src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml @@ -2,34 +2,38 @@ - select irs.id, - irs.relId, - irs.deptCode, - irs.invCode, - irs.invSpaceCode, - irs.lowStock, - irs.lackStock, - irs.overStock, - irs.expireDate, - irs.recentDate, - irs.remark, - bu.lowStockNum, - bu.overStockNum, - bu.recentDateTime, - bu.useExpireTime, - bu.isDateBy, - bp.cpmctymc productName, - bp.ggxh, - (select `name` from auth_warehouse where `code` = irs.invCode) invName, - (select `name` from auth_space where `code` = irs.invSpaceCode and invCode = irs.invCode) invSpaceName - from inv_remind_set irs - left join basic_udirel bu on bu.id = irs.relId - left join basic_products bp on bp.uuid = bu.uuid + SELECT + irs.id, + irs.relId, + irs.deptCode, + irs.invCode, + irs.invSpaceCode, + irs.lowStock, + irs.lackStock, + irs.overStock, + irs.expireDate, + irs.recentDate, + irs.remark, + bu.lowStockNum, + bu.overStockNum, + bu.recentDateTime, + bu.useExpireTime, + bu.isDateBy, + bp.cpmctymc AS productName, + bp.ggxh, + aw.name AS invName, + aspc.name AS invSpaceName + FROM inv_remind_set AS irs + LEFT JOIN basic_udirel AS bu ON bu.id = irs.relId + LEFT JOIN basic_products AS bp ON bp.uuid = bu.uuid + LEFT JOIN auth_warehouse AS aw ON aw.code = irs.invCode + LEFT JOIN auth_space AS aspc ON aspc.code = irs.invSpaceCode AND aspc.invWarehouseCode = irs.invCode AND irs.relId = #{relId} @@ -43,27 +46,26 @@ diff --git a/src/main/resources/mybatis/mapper/system/ClassifyCodeDao.xml b/src/main/resources/mybatis/mapper/system/ClassifyCodeDao.xml index aa707311..d2c5ec97 100644 --- a/src/main/resources/mybatis/mapper/system/ClassifyCodeDao.xml +++ b/src/main/resources/mybatis/mapper/system/ClassifyCodeDao.xml @@ -16,20 +16,16 @@ and product_classify.`name` = #{name} - and ( product_classify.`name` like concat('%',#{key},'%') or product_classify.`code` like concat('%',#{key},'%')) - - and product_classify.`code` in #{item} -