purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "增加字段：是否需要开票，对单据进行标记"

Browse Source 
This reverts commit 57e1bd60
This commit is contained in:
jishenghua
2025-05-27 23:47:11 +08:00
parent 81d6f86eb0
commit 953507839e
5 changed files with 8 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jshERP-boot/docs/jsh_erp.sql
View File

@@ -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',

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

@@ -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;
alter table jsh_system_config add customer_static_price_flag varchar(1) DEFAULT '0' COMMENT '客户静态单价启用标记，0未启用，1启用' after zero_change_amount_flag;

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java
View File

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

70
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java
View File

@@ -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<String> values) {
addCriterion("need_invoice in", values, "needInvoice");
return (Criteria) this;
}
public Criteria andNeedInvoiceNotIn(List<String> 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;

29
jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapper.xml
View File

@@ -30,7 +30,6 @@
<result column="status" jdbcType="VARCHAR" property="status" />
<result column="purchase_status" jdbcType="VARCHAR" property="purchaseStatus" />
<result column="source" jdbcType="VARCHAR" property="source" />
<result column="need_invoice" jdbcType="VARCHAR" property="needInvoice" />
<result column="link_number" jdbcType="VARCHAR" property="linkNumber" />
<result column="link_apply" jdbcType="VARCHAR" property="linkApply" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
@@ -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
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="BaseResultMap">
select
@@ -141,9 +140,8 @@
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
)
source, link_number, link_apply,
tenant_id, delete_flag)
values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{subType,jdbcType=VARCHAR},
#{defaultNumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{operTime,jdbcType=TIMESTAMP}, #{organId,jdbcType=BIGINT}, #{creator,jdbcType=BIGINT},
@@ -153,9 +151,8 @@
#{accountIdList,jdbcType=VARCHAR}, #{accountMoneyList,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL},
#{discountMoney,jdbcType=DECIMAL}, #{discountLastMoney,jdbcType=DECIMAL}, #{otherMoney,jdbcType=DECIMAL},
#{deposit,jdbcType=DECIMAL}, #{status,jdbcType=VARCHAR}, #{purchaseStatus,jdbcType=VARCHAR},
#{source,jdbcType=VARCHAR}, #{needInvoice,jdbcType=VARCHAR}, #{linkNumber,jdbcType=VARCHAR},
#{linkApply,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
)
#{source,jdbcType=VARCHAR}, #{linkNumber,jdbcType=VARCHAR}, #{linkApply,jdbcType=VARCHAR},
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotHead">
insert into jsh_depot_head
@@ -244,9 +241,6 @@
<if test="source != null">
source,
</if>
<if test="needInvoice != null">
need_invoice,
</if>
<if test="linkNumber != null">
link_number,
</if>
@@ -345,9 +339,6 @@
<if test="source != null">
#{source,jdbcType=VARCHAR},
</if>
<if test="needInvoice != null">
#{needInvoice,jdbcType=VARCHAR},
</if>
<if test="linkNumber != null">
#{linkNumber,jdbcType=VARCHAR},
</if>
@@ -455,9 +446,6 @@
<if test="record.source != null">
source = #{record.source,jdbcType=VARCHAR},
</if>
<if test="record.needInvoice != null">
need_invoice = #{record.needInvoice,jdbcType=VARCHAR},
</if>
<if test="record.linkNumber != null">
link_number = #{record.linkNumber,jdbcType=VARCHAR},
</if>
@@ -505,7 +493,6 @@
status = #{record.status,jdbcType=VARCHAR},
purchase_status = #{record.purchaseStatus,jdbcType=VARCHAR},
source = #{record.source,jdbcType=VARCHAR},
need_invoice = #{record.needInvoice,jdbcType=VARCHAR},
link_number = #{record.linkNumber,jdbcType=VARCHAR},
link_apply = #{record.linkApply,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT},
@@ -598,9 +585,6 @@
<if test="source != null">
source = #{source,jdbcType=VARCHAR},
</if>
<if test="needInvoice != null">
need_invoice = #{needInvoice,jdbcType=VARCHAR},
</if>
<if test="linkNumber != null">
link_number = #{linkNumber,jdbcType=VARCHAR},
</if>
@@ -645,7 +629,6 @@
status = #{status,jdbcType=VARCHAR},
purchase_status = #{purchaseStatus,jdbcType=VARCHAR},
source = #{source,jdbcType=VARCHAR},
need_invoice = #{needInvoice,jdbcType=VARCHAR},
link_number = #{linkNumber,jdbcType=VARCHAR},
link_apply = #{linkApply,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT},