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

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

View File

@@ -16,6 +16,7 @@
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="file_name" jdbcType="VARCHAR" property="fileName" />
<result column="status" jdbcType="VARCHAR" property="status" />
<result column="source" jdbcType="VARCHAR" property="source" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap>
@@ -79,7 +80,7 @@
</sql>
<sql id="Base_Column_List">
id, type, organ_id, hands_person_id, creator, change_amount, discount_money, total_price,
account_id, bill_no, bill_time, remark, file_name, status, tenant_id, delete_flag
account_id, bill_no, bill_time, remark, file_name, status, source, tenant_id, delete_flag
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.AccountHeadExample" resultMap="BaseResultMap">
select
@@ -116,14 +117,14 @@
hands_person_id, creator, change_amount,
discount_money, total_price, account_id,
bill_no, bill_time, remark,
file_name, status, tenant_id,
delete_flag)
file_name, status, source,
tenant_id, delete_flag)
values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{organId,jdbcType=BIGINT},
#{handsPersonId,jdbcType=BIGINT}, #{creator,jdbcType=BIGINT}, #{changeAmount,jdbcType=DECIMAL},
#{discountMoney,jdbcType=DECIMAL}, #{totalPrice,jdbcType=DECIMAL}, #{accountId,jdbcType=BIGINT},
#{billNo,jdbcType=VARCHAR}, #{billTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR},
#{fileName,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT},
#{deleteFlag,jdbcType=VARCHAR})
#{fileName,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{source,jdbcType=VARCHAR},
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.AccountHead">
insert into jsh_account_head
@@ -170,6 +171,9 @@
<if test="status != null">
status,
</if>
<if test="source != null">
source,
</if>
<if test="tenantId != null">
tenant_id,
</if>
@@ -220,6 +224,9 @@
<if test="status != null">
#{status,jdbcType=VARCHAR},
</if>
<if test="source != null">
#{source,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
#{tenantId,jdbcType=BIGINT},
</if>
@@ -279,6 +286,9 @@
<if test="record.status != null">
status = #{record.status,jdbcType=VARCHAR},
</if>
<if test="record.source != null">
source = #{record.source,jdbcType=VARCHAR},
</if>
<if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
@@ -306,6 +316,7 @@
remark = #{record.remark,jdbcType=VARCHAR},
file_name = #{record.fileName,jdbcType=VARCHAR},
status = #{record.status,jdbcType=VARCHAR},
source = #{record.source,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null">
@@ -354,6 +365,9 @@
<if test="status != null">
status = #{status,jdbcType=VARCHAR},
</if>
<if test="source != null">
source = #{source,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
@@ -378,6 +392,7 @@
remark = #{remark,jdbcType=VARCHAR},
file_name = #{fileName,jdbcType=VARCHAR},
status = #{status,jdbcType=VARCHAR},
source = #{source,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT},
delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}

View File

@@ -29,6 +29,7 @@
<result column="deposit" jdbcType="DECIMAL" property="deposit" />
<result column="status" jdbcType="VARCHAR" property="status" />
<result column="purchase_status" jdbcType="VARCHAR" property="purchaseStatus" />
<result column="source" jdbcType="VARCHAR" property="source" />
<result column="link_number" jdbcType="VARCHAR" property="linkNumber" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
@@ -95,7 +96,7 @@
id, type, sub_type, default_number, number, create_time, oper_time, organ_id, creator,
account_id, change_amount, back_amount, total_price, pay_type, bill_type, remark,
file_name, sales_man, account_id_list, account_money_list, discount, discount_money,
discount_last_money, other_money, deposit, status, purchase_status, link_number,
discount_last_money, other_money, deposit, status, purchase_status, source, link_number,
tenant_id, delete_flag
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="BaseResultMap">
@@ -138,8 +139,8 @@
account_id_list, account_money_list, discount,
discount_money, discount_last_money, other_money,
deposit, status, purchase_status,
link_number, tenant_id, delete_flag
)
source, link_number, tenant_id,
delete_flag)
values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{subType,jdbcType=VARCHAR},
#{defaultNumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{operTime,jdbcType=TIMESTAMP}, #{organId,jdbcType=BIGINT}, #{creator,jdbcType=BIGINT},
@@ -149,8 +150,8 @@
#{accountIdList,jdbcType=VARCHAR}, #{accountMoneyList,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL},
#{discountMoney,jdbcType=DECIMAL}, #{discountLastMoney,jdbcType=DECIMAL}, #{otherMoney,jdbcType=DECIMAL},
#{deposit,jdbcType=DECIMAL}, #{status,jdbcType=VARCHAR}, #{purchaseStatus,jdbcType=VARCHAR},
#{linkNumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
)
#{source,jdbcType=VARCHAR}, #{linkNumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT},
#{deleteFlag,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotHead">
insert into jsh_depot_head
@@ -236,6 +237,9 @@
<if test="purchaseStatus != null">
purchase_status,
</if>
<if test="source != null">
source,
</if>
<if test="linkNumber != null">
link_number,
</if>
@@ -328,6 +332,9 @@
<if test="purchaseStatus != null">
#{purchaseStatus,jdbcType=VARCHAR},
</if>
<if test="source != null">
#{source,jdbcType=VARCHAR},
</if>
<if test="linkNumber != null">
#{linkNumber,jdbcType=VARCHAR},
</if>
@@ -429,6 +436,9 @@
<if test="record.purchaseStatus != null">
purchase_status = #{record.purchaseStatus,jdbcType=VARCHAR},
</if>
<if test="record.source != null">
source = #{record.source,jdbcType=VARCHAR},
</if>
<if test="record.linkNumber != null">
link_number = #{record.linkNumber,jdbcType=VARCHAR},
</if>
@@ -472,6 +482,7 @@
deposit = #{record.deposit,jdbcType=DECIMAL},
status = #{record.status,jdbcType=VARCHAR},
purchase_status = #{record.purchaseStatus,jdbcType=VARCHAR},
source = #{record.source,jdbcType=VARCHAR},
link_number = #{record.linkNumber,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
@@ -560,6 +571,9 @@
<if test="purchaseStatus != null">
purchase_status = #{purchaseStatus,jdbcType=VARCHAR},
</if>
<if test="source != null">
source = #{source,jdbcType=VARCHAR},
</if>
<if test="linkNumber != null">
link_number = #{linkNumber,jdbcType=VARCHAR},
</if>
@@ -600,6 +614,7 @@
deposit = #{deposit,jdbcType=DECIMAL},
status = #{status,jdbcType=VARCHAR},
purchase_status = #{purchaseStatus,jdbcType=VARCHAR},
source = #{source,jdbcType=VARCHAR},
link_number = #{linkNumber,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT},
delete_flag = #{deleteFlag,jdbcType=VARCHAR}

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

View File

@@ -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=",">

View File

@@ -16,6 +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="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap>
@@ -80,7 +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, tenant_id, delete_flag
multi_level_approval_flag, multi_bill_type, amount_approval_flag, tenant_id, delete_flag
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="BaseResultMap">
select
@@ -118,13 +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,
tenant_id, delete_flag)
amount_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},
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
#{amountApprovalFlag,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
insert into jsh_system_config
@@ -171,6 +174,9 @@
<if test="multiBillType != null">
multi_bill_type,
</if>
<if test="amountApprovalFlag != null">
amount_approval_flag,
</if>
<if test="tenantId != null">
tenant_id,
</if>
@@ -221,6 +227,9 @@
<if test="multiBillType != null">
#{multiBillType,jdbcType=VARCHAR},
</if>
<if test="amountApprovalFlag != null">
#{amountApprovalFlag,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
#{tenantId,jdbcType=BIGINT},
</if>
@@ -280,6 +289,9 @@
<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.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
@@ -307,6 +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},
tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null">
@@ -355,6 +368,9 @@
<if test="multiBillType != null">
multi_bill_type = #{multiBillType,jdbcType=VARCHAR},
</if>
<if test="amountApprovalFlag != null">
amount_approval_flag = #{amountApprovalFlag,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
@@ -379,6 +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},
tenant_id = #{tenantId,jdbcType=BIGINT},
delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}

View File

@@ -8,9 +8,9 @@
<result column="other_unit" jdbcType="VARCHAR" property="otherUnit" />
<result column="other_unit_two" jdbcType="VARCHAR" property="otherUnitTwo" />
<result column="other_unit_three" jdbcType="VARCHAR" property="otherUnitThree" />
<result column="ratio" jdbcType="INTEGER" property="ratio" />
<result column="ratio_two" jdbcType="INTEGER" property="ratioTwo" />
<result column="ratio_three" jdbcType="INTEGER" property="ratioThree" />
<result column="ratio" jdbcType="DECIMAL" property="ratio" />
<result column="ratio_two" jdbcType="DECIMAL" property="ratioTwo" />
<result column="ratio_three" jdbcType="DECIMAL" property="ratioThree" />
<result column="enabled" jdbcType="BIT" property="enabled" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
@@ -115,7 +115,7 @@
)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{basicUnit,jdbcType=VARCHAR},
#{otherUnit,jdbcType=VARCHAR}, #{otherUnitTwo,jdbcType=VARCHAR}, #{otherUnitThree,jdbcType=VARCHAR},
#{ratio,jdbcType=INTEGER}, #{ratioTwo,jdbcType=INTEGER}, #{ratioThree,jdbcType=INTEGER},
#{ratio,jdbcType=DECIMAL}, #{ratioTwo,jdbcType=DECIMAL}, #{ratioThree,jdbcType=DECIMAL},
#{enabled,jdbcType=BIT}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
)
</insert>
@@ -179,13 +179,13 @@
#{otherUnitThree,jdbcType=VARCHAR},
</if>
<if test="ratio != null">
#{ratio,jdbcType=INTEGER},
#{ratio,jdbcType=DECIMAL},
</if>
<if test="ratioTwo != null">
#{ratioTwo,jdbcType=INTEGER},
#{ratioTwo,jdbcType=DECIMAL},
</if>
<if test="ratioThree != null">
#{ratioThree,jdbcType=INTEGER},
#{ratioThree,jdbcType=DECIMAL},
</if>
<if test="enabled != null">
#{enabled,jdbcType=BIT},
@@ -226,13 +226,13 @@
other_unit_three = #{record.otherUnitThree,jdbcType=VARCHAR},
</if>
<if test="record.ratio != null">
ratio = #{record.ratio,jdbcType=INTEGER},
ratio = #{record.ratio,jdbcType=DECIMAL},
</if>
<if test="record.ratioTwo != null">
ratio_two = #{record.ratioTwo,jdbcType=INTEGER},
ratio_two = #{record.ratioTwo,jdbcType=DECIMAL},
</if>
<if test="record.ratioThree != null">
ratio_three = #{record.ratioThree,jdbcType=INTEGER},
ratio_three = #{record.ratioThree,jdbcType=DECIMAL},
</if>
<if test="record.enabled != null">
enabled = #{record.enabled,jdbcType=BIT},
@@ -256,9 +256,9 @@
other_unit = #{record.otherUnit,jdbcType=VARCHAR},
other_unit_two = #{record.otherUnitTwo,jdbcType=VARCHAR},
other_unit_three = #{record.otherUnitThree,jdbcType=VARCHAR},
ratio = #{record.ratio,jdbcType=INTEGER},
ratio_two = #{record.ratioTwo,jdbcType=INTEGER},
ratio_three = #{record.ratioThree,jdbcType=INTEGER},
ratio = #{record.ratio,jdbcType=DECIMAL},
ratio_two = #{record.ratioTwo,jdbcType=DECIMAL},
ratio_three = #{record.ratioThree,jdbcType=DECIMAL},
enabled = #{record.enabled,jdbcType=BIT},
tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
@@ -285,13 +285,13 @@
other_unit_three = #{otherUnitThree,jdbcType=VARCHAR},
</if>
<if test="ratio != null">
ratio = #{ratio,jdbcType=INTEGER},
ratio = #{ratio,jdbcType=DECIMAL},
</if>
<if test="ratioTwo != null">
ratio_two = #{ratioTwo,jdbcType=INTEGER},
ratio_two = #{ratioTwo,jdbcType=DECIMAL},
</if>
<if test="ratioThree != null">
ratio_three = #{ratioThree,jdbcType=INTEGER},
ratio_three = #{ratioThree,jdbcType=DECIMAL},
</if>
<if test="enabled != null">
enabled = #{enabled,jdbcType=BIT},
@@ -312,9 +312,9 @@
other_unit = #{otherUnit,jdbcType=VARCHAR},
other_unit_two = #{otherUnitTwo,jdbcType=VARCHAR},
other_unit_three = #{otherUnitThree,jdbcType=VARCHAR},
ratio = #{ratio,jdbcType=INTEGER},
ratio_two = #{ratioTwo,jdbcType=INTEGER},
ratio_three = #{ratioThree,jdbcType=INTEGER},
ratio = #{ratio,jdbcType=DECIMAL},
ratio_two = #{ratioTwo,jdbcType=DECIMAL},
ratio_three = #{ratioThree,jdbcType=DECIMAL},
enabled = #{enabled,jdbcType=BIT},
tenant_id = #{tenantId,jdbcType=BIGINT},
delete_flag = #{deleteFlag,jdbcType=VARCHAR}