代码提交
This commit is contained in:
parent
4ae5128b23
commit
acab5b9d68
|
|
@ -272,6 +272,9 @@
|
||||||
<if test="maType != null and maType != ''">
|
<if test="maType != null and maType != ''">
|
||||||
and mat2.`NAME` like concat ('%',#{maType},'%')
|
and mat2.`NAME` like concat ('%',#{maType},'%')
|
||||||
</if>
|
</if>
|
||||||
|
<if test="isCount != null and isCount != ''">
|
||||||
|
and rs.isCount = #{isCount}
|
||||||
|
</if>
|
||||||
</where>
|
</where>
|
||||||
GROUP BY rs.typeId
|
GROUP BY rs.typeId
|
||||||
</select>
|
</select>
|
||||||
|
|
@ -1457,7 +1460,7 @@
|
||||||
and tpd.`NAME` like concat('%', #{maName}, '%')
|
and tpd.`NAME` like concat('%', #{maName}, '%')
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
<select id="getNewlyStored">
|
<select id="getNewlyStored" resultType="com.bonus.index.beans.IndexStorageWarnBean">
|
||||||
select mt2.NAME as maType,
|
select mt2.NAME as maType,
|
||||||
mt.NAME as maName,
|
mt.NAME as maName,
|
||||||
wir.CODE as maCode,
|
wir.CODE as maCode,
|
||||||
|
|
@ -1468,7 +1471,7 @@
|
||||||
left join mm_type mt2 on mt.PARENT_ID = mt2.ID
|
left join mm_type mt2 on mt.PARENT_ID = mt2.ID
|
||||||
where wir.TYPE = #{type}
|
where wir.TYPE = #{type}
|
||||||
</select>
|
</select>
|
||||||
<select id="getInventoryStored">
|
<select id="getInventoryStored" resultType="com.bonus.index.beans.IndexStorageWarnBean">
|
||||||
select mt2.NAME as maType,
|
select mt2.NAME as maType,
|
||||||
mt.NAME as maName,
|
mt.NAME as maName,
|
||||||
mt.UNIT as maUnit,
|
mt.UNIT as maUnit,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue