给计量单位表修改比例的字段类型，给系统参数表增加金额审核启用标记，给单据增加来源字段

jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml

@@ -376,6 +376,9 @@
             </foreach>
             )
         </if>
+        <if test="amountApprovalFlag">
+            and dh.status = '1'
+        </if>
         and ifnull(m.delete_flag,'0') !='1'
         group by m.id
         order by m.id desc
@@ -414,6 +417,9 @@
             </foreach>
             )
         </if>
+        <if test="amountApprovalFlag">
+            and dh.status = '1'
+        </if>
         and ifnull(di.delete_flag,'0') !='1'
         group by m.id) cc
     </select>
@@ -464,6 +470,9 @@
         and dh.type=#{type} and dh.sub_type=#{subType}
         and dh.oper_time &gt;= #{beginTime}
         and dh.oper_time &lt;= #{endTime}
+        <if test="amountApprovalFlag">
+            and dh.status = '1'
+        </if>
         <if test="creatorArray != null">
             and dh.creator in (
             <foreach collection="creatorArray" item="creator" separator=",">
@@ -485,6 +494,9 @@
         and dh.type=#{type} and dh.sub_type=#{subType}
         and dh.oper_time &gt;= #{beginTime}
         and dh.oper_time &lt;= #{endTime}
+        <if test="amountApprovalFlag">
+            and dh.status = '1'
+        </if>
         <if test="creatorArray != null">
             and dh.creator in (
             <foreach collection="creatorArray" item="creator" separator=",">