From 60b4f73c9238b1691e1f40bb849b52532cf186fc Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Sun, 18 May 2025 22:29:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E7=B3=BB=E7=BB=9F=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E9=9B=B6=E6=94=B6=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E5=90=AF=E7=94=A8=E6=A0=87=E8=AE=B0=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 | 25 +++++-- 5 files changed, 110 insertions(+), 7 deletions(-) diff --git a/jshERP-boot/docs/jsh_erp.sql b/jshERP-boot/docs/jsh_erp.sql index e69adb0f..dd2f4814 100644 --- a/jshERP-boot/docs/jsh_erp.sql +++ b/jshERP-boot/docs/jsh_erp.sql @@ -825,6 +825,7 @@ CREATE TABLE `jsh_system_config` ( `multi_account_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启用', + `zero_change_amount_flag` varchar(1) DEFAULT '0' COMMENT '零收付款启用标记，0未启用，1启用', `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id', `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', PRIMARY KEY (`id`) @@ -833,7 +834,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', '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 diff --git a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt index 0acb1789..3815ddf5 100644 --- a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt +++ b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt @@ -1664,4 +1664,11 @@ alter table jsh_material add attribute varchar(1000) DEFAULT NULL COMMENT '多 -- by jishenghua -- 把菜单基本资料改成基础资料 -- -------------------------------------------------------- -update jsh_function set name='基础资料' where number='0102'; \ No newline at end of file +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; \ 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 7d3edde6..be427c4a 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 @@ -43,6 +43,8 @@ public class SystemConfig { private String auditPrintFlag; + private String zeroChangeAmountFlag; + private Long tenantId; private String deleteFlag; @@ -215,6 +217,14 @@ public class SystemConfig { 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() { return tenantId; } 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 5404f241..cbb2c303 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 @@ -1564,6 +1564,76 @@ public class SystemConfigExample { 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 values) { + addCriterion("zero_change_amount_flag in", values, "zeroChangeAmountFlag"); + return (Criteria) this; + } + + public Criteria andZeroChangeAmountFlagNotIn(List 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() { addCriterion("tenant_id 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 54d871c4..19d32e5a 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml @@ -23,6 +23,7 @@ + @@ -89,7 +90,7 @@ 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, 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