From 953507839eced22ae9489e4d068511e99659dc47 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Tue, 27 May 2025 23:47:11 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=9A=E6=98=AF=E5=90=A6=E9=9C=80=E8=A6=81=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E5=8D=95=E6=8D=AE=E8=BF=9B=E8=A1=8C=E6=A0=87?= =?UTF-8?q?=E8=AE=B0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 57e1bd60 --- jshERP-boot/docs/jsh_erp.sql | 3 +- .../docs/数据库更新记录-首次安装请勿使用.txt | 9 +-- .../erp/datasource/entities/DepotHead.java | 10 --- .../datasource/entities/DepotHeadExample.java | 70 ------------------- .../resources/mapper_xml/DepotHeadMapper.xml | 29 ++------ 5 files changed, 8 insertions(+), 113 deletions(-) diff --git a/jshERP-boot/docs/jsh_erp.sql b/jshERP-boot/docs/jsh_erp.sql index 1243d31d..84a4af8a 100644 --- a/jshERP-boot/docs/jsh_erp.sql +++ b/jshERP-boot/docs/jsh_erp.sql @@ -10,7 +10,7 @@ Target Server Type : MYSQL Target Server Version : 50704 File Encoding : 65001 -Date: 2025-05-26 22:53:17 +Date: 2025-05-26 22:34:45 */ SET FOREIGN_KEY_CHECKS=0; @@ -159,7 +159,6 @@ CREATE TABLE `jsh_depot_head` ( `status` varchar(1) DEFAULT NULL COMMENT '状态，0未审核、1已审核、2完成采购|销售、3部分采购|销售、9审核中', `purchase_status` varchar(1) DEFAULT NULL COMMENT '采购状态，0未采购、2完成采购、3部分采购', `source` varchar(1) DEFAULT '0' COMMENT '单据来源，0-pc，1-手机', - `need_invoice` varchar(1) DEFAULT '0' COMMENT '是否需要开票，0不需要，1需要普票，2需要专票', `link_number` varchar(50) DEFAULT NULL COMMENT '关联订单号', `link_apply` varchar(50) DEFAULT NULL COMMENT '关联请购单', `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id', diff --git a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt index 35645712..7f286c9c 100644 --- a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt +++ b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt @@ -1678,11 +1678,4 @@ alter table jsh_system_config add zero_change_amount_flag varchar(1) DEFAULT '0' -- by jishenghua -- 给系统参数表增加客户静态单价启用标记，启用后，客户的销售出库的单价不会从该客户历史单据的单价获取，而是只从商品信息获取 -- -------------------------------------------------------- -alter table jsh_system_config add customer_static_price_flag varchar(1) DEFAULT '0' COMMENT '客户静态单价启用标记，0未启用，1启用' after zero_change_amount_flag; - --- -------------------------------------------------------- --- 时间 2025年5月26日 --- by jishenghua --- 给单据主表增加是否需要开票字段 --- -------------------------------------------------------- -alter table jsh_depot_head add need_invoice varchar(1) DEFAULT '0' COMMENT '是否需要开票，0不需要，1需要普票，2需要专票' after source; \ No newline at end of file +alter table jsh_system_config add customer_static_price_flag varchar(1) DEFAULT '0' COMMENT '客户静态单价启用标记，0未启用，1启用' after zero_change_amount_flag; \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java index ed7668f4..e2a7a19e 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java @@ -60,8 +60,6 @@ public class DepotHead { private String source; - private String needInvoice; - private String linkNumber; private String linkApply; @@ -294,14 +292,6 @@ public class DepotHead { this.source = source == null ? null : source.trim(); } - public String getNeedInvoice() { - return needInvoice; - } - - public void setNeedInvoice(String needInvoice) { - this.needInvoice = needInvoice == null ? null : needInvoice.trim(); - } - public String getLinkNumber() { return linkNumber; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java index 6cbf8e1e..ccb47722 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java @@ -1926,76 +1926,6 @@ public class DepotHeadExample { return (Criteria) this; } - public Criteria andNeedInvoiceIsNull() { - addCriterion("need_invoice is null"); - return (Criteria) this; - } - - public Criteria andNeedInvoiceIsNotNull() { - addCriterion("need_invoice is not null"); - return (Criteria) this; - } - - public Criteria andNeedInvoiceEqualTo(String value) { - addCriterion("need_invoice =", value, "needInvoice"); - return (Criteria) this; - } - - public Criteria andNeedInvoiceNotEqualTo(String value) { - addCriterion("need_invoice <>", value, "needInvoice"); - return (Criteria) this; - } - - public Criteria andNeedInvoiceGreaterThan(String value) { - addCriterion("need_invoice >", value, "needInvoice"); - return (Criteria) this; - } - - public Criteria andNeedInvoiceGreaterThanOrEqualTo(String value) { - addCriterion("need_invoice >=", value, "needInvoice"); - return (Criteria) this; - } - - public Criteria andNeedInvoiceLessThan(String value) { - addCriterion("need_invoice <", value, "needInvoice"); - return (Criteria) this; - } - - public Criteria andNeedInvoiceLessThanOrEqualTo(String value) { - addCriterion("need_invoice <=", value, "needInvoice"); - return (Criteria) this; - } - - public Criteria andNeedInvoiceLike(String value) { - addCriterion("need_invoice like", value, "needInvoice"); - return (Criteria) this; - } - - public Criteria andNeedInvoiceNotLike(String value) { - addCriterion("need_invoice not like", value, "needInvoice"); - return (Criteria) this; - } - - public Criteria andNeedInvoiceIn(List values) { - addCriterion("need_invoice in", values, "needInvoice"); - return (Criteria) this; - } - - public Criteria andNeedInvoiceNotIn(List values) { - addCriterion("need_invoice not in", values, "needInvoice"); - return (Criteria) this; - } - - public Criteria andNeedInvoiceBetween(String value1, String value2) { - addCriterion("need_invoice between", value1, value2, "needInvoice"); - return (Criteria) this; - } - - public Criteria andNeedInvoiceNotBetween(String value1, String value2) { - addCriterion("need_invoice not between", value1, value2, "needInvoice"); - return (Criteria) this; - } - public Criteria andLinkNumberIsNull() { addCriterion("link_number is null"); return (Criteria) this; diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapper.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapper.xml index e55eacc0..399fb375 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapper.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapper.xml @@ -30,7 +30,6 @@ - @@ -98,8 +97,8 @@ 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, source, need_invoice, - link_number, link_apply, tenant_id, delete_flag + discount_last_money, other_money, deposit, status, purchase_status, source, link_number, + link_apply, tenant_id, delete_flag