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

解决首页和采购销售统计查询的逻辑的bug

Browse Source
This commit is contained in:
jishenghua
2024-01-03 17:34:20 +08:00
parent 1f8cbc2a0f
commit da969b5633
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
View File

@@ -471,7 +471,7 @@
and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey})
</if> </if>
<if test="forceFlag"> <if test="forceFlag">
and dh.status = '1' and (dh.status = '1' or dh.status = '2' or dh.status = '3')
</if> </if>
<if test="inOutManageFlag"> <if test="inOutManageFlag">
and (dh.sub_type!='采购' and dh.sub_type!='采购退货' and dh.sub_type!='销售' and dh.sub_type!='销售退货') and (dh.sub_type!='采购' and dh.sub_type!='采购退货' and dh.sub_type!='销售' and dh.sub_type!='销售退货')
@@ -540,7 +540,7 @@
and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey})
</if> </if>
<if test="forceFlag"> <if test="forceFlag">
and dh.status = '1' and (dh.status = '1' or dh.status = '2' or dh.status = '3')
</if> </if>
<if test="inOutManageFlag"> <if test="inOutManageFlag">
and (dh.sub_type!='采购' and dh.sub_type!='采购退货' and dh.sub_type!='销售' and dh.sub_type!='销售退货') and (dh.sub_type!='采购' and dh.sub_type!='采购退货' and dh.sub_type!='销售' and dh.sub_type!='销售退货')
@@ -942,7 +942,7 @@
and dh.oper_time &lt;= #{endTime} and dh.oper_time &lt;= #{endTime}
</if> </if>
<if test="forceFlag"> <if test="forceFlag">
and dh.status = '1' and (dh.status = '1' or dh.status = '2' or dh.status = '3')
</if> </if>
<if test="creatorArray != null"> <if test="creatorArray != null">
and dh.creator in ( and dh.creator in (
@@ -976,7 +976,7 @@
and dh.oper_time &lt;= #{endTime} and dh.oper_time &lt;= #{endTime}
</if> </if>
<if test="forceFlag"> <if test="forceFlag">
and dh.status = '1' and (dh.status = '1' or dh.status = '2' or dh.status = '3')
</if> </if>
<if test="creatorArray != null"> <if test="creatorArray != null">
and dh.creator in ( and dh.creator in (

12
jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
View File

@@ -443,7 +443,7 @@
</foreach> </foreach>
</if> </if>
<if test="forceFlag"> <if test="forceFlag">
and dh.status = '1' and (dh.status = '1' or dh.status = '2' or dh.status = '3')
</if> </if>
and ifnull(m.delete_flag,'0') !='1' and ifnull(m.delete_flag,'0') !='1'
group by m.id group by m.id
@@ -500,7 +500,7 @@
</foreach> </foreach>
</if> </if>
<if test="forceFlag"> <if test="forceFlag">
and dh.status = '1' and (dh.status = '1' or dh.status = '2' or dh.status = '3')
</if> </if>
and ifnull(di.delete_flag,'0') !='1' and ifnull(di.delete_flag,'0') !='1'
group by m.id) cc group by m.id) cc
@@ -537,7 +537,7 @@
</foreach> </foreach>
</if> </if>
<if test="forceFlag"> <if test="forceFlag">
and dh.status = '1' and (dh.status = '1' or dh.status = '2' or dh.status = '3')
</if> </if>
and ifnull(dh.delete_flag,'0') !='1' and ifnull(dh.delete_flag,'0') !='1'
and ifnull(di.delete_flag,'0') !='1' and ifnull(di.delete_flag,'0') !='1'
@@ -576,7 +576,7 @@
</foreach> </foreach>
</if> </if>
<if test="forceFlag"> <if test="forceFlag">
and dh.status = '1' and (dh.status = '1' or dh.status = '2' or dh.status = '3')
</if> </if>
and ifnull(dh.delete_flag,'0') !='1' and ifnull(dh.delete_flag,'0') !='1'
and ifnull(di.delete_flag,'0') !='1' and ifnull(di.delete_flag,'0') !='1'
@@ -593,7 +593,7 @@
and dh.oper_time &gt;= #{beginTime} and dh.oper_time &gt;= #{beginTime}
and dh.oper_time &lt;= #{endTime} and dh.oper_time &lt;= #{endTime}
<if test="forceFlag"> <if test="forceFlag">
and dh.status = '1' and (dh.status = '1' or dh.status = '2' or dh.status = '3')
</if> </if>
<if test="creatorArray != null"> <if test="creatorArray != null">
and dh.creator in ( and dh.creator in (
@@ -617,7 +617,7 @@
and dh.oper_time &gt;= #{beginTime} and dh.oper_time &gt;= #{beginTime}
and dh.oper_time &lt;= #{endTime} and dh.oper_time &lt;= #{endTime}
<if test="forceFlag"> <if test="forceFlag">
and dh.status = '1' and (dh.status = '1' or dh.status = '2' or dh.status = '3')
</if> </if>
<if test="creatorArray != null"> <if test="creatorArray != null">
and dh.creator in ( and dh.creator in (