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

将系统参数表的金额审核启用标记字段改为强审核标记字段

Browse Source
This commit is contained in:
季圣华
2023-03-17 23:05:03 +08:00
parent 234ac15087
commit e9098efcd2
16 changed files with 162 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -389,7 +389,7 @@
#{item}
</foreach>
</if>
<if test="amountApprovalFlag">
<if test="forceFlag">
and dh.status = '1'
</if>
and ifnull(m.delete_flag,'0') !='1'
@@ -443,7 +443,7 @@
#{item}
</foreach>
</if>
<if test="amountApprovalFlag">
<if test="forceFlag">
and dh.status = '1'
</if>
and ifnull(di.delete_flag,'0') !='1'
@@ -522,7 +522,7 @@
and dh.type=#{type} and dh.sub_type=#{subType}
and dh.oper_time &gt;= #{beginTime}
and dh.oper_time &lt;= #{endTime}
<if test="amountApprovalFlag">
<if test="forceFlag">
and dh.status = '1'
</if>
<if test="creatorArray != null">
@@ -546,7 +546,7 @@
and dh.type=#{type} and dh.sub_type=#{subType}
and dh.oper_time &gt;= #{beginTime}
and dh.oper_time &lt;= #{endTime}
<if test="amountApprovalFlag">
<if test="forceFlag">
and dh.status = '1'
</if>
<if test="creatorArray != null">
@@ -574,7 +574,7 @@
#{item}
</foreach>
</if>
<if test="stockApprovalFlag">
<if test="forceFlag">
and dh.status = '1'
</if>
<if test="beginTime != null">
@@ -604,7 +604,7 @@
and ifnull(dh.delete_flag,'0') !='1'
and di.material_extend_id=#{meId}
and ifnull(di.sku,'') !=''
<if test="stockApprovalFlag">
<if test="forceFlag">
and dh.status = '1'
</if>
<if test="beginTime != null">
@@ -631,7 +631,7 @@
where 1=1
and ifnull(dh.delete_flag,'0') !='1'
and di.material_id=#{mId}
<if test="stockApprovalFlag">
<if test="forceFlag">
and dh.status = '1'
</if>
<if test="beginTime != null">