增加销售协议字段

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

jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt

@@ -1337,3 +1337,10 @@ alter table jsh_depot_head add back_amount decimal(24,6) DEFAULT NULL COMMENT '
 -- 修改商品表的名称字段的长度
 -- --------------------------------------------------------
 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

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;
     }

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<String> values) {
+            addCriterion("sale_agreement in", values, "saleAgreement");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaleAgreementNotIn(List<String> 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;

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

@@ -9,6 +9,7 @@
     <result column="company_tel" jdbcType="VARCHAR" property="companyTel" />
     <result column="company_fax" jdbcType="VARCHAR" property="companyFax" />
     <result column="company_post_code" jdbcType="VARCHAR" property="companyPostCode" />
+    <result column="sale_agreement" jdbcType="VARCHAR" property="saleAgreement" />
     <result column="depot_flag" jdbcType="VARCHAR" property="depotFlag" />
     <result column="customer_flag" jdbcType="VARCHAR" property="customerFlag" />
     <result column="minus_stock_flag" jdbcType="VARCHAR" property="minusStockFlag" />
@@ -75,7 +76,7 @@
   </sql>
   <sql id="Base_Column_List">
     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
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="BaseResultMap">
     select
@@ -110,14 +111,14 @@
   <insert id="insert" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
     insert into jsh_system_config (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
-      )
+      company_post_code, sale_agreement, depot_flag, 
+      customer_flag, minus_stock_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}, #{depotFlag,jdbcType=VARCHAR}, #{customerFlag,jdbcType=VARCHAR}, 
-      #{minusStockFlag,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
-      )
+      #{companyPostCode,jdbcType=VARCHAR}, #{saleAgreement,jdbcType=VARCHAR}, #{depotFlag,jdbcType=VARCHAR}, 
+      #{customerFlag,jdbcType=VARCHAR}, #{minusStockFlag,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, 
+      #{deleteFlag,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
     insert into jsh_system_config
@@ -143,6 +144,9 @@
       <if test="companyPostCode != null">
         company_post_code,
       </if>
+      <if test="saleAgreement != null">
+        sale_agreement,
+      </if>
       <if test="depotFlag != null">
         depot_flag,
       </if>
@@ -181,6 +185,9 @@
       <if test="companyPostCode != null">
         #{companyPostCode,jdbcType=VARCHAR},
       </if>
+      <if test="saleAgreement != null">
+        #{saleAgreement,jdbcType=VARCHAR},
+      </if>
       <if test="depotFlag != null">
         #{depotFlag,jdbcType=VARCHAR},
       </if>
@@ -228,6 +235,9 @@
       <if test="record.companyPostCode != null">
         company_post_code = #{record.companyPostCode,jdbcType=VARCHAR},
       </if>
+      <if test="record.saleAgreement != null">
+        sale_agreement = #{record.saleAgreement,jdbcType=VARCHAR},
+      </if>
       <if test="record.depotFlag != null">
         depot_flag = #{record.depotFlag,jdbcType=VARCHAR},
       </if>
@@ -257,6 +267,7 @@
       company_tel = #{record.companyTel,jdbcType=VARCHAR},
       company_fax = #{record.companyFax,jdbcType=VARCHAR},
       company_post_code = #{record.companyPostCode,jdbcType=VARCHAR},
+      sale_agreement = #{record.saleAgreement,jdbcType=VARCHAR},
       depot_flag = #{record.depotFlag,jdbcType=VARCHAR},
       customer_flag = #{record.customerFlag,jdbcType=VARCHAR},
       minus_stock_flag = #{record.minusStockFlag,jdbcType=VARCHAR},
@@ -287,6 +298,9 @@
       <if test="companyPostCode != null">
         company_post_code = #{companyPostCode,jdbcType=VARCHAR},
       </if>
+      <if test="saleAgreement != null">
+        sale_agreement = #{saleAgreement,jdbcType=VARCHAR},
+      </if>
       <if test="depotFlag != null">
         depot_flag = #{depotFlag,jdbcType=VARCHAR},
       </if>
@@ -313,6 +327,7 @@
       company_tel = #{companyTel,jdbcType=VARCHAR},
       company_fax = #{companyFax,jdbcType=VARCHAR},
       company_post_code = #{companyPostCode,jdbcType=VARCHAR},
+      sale_agreement = #{saleAgreement,jdbcType=VARCHAR},
       depot_flag = #{depotFlag,jdbcType=VARCHAR},
       customer_flag = #{customerFlag,jdbcType=VARCHAR},
       minus_stock_flag = #{minusStockFlag,jdbcType=VARCHAR},