给系统参数表增加零收付款启用标记字段

This commit is contained in:
jishenghua
2025-05-18 22:29:53 +08:00
parent 0a1f18cff9
commit 60b4f73c92
5 changed files with 110 additions and 7 deletions

View File

@@ -825,6 +825,7 @@ CREATE TABLE `jsh_system_config` (
`multi_account_flag` varchar(1) DEFAULT '0' COMMENT '多账户启用标记0未启用1启用', `multi_account_flag` varchar(1) DEFAULT '0' COMMENT '多账户启用标记0未启用1启用',
`move_avg_price_flag` varchar(1) DEFAULT '0' COMMENT '移动平均价启用标记0未启用1启用', `move_avg_price_flag` varchar(1) DEFAULT '0' COMMENT '移动平均价启用标记0未启用1启用',
`audit_print_flag` varchar(1) DEFAULT '0' COMMENT '先审核后打印启用标记0未启用1启用', `audit_print_flag` varchar(1) DEFAULT '0' COMMENT '先审核后打印启用标记0未启用1启用',
`zero_change_amount_flag` varchar(1) DEFAULT '0' COMMENT '零收付款启用标记0未启用1启用',
`tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id', `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
`delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记0未删除1删除', `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记0未删除1删除',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
@@ -833,7 +834,7 @@ CREATE TABLE `jsh_system_config` (
-- ---------------------------- -- ----------------------------
-- Records of jsh_system_config -- Records of jsh_system_config
-- ---------------------------- -- ----------------------------
INSERT INTO `jsh_system_config` VALUES ('11', '公司test', '小李', '地址1', '12345678', null, null, '注:本单为我公司与客户约定账期内结款的依据,由客户或其单位员工签字生效,并承担法律责任。', '0', '0', '1', '0', '0', '', '0', '1', '0', '0', '0', '0', '0', '63', '0'); INSERT INTO `jsh_system_config` VALUES ('11', '公司test', '小李', '地址1', '12345678', null, null, '注:本单为我公司与客户约定账期内结款的依据,由客户或其单位员工签字生效,并承担法律责任。', '0', '0', '1', '0', '0', '', '0', '1', '0', '0', '0', '0', '0', '0', '63', '0');
-- ---------------------------- -- ----------------------------
-- Table structure for jsh_tenant -- Table structure for jsh_tenant

View File

@@ -1665,3 +1665,10 @@ alter table jsh_material add attribute varchar(1000) DEFAULT NULL COMMENT '多
-- 把菜单基本资料改成基础资料 -- 把菜单基本资料改成基础资料
-- -------------------------------------------------------- -- --------------------------------------------------------
update jsh_function set name='基础资料' where number='0102'; update jsh_function set name='基础资料' where number='0102';
-- --------------------------------------------------------
-- 时间 2025年5月18日
-- by jishenghua
-- 给系统参数表增加零收付款启用标记启用后销售出库单据新建时默认本次收款为0采购入库单据同理
-- --------------------------------------------------------
alter table jsh_system_config add zero_change_amount_flag varchar(1) DEFAULT '0' COMMENT '零收付款启用标记0未启用1启用' after audit_print_flag;

View File

@@ -43,6 +43,8 @@ public class SystemConfig {
private String auditPrintFlag; private String auditPrintFlag;
private String zeroChangeAmountFlag;
private Long tenantId; private Long tenantId;
private String deleteFlag; private String deleteFlag;
@@ -215,6 +217,14 @@ public class SystemConfig {
this.auditPrintFlag = auditPrintFlag == null ? null : auditPrintFlag.trim(); this.auditPrintFlag = auditPrintFlag == null ? null : auditPrintFlag.trim();
} }
public String getZeroChangeAmountFlag() {
return zeroChangeAmountFlag;
}
public void setZeroChangeAmountFlag(String zeroChangeAmountFlag) {
this.zeroChangeAmountFlag = zeroChangeAmountFlag == null ? null : zeroChangeAmountFlag.trim();
}
public Long getTenantId() { public Long getTenantId() {
return tenantId; return tenantId;
} }

View File

@@ -1564,6 +1564,76 @@ public class SystemConfigExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andZeroChangeAmountFlagIsNull() {
addCriterion("zero_change_amount_flag is null");
return (Criteria) this;
}
public Criteria andZeroChangeAmountFlagIsNotNull() {
addCriterion("zero_change_amount_flag is not null");
return (Criteria) this;
}
public Criteria andZeroChangeAmountFlagEqualTo(String value) {
addCriterion("zero_change_amount_flag =", value, "zeroChangeAmountFlag");
return (Criteria) this;
}
public Criteria andZeroChangeAmountFlagNotEqualTo(String value) {
addCriterion("zero_change_amount_flag <>", value, "zeroChangeAmountFlag");
return (Criteria) this;
}
public Criteria andZeroChangeAmountFlagGreaterThan(String value) {
addCriterion("zero_change_amount_flag >", value, "zeroChangeAmountFlag");
return (Criteria) this;
}
public Criteria andZeroChangeAmountFlagGreaterThanOrEqualTo(String value) {
addCriterion("zero_change_amount_flag >=", value, "zeroChangeAmountFlag");
return (Criteria) this;
}
public Criteria andZeroChangeAmountFlagLessThan(String value) {
addCriterion("zero_change_amount_flag <", value, "zeroChangeAmountFlag");
return (Criteria) this;
}
public Criteria andZeroChangeAmountFlagLessThanOrEqualTo(String value) {
addCriterion("zero_change_amount_flag <=", value, "zeroChangeAmountFlag");
return (Criteria) this;
}
public Criteria andZeroChangeAmountFlagLike(String value) {
addCriterion("zero_change_amount_flag like", value, "zeroChangeAmountFlag");
return (Criteria) this;
}
public Criteria andZeroChangeAmountFlagNotLike(String value) {
addCriterion("zero_change_amount_flag not like", value, "zeroChangeAmountFlag");
return (Criteria) this;
}
public Criteria andZeroChangeAmountFlagIn(List<String> values) {
addCriterion("zero_change_amount_flag in", values, "zeroChangeAmountFlag");
return (Criteria) this;
}
public Criteria andZeroChangeAmountFlagNotIn(List<String> values) {
addCriterion("zero_change_amount_flag not in", values, "zeroChangeAmountFlag");
return (Criteria) this;
}
public Criteria andZeroChangeAmountFlagBetween(String value1, String value2) {
addCriterion("zero_change_amount_flag between", value1, value2, "zeroChangeAmountFlag");
return (Criteria) this;
}
public Criteria andZeroChangeAmountFlagNotBetween(String value1, String value2) {
addCriterion("zero_change_amount_flag not between", value1, value2, "zeroChangeAmountFlag");
return (Criteria) this;
}
public Criteria andTenantIdIsNull() { public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null"); addCriterion("tenant_id is null");
return (Criteria) this; return (Criteria) this;

View File

@@ -23,6 +23,7 @@
<result column="multi_account_flag" jdbcType="VARCHAR" property="multiAccountFlag" /> <result column="multi_account_flag" jdbcType="VARCHAR" property="multiAccountFlag" />
<result column="move_avg_price_flag" jdbcType="VARCHAR" property="moveAvgPriceFlag" /> <result column="move_avg_price_flag" jdbcType="VARCHAR" property="moveAvgPriceFlag" />
<result column="audit_print_flag" jdbcType="VARCHAR" property="auditPrintFlag" /> <result column="audit_print_flag" jdbcType="VARCHAR" property="auditPrintFlag" />
<result column="zero_change_amount_flag" jdbcType="VARCHAR" property="zeroChangeAmountFlag" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" /> <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
@@ -89,7 +90,7 @@
sale_agreement, depot_flag, customer_flag, minus_stock_flag, purchase_by_sale_flag, sale_agreement, depot_flag, customer_flag, minus_stock_flag, purchase_by_sale_flag,
multi_level_approval_flag, multi_bill_type, force_approval_flag, update_unit_price_flag, multi_level_approval_flag, multi_bill_type, force_approval_flag, update_unit_price_flag,
over_link_bill_flag, in_out_manage_flag, multi_account_flag, move_avg_price_flag, over_link_bill_flag, in_out_manage_flag, multi_account_flag, move_avg_price_flag,
audit_print_flag, tenant_id, delete_flag audit_print_flag, zero_change_amount_flag, tenant_id, delete_flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="BaseResultMap">
select select
@@ -129,8 +130,8 @@
multi_level_approval_flag, multi_bill_type, multi_level_approval_flag, multi_bill_type,
force_approval_flag, update_unit_price_flag, force_approval_flag, update_unit_price_flag,
over_link_bill_flag, in_out_manage_flag, multi_account_flag, over_link_bill_flag, in_out_manage_flag, multi_account_flag,
move_avg_price_flag, audit_print_flag, tenant_id, move_avg_price_flag, audit_print_flag, zero_change_amount_flag,
delete_flag) tenant_id, delete_flag)
values (#{id,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, #{companyContacts,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, #{companyContacts,jdbcType=VARCHAR},
#{companyAddress,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR}, #{companyFax,jdbcType=VARCHAR}, #{companyAddress,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR}, #{companyFax,jdbcType=VARCHAR},
#{companyPostCode,jdbcType=VARCHAR}, #{saleAgreement,jdbcType=VARCHAR}, #{depotFlag,jdbcType=VARCHAR}, #{companyPostCode,jdbcType=VARCHAR}, #{saleAgreement,jdbcType=VARCHAR}, #{depotFlag,jdbcType=VARCHAR},
@@ -138,8 +139,8 @@
#{multiLevelApprovalFlag,jdbcType=VARCHAR}, #{multiBillType,jdbcType=VARCHAR}, #{multiLevelApprovalFlag,jdbcType=VARCHAR}, #{multiBillType,jdbcType=VARCHAR},
#{forceApprovalFlag,jdbcType=VARCHAR}, #{updateUnitPriceFlag,jdbcType=VARCHAR}, #{forceApprovalFlag,jdbcType=VARCHAR}, #{updateUnitPriceFlag,jdbcType=VARCHAR},
#{overLinkBillFlag,jdbcType=VARCHAR}, #{inOutManageFlag,jdbcType=VARCHAR}, #{multiAccountFlag,jdbcType=VARCHAR}, #{overLinkBillFlag,jdbcType=VARCHAR}, #{inOutManageFlag,jdbcType=VARCHAR}, #{multiAccountFlag,jdbcType=VARCHAR},
#{moveAvgPriceFlag,jdbcType=VARCHAR}, #{auditPrintFlag,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{moveAvgPriceFlag,jdbcType=VARCHAR}, #{auditPrintFlag,jdbcType=VARCHAR}, #{zeroChangeAmountFlag,jdbcType=VARCHAR},
#{deleteFlag,jdbcType=VARCHAR}) #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
insert into jsh_system_config insert into jsh_system_config
@@ -207,6 +208,9 @@
<if test="auditPrintFlag != null"> <if test="auditPrintFlag != null">
audit_print_flag, audit_print_flag,
</if> </if>
<if test="zeroChangeAmountFlag != null">
zero_change_amount_flag,
</if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id, tenant_id,
</if> </if>
@@ -278,6 +282,9 @@
<if test="auditPrintFlag != null"> <if test="auditPrintFlag != null">
#{auditPrintFlag,jdbcType=VARCHAR}, #{auditPrintFlag,jdbcType=VARCHAR},
</if> </if>
<if test="zeroChangeAmountFlag != null">
#{zeroChangeAmountFlag,jdbcType=VARCHAR},
</if>
<if test="tenantId != null"> <if test="tenantId != null">
#{tenantId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT},
</if> </if>
@@ -358,6 +365,9 @@
<if test="record.auditPrintFlag != null"> <if test="record.auditPrintFlag != null">
audit_print_flag = #{record.auditPrintFlag,jdbcType=VARCHAR}, audit_print_flag = #{record.auditPrintFlag,jdbcType=VARCHAR},
</if> </if>
<if test="record.zeroChangeAmountFlag != null">
zero_change_amount_flag = #{record.zeroChangeAmountFlag,jdbcType=VARCHAR},
</if>
<if test="record.tenantId != null"> <if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if> </if>
@@ -392,6 +402,7 @@
multi_account_flag = #{record.multiAccountFlag,jdbcType=VARCHAR}, multi_account_flag = #{record.multiAccountFlag,jdbcType=VARCHAR},
move_avg_price_flag = #{record.moveAvgPriceFlag,jdbcType=VARCHAR}, move_avg_price_flag = #{record.moveAvgPriceFlag,jdbcType=VARCHAR},
audit_print_flag = #{record.auditPrintFlag,jdbcType=VARCHAR}, audit_print_flag = #{record.auditPrintFlag,jdbcType=VARCHAR},
zero_change_amount_flag = #{record.zeroChangeAmountFlag,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR} delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
@@ -461,6 +472,9 @@
<if test="auditPrintFlag != null"> <if test="auditPrintFlag != null">
audit_print_flag = #{auditPrintFlag,jdbcType=VARCHAR}, audit_print_flag = #{auditPrintFlag,jdbcType=VARCHAR},
</if> </if>
<if test="zeroChangeAmountFlag != null">
zero_change_amount_flag = #{zeroChangeAmountFlag,jdbcType=VARCHAR},
</if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
</if> </if>
@@ -492,6 +506,7 @@
multi_account_flag = #{multiAccountFlag,jdbcType=VARCHAR}, multi_account_flag = #{multiAccountFlag,jdbcType=VARCHAR},
move_avg_price_flag = #{moveAvgPriceFlag,jdbcType=VARCHAR}, move_avg_price_flag = #{moveAvgPriceFlag,jdbcType=VARCHAR},
audit_print_flag = #{auditPrintFlag,jdbcType=VARCHAR}, audit_print_flag = #{auditPrintFlag,jdbcType=VARCHAR},
zero_change_amount_flag = #{zeroChangeAmountFlag,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
delete_flag = #{deleteFlag,jdbcType=VARCHAR} delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}