From 65be73fe7d13234b2e44503f47462748952c9b5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9E=E8=AF=9D?= <752718920@qq.com> Date: Tue, 3 May 2022 15:24:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=94=80=E5=94=AE=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jshERP-boot/docs/jsh_erp.sql | 3 +- .../docs/数据库更新记录-首次安装请勿使用.txt | 9 ++- .../erp/datasource/entities/SystemConfig.java | 10 +++ .../entities/SystemConfigExample.java | 70 +++++++++++++++++++ .../mapper_xml/SystemConfigMapper.xml | 29 ++++++-- 5 files changed, 112 insertions(+), 9 deletions(-) diff --git a/jshERP-boot/docs/jsh_erp.sql b/jshERP-boot/docs/jsh_erp.sql index 04a8aa67..91695af6 100644 --- a/jshERP-boot/docs/jsh_erp.sql +++ b/jshERP-boot/docs/jsh_erp.sql @@ -825,6 +825,7 @@ CREATE TABLE `jsh_system_config` ( `company_tel` varchar(20) DEFAULT NULL COMMENT '公司电话', `company_fax` varchar(20) DEFAULT NULL COMMENT '公司传真', `company_post_code` varchar(20) DEFAULT NULL COMMENT '公司邮编', + `sale_agreement` varchar(500) DEFAULT NULL COMMENT '销售协议', `depot_flag` varchar(1) DEFAULT '0' COMMENT '仓库启用标记，0未启用，1启用', `customer_flag` varchar(1) DEFAULT '0' COMMENT '客户启用标记，0未启用，1启用', `minus_stock_flag` varchar(1) DEFAULT '0' COMMENT '负库存启用标记，0未启用，1启用', @@ -836,7 +837,7 @@ CREATE TABLE `jsh_system_config` ( -- ---------------------------- -- Records of jsh_system_config -- ---------------------------- -INSERT INTO `jsh_system_config` VALUES ('11', '公司test', '小李', '地址1', '12345678', null, null, '0', '0', '1', '63', '0'); +INSERT INTO `jsh_system_config` VALUES ('11', '公司test', '小李', '地址1', '12345678', null, null, '注：本单为我公司与客户约定账期内结款的依据，由客户或其单位员工签字生效，并承担法律责任。', '0', '0', '1', '63', '0'); -- ---------------------------- -- Table structure for jsh_tenant diff --git a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt index db97cb14..855c1428 100644 --- a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt +++ b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt @@ -1336,4 +1336,11 @@ alter table jsh_depot_head add back_amount decimal(24,6) DEFAULT NULL COMMENT ' -- by jishenghua -- 修改商品表的名称字段的长度 -- -------------------------------------------------------- -alter table jsh_material change name name varchar(100) DEFAULT NULL COMMENT '名称'; \ No newline at end of file +alter table jsh_material change name name varchar(100) DEFAULT NULL COMMENT '名称'; + +-- -------------------------------------------------------- +-- 时间 2022年05月03日 +-- by jishenghua +-- 给系统参数表增加销售协议字段 +-- -------------------------------------------------------- +alter table jsh_system_config add sale_agreement varchar(500) DEFAULT NULL COMMENT '销售协议' after company_post_code; \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java index 8716b326..b658149c 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java @@ -15,6 +15,8 @@ public class SystemConfig { private String companyPostCode; + private String saleAgreement; + private String depotFlag; private String customerFlag; @@ -81,6 +83,14 @@ public class SystemConfig { this.companyPostCode = companyPostCode == null ? null : companyPostCode.trim(); } + public String getSaleAgreement() { + return saleAgreement; + } + + public void setSaleAgreement(String saleAgreement) { + this.saleAgreement = saleAgreement == null ? null : saleAgreement.trim(); + } + public String getDepotFlag() { return depotFlag; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java index 3bd0f12b..c94bd04e 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java @@ -584,6 +584,76 @@ public class SystemConfigExample { return (Criteria) this; } + public Criteria andSaleAgreementIsNull() { + addCriterion("sale_agreement is null"); + return (Criteria) this; + } + + public Criteria andSaleAgreementIsNotNull() { + addCriterion("sale_agreement is not null"); + return (Criteria) this; + } + + public Criteria andSaleAgreementEqualTo(String value) { + addCriterion("sale_agreement =", value, "saleAgreement"); + return (Criteria) this; + } + + public Criteria andSaleAgreementNotEqualTo(String value) { + addCriterion("sale_agreement <>", value, "saleAgreement"); + return (Criteria) this; + } + + public Criteria andSaleAgreementGreaterThan(String value) { + addCriterion("sale_agreement >", value, "saleAgreement"); + return (Criteria) this; + } + + public Criteria andSaleAgreementGreaterThanOrEqualTo(String value) { + addCriterion("sale_agreement >=", value, "saleAgreement"); + return (Criteria) this; + } + + public Criteria andSaleAgreementLessThan(String value) { + addCriterion("sale_agreement <", value, "saleAgreement"); + return (Criteria) this; + } + + public Criteria andSaleAgreementLessThanOrEqualTo(String value) { + addCriterion("sale_agreement <=", value, "saleAgreement"); + return (Criteria) this; + } + + public Criteria andSaleAgreementLike(String value) { + addCriterion("sale_agreement like", value, "saleAgreement"); + return (Criteria) this; + } + + public Criteria andSaleAgreementNotLike(String value) { + addCriterion("sale_agreement not like", value, "saleAgreement"); + return (Criteria) this; + } + + public Criteria andSaleAgreementIn(List values) { + addCriterion("sale_agreement in", values, "saleAgreement"); + return (Criteria) this; + } + + public Criteria andSaleAgreementNotIn(List values) { + addCriterion("sale_agreement not in", values, "saleAgreement"); + return (Criteria) this; + } + + public Criteria andSaleAgreementBetween(String value1, String value2) { + addCriterion("sale_agreement between", value1, value2, "saleAgreement"); + return (Criteria) this; + } + + public Criteria andSaleAgreementNotBetween(String value1, String value2) { + addCriterion("sale_agreement not between", value1, value2, "saleAgreement"); + return (Criteria) this; + } + public Criteria andDepotFlagIsNull() { addCriterion("depot_flag is null"); return (Criteria) this; diff --git a/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml b/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml index 38d9d30e..64231e7d 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml @@ -9,6 +9,7 @@ + @@ -75,7 +76,7 @@ id, company_name, company_contacts, company_address, company_tel, company_fax, company_post_code, - depot_flag, customer_flag, minus_stock_flag, tenant_id, delete_flag + sale_agreement, depot_flag, customer_flag, minus_stock_flag, tenant_id, delete_flag