purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

清理和礼品卡相关的代码

Browse Source
This commit is contained in:
季圣华
2019-02-22 23:27:46 +08:00
parent 6bffcd8f28
commit 086b7d486f
8 changed files with 10 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/resources/mapper_xml/DepotItemMapperEx.xml
View File

@@ -87,7 +87,7 @@
case when type='入库' then di.BasicNumber when type='出库' then 0-di.BasicNumber else 0 end as b_num,
date_format(dh.OperTime,'%Y-%m-%d %H:%i:%S') as oTime
from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId where type!='其它'
and SubType!='调拨' and SubType!='礼品充值'
and SubType!='调拨'
and MaterialId =${mId} ORDER BY oTime desc
<if test="offset != null and rows != null">
limit #{offset},#{rows}
@@ -96,7 +96,7 @@
<select id="findDetailByTypeAndMaterialIdCounts" resultType="java.lang.Integer">
select count(1)
from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId where type!='其它'
and SubType!='调拨' and SubType!='礼品充值'
and SubType!='调拨'
and MaterialId =${mId}
</select>
@@ -124,7 +124,7 @@
<select id="findByTypeAndMaterialIdOut" resultType="java.lang.Integer">
select ifnull(sum(BasicNumber),0) as BasicNumber from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId where type='出库'
and SubType!='调拨' and SubType!='礼品充值' and MaterialId = ${mId}
and SubType!='调拨' and MaterialId = ${mId}
</select>
<select id="getDetailList" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultWithInfoExMap">
@@ -177,7 +177,7 @@
or
(SubType='调拨' and AnotherDepotId=${ProjectId})
or
(SubType='礼品充值' and AnotherDepotId=${ProjectId}))
(AnotherDepotId=${ProjectId}))
and MaterialId = ${MId} and dh.OperTime &lt; '${MonthTime}-01 00:00:00'
</select>
@@ -188,7 +188,7 @@
or
(SubType='调拨' and AnotherDepotId=${ProjectId})
or
(SubType='礼品充值' and AnotherDepotId=${ProjectId}))
(AnotherDepotId=${ProjectId}))
and MaterialId = ${MId} and dh.OperTime &gt;= '${MonthTime}-01 00:00:00'
and dh.OperTime &lt;= '${MonthTime}-31 23:59:59'
</select>
@@ -216,7 +216,7 @@
or
(SubType='调拨' and AnotherDepotId=${ProjectId})
or
(SubType='礼品充值' and AnotherDepotId=${ProjectId}))
(AnotherDepotId=${ProjectId}))
and MaterialId = ${MId} and dh.OperTime &lt; '${MonthTime}-01 00:00:00'
</select>
@@ -227,7 +227,7 @@
or
(SubType='调拨' and AnotherDepotId=${ProjectId})
or
(SubType='礼品充值' and AnotherDepotId=${ProjectId}))
(AnotherDepotId=${ProjectId}))
and MaterialId = ${MId} and dh.OperTime &gt;= '${MonthTime}-01 00:00:00'
and dh.OperTime &lt;= '${MonthTime}-31 23:59:59'
</select>