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

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

@@ -313,7 +313,7 @@
</foreach>
) or dh.sub_type='采购退货' or dh.sub_type='零售' or dh.sub_type='其它')
</if>
<if test="amountApprovalFlag">
<if test="forceFlag">
and dh.status = '1'
</if>
<if test="number != null and number !=''">
@@ -371,7 +371,7 @@
</foreach>
) or dh.sub_type='采购退货' or dh.sub_type='零售' or dh.sub_type='其它')
</if>
<if test="amountApprovalFlag">
<if test="forceFlag">
and dh.status = '1'
</if>
<if test="number != null and number !=''">
@@ -445,7 +445,7 @@
<bind name="bindKey" value="'%'+materialParam+'%'"/>
and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey})
</if>
<if test="amountApprovalFlag">
<if test="forceFlag">
and dh.status = '1'
</if>
and ifnull(dh.delete_flag,'0') !='1'
@@ -505,7 +505,7 @@
<bind name="bindKey" value="'%'+materialParam+'%'"/>
and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey})
</if>
<if test="amountApprovalFlag">
<if test="forceFlag">
and dh.status = '1'
</if>
and ifnull(dh.delete_flag,'0') !='1'
@@ -549,7 +549,7 @@
</foreach>
)
</if>
<if test="amountApprovalFlag">
<if test="forceFlag">
and dh.status = '1'
</if>
<if test="materialParam != null and materialParam !=''">
@@ -601,7 +601,7 @@
</foreach>
)
</if>
<if test="amountApprovalFlag">
<if test="forceFlag">
and dh.status = '1'
</if>
<if test="materialParam != null and materialParam !=''">
@@ -902,7 +902,7 @@
<if test="endTime != null">
and dh.oper_time &lt;= #{endTime}
</if>
<if test="amountApprovalFlag">
<if test="forceFlag">
and dh.status = '1'
</if>
<if test="creatorArray != null">
@@ -936,7 +936,7 @@
<if test="endTime != null">
and dh.oper_time &lt;= #{endTime}
</if>
<if test="amountApprovalFlag">
<if test="forceFlag">
and dh.status = '1'
</if>
<if test="creatorArray != null">