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">

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">

48
jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml
View File

@@ -16,8 +16,7 @@
<result column="purchase_by_sale_flag" jdbcType="VARCHAR" property="purchaseBySaleFlag" />
<result column="multi_level_approval_flag" jdbcType="VARCHAR" property="multiLevelApprovalFlag" />
<result column="multi_bill_type" jdbcType="VARCHAR" property="multiBillType" />
<result column="amount_approval_flag" jdbcType="VARCHAR" property="amountApprovalFlag" />
<result column="stock_approval_flag" jdbcType="VARCHAR" property="stockApprovalFlag" />
<result column="force_approval_flag" jdbcType="VARCHAR" property="forceApprovalFlag" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap>
@@ -82,8 +81,7 @@
<sql id="Base_Column_List">
id, company_name, company_contacts, company_address, company_tel, company_fax, company_post_code,
sale_agreement, depot_flag, customer_flag, minus_stock_flag, purchase_by_sale_flag,
multi_level_approval_flag, multi_bill_type, amount_approval_flag, stock_approval_flag,
tenant_id, delete_flag
multi_level_approval_flag, multi_bill_type, force_approval_flag, tenant_id, delete_flag
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="BaseResultMap">
select
@@ -121,15 +119,15 @@
company_post_code, sale_agreement, depot_flag,
customer_flag, minus_stock_flag, purchase_by_sale_flag,
multi_level_approval_flag, multi_bill_type,
amount_approval_flag, stock_approval_flag,
tenant_id, delete_flag)
force_approval_flag, tenant_id, delete_flag
)
values (#{id,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, #{companyContacts,jdbcType=VARCHAR},
#{companyAddress,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR}, #{companyFax,jdbcType=VARCHAR},
#{companyPostCode,jdbcType=VARCHAR}, #{saleAgreement,jdbcType=VARCHAR}, #{depotFlag,jdbcType=VARCHAR},
#{customerFlag,jdbcType=VARCHAR}, #{minusStockFlag,jdbcType=VARCHAR}, #{purchaseBySaleFlag,jdbcType=VARCHAR},
#{multiLevelApprovalFlag,jdbcType=VARCHAR}, #{multiBillType,jdbcType=VARCHAR},
#{amountApprovalFlag,jdbcType=VARCHAR}, #{stockApprovalFlag,jdbcType=VARCHAR},
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
#{forceApprovalFlag,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
insert into jsh_system_config
@@ -176,11 +174,8 @@
<if test="multiBillType != null">
multi_bill_type,
</if>
<if test="amountApprovalFlag != null">
amount_approval_flag,
</if>
<if test="stockApprovalFlag != null">
stock_approval_flag,
<if test="forceApprovalFlag != null">
force_approval_flag,
</if>
<if test="tenantId != null">
tenant_id,
@@ -232,11 +227,8 @@
<if test="multiBillType != null">
#{multiBillType,jdbcType=VARCHAR},
</if>
<if test="amountApprovalFlag != null">
#{amountApprovalFlag,jdbcType=VARCHAR},
</if>
<if test="stockApprovalFlag != null">
#{stockApprovalFlag,jdbcType=VARCHAR},
<if test="forceApprovalFlag != null">
#{forceApprovalFlag,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
#{tenantId,jdbcType=BIGINT},
@@ -297,11 +289,8 @@
<if test="record.multiBillType != null">
multi_bill_type = #{record.multiBillType,jdbcType=VARCHAR},
</if>
<if test="record.amountApprovalFlag != null">
amount_approval_flag = #{record.amountApprovalFlag,jdbcType=VARCHAR},
</if>
<if test="record.stockApprovalFlag != null">
stock_approval_flag = #{record.stockApprovalFlag,jdbcType=VARCHAR},
<if test="record.forceApprovalFlag != null">
force_approval_flag = #{record.forceApprovalFlag,jdbcType=VARCHAR},
</if>
<if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT},
@@ -330,8 +319,7 @@
purchase_by_sale_flag = #{record.purchaseBySaleFlag,jdbcType=VARCHAR},
multi_level_approval_flag = #{record.multiLevelApprovalFlag,jdbcType=VARCHAR},
multi_bill_type = #{record.multiBillType,jdbcType=VARCHAR},
amount_approval_flag = #{record.amountApprovalFlag,jdbcType=VARCHAR},
stock_approval_flag = #{record.stockApprovalFlag,jdbcType=VARCHAR},
force_approval_flag = #{record.forceApprovalFlag,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null">
@@ -380,11 +368,8 @@
<if test="multiBillType != null">
multi_bill_type = #{multiBillType,jdbcType=VARCHAR},
</if>
<if test="amountApprovalFlag != null">
amount_approval_flag = #{amountApprovalFlag,jdbcType=VARCHAR},
</if>
<if test="stockApprovalFlag != null">
stock_approval_flag = #{stockApprovalFlag,jdbcType=VARCHAR},
<if test="forceApprovalFlag != null">
force_approval_flag = #{forceApprovalFlag,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT},
@@ -410,8 +395,7 @@
purchase_by_sale_flag = #{purchaseBySaleFlag,jdbcType=VARCHAR},
multi_level_approval_flag = #{multiLevelApprovalFlag,jdbcType=VARCHAR},
multi_bill_type = #{multiBillType,jdbcType=VARCHAR},
amount_approval_flag = #{amountApprovalFlag,jdbcType=VARCHAR},
stock_approval_flag = #{stockApprovalFlag,jdbcType=VARCHAR},
force_approval_flag = #{forceApprovalFlag,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT},
delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}