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-09 00:01:50 +08:00
parent 00cabc2612
commit 61d9d8704f
28 changed files with 608 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -313,6 +313,9 @@
</foreach>
) or dh.sub_type='采购退货' or dh.sub_type='零售' or dh.sub_type='其它')
</if>
<if test="amountApprovalFlag">
and dh.status = '1'
</if>
<if test="number != null and number !=''">
<bind name="bindNumber" value="'%'+number+'%'"/>
and dh.number like #{bindNumber}
@@ -368,6 +371,9 @@
</foreach>
) or dh.sub_type='采购退货' or dh.sub_type='零售' or dh.sub_type='其它')
</if>
<if test="amountApprovalFlag">
and dh.status = '1'
</if>
<if test="number != null and number !=''">
<bind name="bindNumber" value="'%'+number+'%'"/>
and dh.number like #{bindNumber}
@@ -439,6 +445,9 @@
<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">
and dh.status = '1'
</if>
and ifnull(dh.delete_flag,'0') !='1'
group by di.material_id
<if test="offset != null and rows != null">
@@ -496,6 +505,9 @@
<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">
and dh.status = '1'
</if>
and ifnull(dh.delete_flag,'0') !='1'
group by di.material_id) a
</select>
@@ -537,6 +549,9 @@
</foreach>
)
</if>
<if test="amountApprovalFlag">
and dh.status = '1'
</if>
<if test="materialParam != null and materialParam !=''">
<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} or dh.remark like #{bindKey})
@@ -586,6 +601,9 @@
</foreach>
)
</if>
<if test="amountApprovalFlag">
and dh.status = '1'
</if>
<if test="materialParam != null and materialParam !=''">
<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} or dh.remark like #{bindKey})
@@ -884,6 +902,9 @@
<if test="endTime != null">
and dh.oper_time &lt;= #{endTime}
</if>
<if test="amountApprovalFlag">
and dh.status = '1'
</if>
<if test="creatorArray != null">
and dh.creator in (
<foreach collection="creatorArray" item="creator" separator=",">
@@ -915,6 +936,9 @@
<if test="endTime != null">
and dh.oper_time &lt;= #{endTime}
</if>
<if test="amountApprovalFlag">
and dh.status = '1'
</if>
<if test="creatorArray != null">
and dh.creator in (
<foreach collection="creatorArray" item="creator" separator=",">