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

给计量单位表修改比例的字段类型，给系统参数表增加金额审核启用标记，给单据增加来源字段

Browse Source
This commit is contained in:
季圣华
2023-03-09 00:01:50 +08:00
parent 00cabc2612
commit 61d9d8704f
28 changed files with 608 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,8 @@ public class AccountHead {
private String status;
private String source;
private Long tenantId;
private String deleteFlag;
@@ -148,6 +150,14 @@ public class AccountHead {
this.status = status == null ? null : status.trim();
}
public String getSource() {
return source;
}
public void setSource(String source) {
this.source = source == null ? null : source.trim();
}
public Long getTenantId() {
return tenantId;
}

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

@@ -996,6 +996,76 @@ public class AccountHeadExample {
return (Criteria) this;
}
public Criteria andSourceIsNull() {
addCriterion("source is null");
return (Criteria) this;
}
public Criteria andSourceIsNotNull() {
addCriterion("source is not null");
return (Criteria) this;
}
public Criteria andSourceEqualTo(String value) {
addCriterion("source =", value, "source");
return (Criteria) this;
}
public Criteria andSourceNotEqualTo(String value) {
addCriterion("source <>", value, "source");
return (Criteria) this;
}
public Criteria andSourceGreaterThan(String value) {
addCriterion("source >", value, "source");
return (Criteria) this;
}
public Criteria andSourceGreaterThanOrEqualTo(String value) {
addCriterion("source >=", value, "source");
return (Criteria) this;
}
public Criteria andSourceLessThan(String value) {
addCriterion("source <", value, "source");
return (Criteria) this;
}
public Criteria andSourceLessThanOrEqualTo(String value) {
addCriterion("source <=", value, "source");
return (Criteria) this;
}
public Criteria andSourceLike(String value) {
addCriterion("source like", value, "source");
return (Criteria) this;
}
public Criteria andSourceNotLike(String value) {
addCriterion("source not like", value, "source");
return (Criteria) this;
}
public Criteria andSourceIn(List<String> values) {
addCriterion("source in", values, "source");
return (Criteria) this;
}
public Criteria andSourceNotIn(List<String> values) {
addCriterion("source not in", values, "source");
return (Criteria) this;
}
public Criteria andSourceBetween(String value1, String value2) {
addCriterion("source between", value1, value2, "source");
return (Criteria) this;
}
public Criteria andSourceNotBetween(String value1, String value2) {
addCriterion("source not between", value1, value2, "source");
return (Criteria) this;
}
public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null");
return (Criteria) this;

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

@@ -58,6 +58,8 @@ public class DepotHead {
private String purchaseStatus;
private String source;
private String linkNumber;
private Long tenantId;
@@ -280,6 +282,14 @@ public class DepotHead {
this.purchaseStatus = purchaseStatus == null ? null : purchaseStatus.trim();
}
public String getSource() {
return source;
}
public void setSource(String source) {
this.source = source == null ? null : source.trim();
}
public String getLinkNumber() {
return linkNumber;
}

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

@@ -1856,6 +1856,76 @@ public class DepotHeadExample {
return (Criteria) this;
}
public Criteria andSourceIsNull() {
addCriterion("source is null");
return (Criteria) this;
}
public Criteria andSourceIsNotNull() {
addCriterion("source is not null");
return (Criteria) this;
}
public Criteria andSourceEqualTo(String value) {
addCriterion("source =", value, "source");
return (Criteria) this;
}
public Criteria andSourceNotEqualTo(String value) {
addCriterion("source <>", value, "source");
return (Criteria) this;
}
public Criteria andSourceGreaterThan(String value) {
addCriterion("source >", value, "source");
return (Criteria) this;
}
public Criteria andSourceGreaterThanOrEqualTo(String value) {
addCriterion("source >=", value, "source");
return (Criteria) this;
}
public Criteria andSourceLessThan(String value) {
addCriterion("source <", value, "source");
return (Criteria) this;
}
public Criteria andSourceLessThanOrEqualTo(String value) {
addCriterion("source <=", value, "source");
return (Criteria) this;
}
public Criteria andSourceLike(String value) {
addCriterion("source like", value, "source");
return (Criteria) this;
}
public Criteria andSourceNotLike(String value) {
addCriterion("source not like", value, "source");
return (Criteria) this;
}
public Criteria andSourceIn(List<String> values) {
addCriterion("source in", values, "source");
return (Criteria) this;
}
public Criteria andSourceNotIn(List<String> values) {
addCriterion("source not in", values, "source");
return (Criteria) this;
}
public Criteria andSourceBetween(String value1, String value2) {
addCriterion("source between", value1, value2, "source");
return (Criteria) this;
}
public Criteria andSourceNotBetween(String value1, String value2) {
addCriterion("source not between", value1, value2, "source");
return (Criteria) this;
}
public Criteria andLinkNumberIsNull() {
addCriterion("link_number is null");
return (Criteria) this;

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

@@ -29,6 +29,8 @@ public class SystemConfig {
private String multiBillType;
private String amountApprovalFlag;
private Long tenantId;
private String deleteFlag;
@@ -145,6 +147,14 @@ public class SystemConfig {
this.multiBillType = multiBillType == null ? null : multiBillType.trim();
}
public String getAmountApprovalFlag() {
return amountApprovalFlag;
}
public void setAmountApprovalFlag(String amountApprovalFlag) {
this.amountApprovalFlag = amountApprovalFlag == null ? null : amountApprovalFlag.trim();
}
public Long getTenantId() {
return tenantId;
}

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

@@ -1074,6 +1074,76 @@ public class SystemConfigExample {
return (Criteria) this;
}
public Criteria andAmountApprovalFlagIsNull() {
addCriterion("amount_approval_flag is null");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagIsNotNull() {
addCriterion("amount_approval_flag is not null");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagEqualTo(String value) {
addCriterion("amount_approval_flag =", value, "amountApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagNotEqualTo(String value) {
addCriterion("amount_approval_flag <>", value, "amountApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagGreaterThan(String value) {
addCriterion("amount_approval_flag >", value, "amountApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagGreaterThanOrEqualTo(String value) {
addCriterion("amount_approval_flag >=", value, "amountApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagLessThan(String value) {
addCriterion("amount_approval_flag <", value, "amountApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagLessThanOrEqualTo(String value) {
addCriterion("amount_approval_flag <=", value, "amountApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagLike(String value) {
addCriterion("amount_approval_flag like", value, "amountApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagNotLike(String value) {
addCriterion("amount_approval_flag not like", value, "amountApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagIn(List<String> values) {
addCriterion("amount_approval_flag in", values, "amountApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagNotIn(List<String> values) {
addCriterion("amount_approval_flag not in", values, "amountApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagBetween(String value1, String value2) {
addCriterion("amount_approval_flag between", value1, value2, "amountApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagNotBetween(String value1, String value2) {
addCriterion("amount_approval_flag not between", value1, value2, "amountApprovalFlag");
return (Criteria) this;
}
public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null");
return (Criteria) this;

20
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Unit.java
View File

@@ -1,5 +1,7 @@
package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class Unit {
private Long id;
@@ -13,11 +15,11 @@ public class Unit {
private String otherUnitThree;
private Integer ratio;
private BigDecimal ratio;
private Integer ratioTwo;
private BigDecimal ratioTwo;
private Integer ratioThree;
private BigDecimal ratioThree;
private Boolean enabled;
@@ -73,27 +75,27 @@ public class Unit {
this.otherUnitThree = otherUnitThree == null ? null : otherUnitThree.trim();
}
public Integer getRatio() {
public BigDecimal getRatio() {
return ratio;
}
public void setRatio(Integer ratio) {
public void setRatio(BigDecimal ratio) {
this.ratio = ratio;
}
public Integer getRatioTwo() {
public BigDecimal getRatioTwo() {
return ratioTwo;
}
public void setRatioTwo(Integer ratioTwo) {
public void setRatioTwo(BigDecimal ratioTwo) {
this.ratioTwo = ratioTwo;
}
public Integer getRatioThree() {
public BigDecimal getRatioThree() {
return ratioThree;
}
public void setRatioThree(Integer ratioThree) {
public void setRatioThree(BigDecimal ratioThree) {
this.ratioThree = ratioThree;
}

61
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/UnitExample.java
View File

@@ -1,5 +1,6 @@
package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@@ -524,52 +525,52 @@ public class UnitExample {
return (Criteria) this;
}
public Criteria andRatioEqualTo(Integer value) {
public Criteria andRatioEqualTo(BigDecimal value) {
addCriterion("ratio =", value, "ratio");
return (Criteria) this;
}
public Criteria andRatioNotEqualTo(Integer value) {
public Criteria andRatioNotEqualTo(BigDecimal value) {
addCriterion("ratio <>", value, "ratio");
return (Criteria) this;
}
public Criteria andRatioGreaterThan(Integer value) {
public Criteria andRatioGreaterThan(BigDecimal value) {
addCriterion("ratio >", value, "ratio");
return (Criteria) this;
}
public Criteria andRatioGreaterThanOrEqualTo(Integer value) {
public Criteria andRatioGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("ratio >=", value, "ratio");
return (Criteria) this;
}
public Criteria andRatioLessThan(Integer value) {
public Criteria andRatioLessThan(BigDecimal value) {
addCriterion("ratio <", value, "ratio");
return (Criteria) this;
}
public Criteria andRatioLessThanOrEqualTo(Integer value) {
public Criteria andRatioLessThanOrEqualTo(BigDecimal value) {
addCriterion("ratio <=", value, "ratio");
return (Criteria) this;
}
public Criteria andRatioIn(List<Integer> values) {
public Criteria andRatioIn(List<BigDecimal> values) {
addCriterion("ratio in", values, "ratio");
return (Criteria) this;
}
public Criteria andRatioNotIn(List<Integer> values) {
public Criteria andRatioNotIn(List<BigDecimal> values) {
addCriterion("ratio not in", values, "ratio");
return (Criteria) this;
}
public Criteria andRatioBetween(Integer value1, Integer value2) {
public Criteria andRatioBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("ratio between", value1, value2, "ratio");
return (Criteria) this;
}
public Criteria andRatioNotBetween(Integer value1, Integer value2) {
public Criteria andRatioNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("ratio not between", value1, value2, "ratio");
return (Criteria) this;
}
@@ -584,52 +585,52 @@ public class UnitExample {
return (Criteria) this;
}
public Criteria andRatioTwoEqualTo(Integer value) {
public Criteria andRatioTwoEqualTo(BigDecimal value) {
addCriterion("ratio_two =", value, "ratioTwo");
return (Criteria) this;
}
public Criteria andRatioTwoNotEqualTo(Integer value) {
public Criteria andRatioTwoNotEqualTo(BigDecimal value) {
addCriterion("ratio_two <>", value, "ratioTwo");
return (Criteria) this;
}
public Criteria andRatioTwoGreaterThan(Integer value) {
public Criteria andRatioTwoGreaterThan(BigDecimal value) {
addCriterion("ratio_two >", value, "ratioTwo");
return (Criteria) this;
}
public Criteria andRatioTwoGreaterThanOrEqualTo(Integer value) {
public Criteria andRatioTwoGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("ratio_two >=", value, "ratioTwo");
return (Criteria) this;
}
public Criteria andRatioTwoLessThan(Integer value) {
public Criteria andRatioTwoLessThan(BigDecimal value) {
addCriterion("ratio_two <", value, "ratioTwo");
return (Criteria) this;
}
public Criteria andRatioTwoLessThanOrEqualTo(Integer value) {
public Criteria andRatioTwoLessThanOrEqualTo(BigDecimal value) {
addCriterion("ratio_two <=", value, "ratioTwo");
return (Criteria) this;
}
public Criteria andRatioTwoIn(List<Integer> values) {
public Criteria andRatioTwoIn(List<BigDecimal> values) {
addCriterion("ratio_two in", values, "ratioTwo");
return (Criteria) this;
}
public Criteria andRatioTwoNotIn(List<Integer> values) {
public Criteria andRatioTwoNotIn(List<BigDecimal> values) {
addCriterion("ratio_two not in", values, "ratioTwo");
return (Criteria) this;
}
public Criteria andRatioTwoBetween(Integer value1, Integer value2) {
public Criteria andRatioTwoBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("ratio_two between", value1, value2, "ratioTwo");
return (Criteria) this;
}
public Criteria andRatioTwoNotBetween(Integer value1, Integer value2) {
public Criteria andRatioTwoNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("ratio_two not between", value1, value2, "ratioTwo");
return (Criteria) this;
}
@@ -644,52 +645,52 @@ public class UnitExample {
return (Criteria) this;
}
public Criteria andRatioThreeEqualTo(Integer value) {
public Criteria andRatioThreeEqualTo(BigDecimal value) {
addCriterion("ratio_three =", value, "ratioThree");
return (Criteria) this;
}
public Criteria andRatioThreeNotEqualTo(Integer value) {
public Criteria andRatioThreeNotEqualTo(BigDecimal value) {
addCriterion("ratio_three <>", value, "ratioThree");
return (Criteria) this;
}
public Criteria andRatioThreeGreaterThan(Integer value) {
public Criteria andRatioThreeGreaterThan(BigDecimal value) {
addCriterion("ratio_three >", value, "ratioThree");
return (Criteria) this;
}
public Criteria andRatioThreeGreaterThanOrEqualTo(Integer value) {
public Criteria andRatioThreeGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("ratio_three >=", value, "ratioThree");
return (Criteria) this;
}
public Criteria andRatioThreeLessThan(Integer value) {
public Criteria andRatioThreeLessThan(BigDecimal value) {
addCriterion("ratio_three <", value, "ratioThree");
return (Criteria) this;
}
public Criteria andRatioThreeLessThanOrEqualTo(Integer value) {
public Criteria andRatioThreeLessThanOrEqualTo(BigDecimal value) {
addCriterion("ratio_three <=", value, "ratioThree");
return (Criteria) this;
}
public Criteria andRatioThreeIn(List<Integer> values) {
public Criteria andRatioThreeIn(List<BigDecimal> values) {
addCriterion("ratio_three in", values, "ratioThree");
return (Criteria) this;
}
public Criteria andRatioThreeNotIn(List<Integer> values) {
public Criteria andRatioThreeNotIn(List<BigDecimal> values) {
addCriterion("ratio_three not in", values, "ratioThree");
return (Criteria) this;
}
public Criteria andRatioThreeBetween(Integer value1, Integer value2) {
public Criteria andRatioThreeBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("ratio_three between", value1, value2, "ratioThree");
return (Criteria) this;
}
public Criteria andRatioThreeNotBetween(Integer value1, Integer value2) {
public Criteria andRatioThreeNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("ratio_three not between", value1, value2, "ratioThree");
return (Criteria) this;
}

12
jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
View File

@@ -69,6 +69,7 @@ public interface DepotHeadMapperEx {
@Param("type") String type,
@Param("creatorArray") String[] creatorArray,
@Param("organArray") String[] organArray,
@Param("amountApprovalFlag") Boolean amountApprovalFlag,
@Param("materialParam") String materialParam,
@Param("depotList") List<Long> depotList,
@Param("oId") Integer oId,
@@ -83,6 +84,7 @@ public interface DepotHeadMapperEx {
@Param("type") String type,
@Param("creatorArray") String[] creatorArray,
@Param("organArray") String[] organArray,
@Param("amountApprovalFlag") Boolean amountApprovalFlag,
@Param("materialParam") String materialParam,
@Param("depotList") List<Long> depotList,
@Param("oId") Integer oId,
@@ -93,6 +95,7 @@ public interface DepotHeadMapperEx {
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,
@Param("amountApprovalFlag") Boolean amountApprovalFlag,
@Param("materialParam") String materialParam,
@Param("depotList") List<Long> depotList,
@Param("oId") Integer oId,
@@ -105,6 +108,7 @@ public interface DepotHeadMapperEx {
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,
@Param("amountApprovalFlag") Boolean amountApprovalFlag,
@Param("materialParam") String materialParam,
@Param("depotList") List<Long> depotList,
@Param("oId") Integer oId,
@@ -117,6 +121,7 @@ public interface DepotHeadMapperEx {
@Param("subType") String subType,
@Param("number") String number,
@Param("creatorArray") String[] creatorArray,
@Param("amountApprovalFlag") Boolean amountApprovalFlag,
@Param("materialParam") String materialParam,
@Param("depotList") List<Long> depotList,
@Param("depotFList") List<Long> depotFList,
@@ -130,6 +135,7 @@ public interface DepotHeadMapperEx {
@Param("subType") String subType,
@Param("number") String number,
@Param("creatorArray") String[] creatorArray,
@Param("amountApprovalFlag") Boolean amountApprovalFlag,
@Param("materialParam") String materialParam,
@Param("depotList") List<Long> depotList,
@Param("depotFList") List<Long> depotFList,
@@ -206,14 +212,16 @@ public interface DepotHeadMapperEx {
@Param("hasSupplier") Integer hasSupplier,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("creatorArray") String[] creatorArray);
@Param("creatorArray") String[] creatorArray,
@Param("amountApprovalFlag") Boolean amountApprovalFlag);
BigDecimal getBuyAndSaleRetailStatistics(
@Param("type") String type,
@Param("subType") String subType,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("creatorArray") String[] creatorArray);
@Param("creatorArray") String[] creatorArray,
@Param("amountApprovalFlag") Boolean amountApprovalFlag);
List<DepotHeadVo4List> debtList(
@Param("organId") Long organId,

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java
View File

@@ -68,6 +68,7 @@ public interface DepotItemMapperEx {
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("creatorArray") String[] creatorArray,
@Param("amountApprovalFlag") Boolean amountApprovalFlag,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
@@ -76,7 +77,8 @@ public interface DepotItemMapperEx {
@Param("billType") String billType,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("creatorArray") String[] creatorArray);
@Param("creatorArray") String[] creatorArray,
@Param("amountApprovalFlag") Boolean amountApprovalFlag);
BigDecimal buyOrSaleNumber(
@Param("type") String type,
@@ -101,14 +103,16 @@ public interface DepotItemMapperEx {
@Param("subType") String subType,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("creatorArray") String[] creatorArray);
@Param("creatorArray") String[] creatorArray,
@Param("amountApprovalFlag") Boolean amountApprovalFlag);
BigDecimal inOrOutRetailPrice(
@Param("type") String type,
@Param("subType") String subType,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("creatorArray") String[] creatorArray);
@Param("creatorArray") String[] creatorArray,
@Param("amountApprovalFlag") Boolean amountApprovalFlag);
BigDecimal getStockCheckSumByDepotList(
@Param("depotList") List<Long> depotList,