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-17 23:05:03 +08:00
parent 234ac15087
commit e9098efcd2
16 changed files with 162 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,9 +29,7 @@ public class SystemConfig {
private String multiBillType;
private String amountApprovalFlag;
private String stockApprovalFlag;
private String forceApprovalFlag;
private Long tenantId;
@@ -149,20 +147,12 @@ public class SystemConfig {
this.multiBillType = multiBillType == null ? null : multiBillType.trim();
}
public String getAmountApprovalFlag() {
return amountApprovalFlag;
public String getForceApprovalFlag() {
return forceApprovalFlag;
}
public void setAmountApprovalFlag(String amountApprovalFlag) {
this.amountApprovalFlag = amountApprovalFlag == null ? null : amountApprovalFlag.trim();
}
public String getStockApprovalFlag() {
return stockApprovalFlag;
}
public void setStockApprovalFlag(String stockApprovalFlag) {
this.stockApprovalFlag = stockApprovalFlag == null ? null : stockApprovalFlag.trim();
public void setForceApprovalFlag(String forceApprovalFlag) {
this.forceApprovalFlag = forceApprovalFlag == null ? null : forceApprovalFlag.trim();
}
public Long getTenantId() {

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

@@ -1074,143 +1074,73 @@ public class SystemConfigExample {
return (Criteria) this;
}
public Criteria andAmountApprovalFlagIsNull() {
addCriterion("amount_approval_flag is null");
public Criteria andForceApprovalFlagIsNull() {
addCriterion("force_approval_flag is null");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagIsNotNull() {
addCriterion("amount_approval_flag is not null");
public Criteria andForceApprovalFlagIsNotNull() {
addCriterion("force_approval_flag is not null");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagEqualTo(String value) {
addCriterion("amount_approval_flag =", value, "amountApprovalFlag");
public Criteria andForceApprovalFlagEqualTo(String value) {
addCriterion("force_approval_flag =", value, "forceApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagNotEqualTo(String value) {
addCriterion("amount_approval_flag <>", value, "amountApprovalFlag");
public Criteria andForceApprovalFlagNotEqualTo(String value) {
addCriterion("force_approval_flag <>", value, "forceApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagGreaterThan(String value) {
addCriterion("amount_approval_flag >", value, "amountApprovalFlag");
public Criteria andForceApprovalFlagGreaterThan(String value) {
addCriterion("force_approval_flag >", value, "forceApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagGreaterThanOrEqualTo(String value) {
addCriterion("amount_approval_flag >=", value, "amountApprovalFlag");
public Criteria andForceApprovalFlagGreaterThanOrEqualTo(String value) {
addCriterion("force_approval_flag >=", value, "forceApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagLessThan(String value) {
addCriterion("amount_approval_flag <", value, "amountApprovalFlag");
public Criteria andForceApprovalFlagLessThan(String value) {
addCriterion("force_approval_flag <", value, "forceApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagLessThanOrEqualTo(String value) {
addCriterion("amount_approval_flag <=", value, "amountApprovalFlag");
public Criteria andForceApprovalFlagLessThanOrEqualTo(String value) {
addCriterion("force_approval_flag <=", value, "forceApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagLike(String value) {
addCriterion("amount_approval_flag like", value, "amountApprovalFlag");
public Criteria andForceApprovalFlagLike(String value) {
addCriterion("force_approval_flag like", value, "forceApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagNotLike(String value) {
addCriterion("amount_approval_flag not like", value, "amountApprovalFlag");
public Criteria andForceApprovalFlagNotLike(String value) {
addCriterion("force_approval_flag not like", value, "forceApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagIn(List<String> values) {
addCriterion("amount_approval_flag in", values, "amountApprovalFlag");
public Criteria andForceApprovalFlagIn(List<String> values) {
addCriterion("force_approval_flag in", values, "forceApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagNotIn(List<String> values) {
addCriterion("amount_approval_flag not in", values, "amountApprovalFlag");
public Criteria andForceApprovalFlagNotIn(List<String> values) {
addCriterion("force_approval_flag not in", values, "forceApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagBetween(String value1, String value2) {
addCriterion("amount_approval_flag between", value1, value2, "amountApprovalFlag");
public Criteria andForceApprovalFlagBetween(String value1, String value2) {
addCriterion("force_approval_flag between", value1, value2, "forceApprovalFlag");
return (Criteria) this;
}
public Criteria andAmountApprovalFlagNotBetween(String value1, String value2) {
addCriterion("amount_approval_flag not between", value1, value2, "amountApprovalFlag");
return (Criteria) this;
}
public Criteria andStockApprovalFlagIsNull() {
addCriterion("stock_approval_flag is null");
return (Criteria) this;
}
public Criteria andStockApprovalFlagIsNotNull() {
addCriterion("stock_approval_flag is not null");
return (Criteria) this;
}
public Criteria andStockApprovalFlagEqualTo(String value) {
addCriterion("stock_approval_flag =", value, "stockApprovalFlag");
return (Criteria) this;
}
public Criteria andStockApprovalFlagNotEqualTo(String value) {
addCriterion("stock_approval_flag <>", value, "stockApprovalFlag");
return (Criteria) this;
}
public Criteria andStockApprovalFlagGreaterThan(String value) {
addCriterion("stock_approval_flag >", value, "stockApprovalFlag");
return (Criteria) this;
}
public Criteria andStockApprovalFlagGreaterThanOrEqualTo(String value) {
addCriterion("stock_approval_flag >=", value, "stockApprovalFlag");
return (Criteria) this;
}
public Criteria andStockApprovalFlagLessThan(String value) {
addCriterion("stock_approval_flag <", value, "stockApprovalFlag");
return (Criteria) this;
}
public Criteria andStockApprovalFlagLessThanOrEqualTo(String value) {
addCriterion("stock_approval_flag <=", value, "stockApprovalFlag");
return (Criteria) this;
}
public Criteria andStockApprovalFlagLike(String value) {
addCriterion("stock_approval_flag like", value, "stockApprovalFlag");
return (Criteria) this;
}
public Criteria andStockApprovalFlagNotLike(String value) {
addCriterion("stock_approval_flag not like", value, "stockApprovalFlag");
return (Criteria) this;
}
public Criteria andStockApprovalFlagIn(List<String> values) {
addCriterion("stock_approval_flag in", values, "stockApprovalFlag");
return (Criteria) this;
}
public Criteria andStockApprovalFlagNotIn(List<String> values) {
addCriterion("stock_approval_flag not in", values, "stockApprovalFlag");
return (Criteria) this;
}
public Criteria andStockApprovalFlagBetween(String value1, String value2) {
addCriterion("stock_approval_flag between", value1, value2, "stockApprovalFlag");
return (Criteria) this;
}
public Criteria andStockApprovalFlagNotBetween(String value1, String value2) {
addCriterion("stock_approval_flag not between", value1, value2, "stockApprovalFlag");
public Criteria andForceApprovalFlagNotBetween(String value1, String value2) {
addCriterion("force_approval_flag not between", value1, value2, "forceApprovalFlag");
return (Criteria) this;
}

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

@@ -69,7 +69,7 @@ public interface DepotHeadMapperEx {
@Param("type") String type,
@Param("creatorArray") String[] creatorArray,
@Param("organArray") String[] organArray,
@Param("amountApprovalFlag") Boolean amountApprovalFlag,
@Param("forceFlag") Boolean forceFlag,
@Param("materialParam") String materialParam,
@Param("depotList") List<Long> depotList,
@Param("oId") Integer oId,
@@ -84,7 +84,7 @@ public interface DepotHeadMapperEx {
@Param("type") String type,
@Param("creatorArray") String[] creatorArray,
@Param("organArray") String[] organArray,
@Param("amountApprovalFlag") Boolean amountApprovalFlag,
@Param("forceFlag") Boolean forceFlag,
@Param("materialParam") String materialParam,
@Param("depotList") List<Long> depotList,
@Param("oId") Integer oId,
@@ -95,7 +95,7 @@ public interface DepotHeadMapperEx {
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,
@Param("amountApprovalFlag") Boolean amountApprovalFlag,
@Param("forceFlag") Boolean forceFlag,
@Param("materialParam") String materialParam,
@Param("depotList") List<Long> depotList,
@Param("oId") Integer oId,
@@ -108,7 +108,7 @@ public interface DepotHeadMapperEx {
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,
@Param("amountApprovalFlag") Boolean amountApprovalFlag,
@Param("forceFlag") Boolean forceFlag,
@Param("materialParam") String materialParam,
@Param("depotList") List<Long> depotList,
@Param("oId") Integer oId,
@@ -121,7 +121,7 @@ public interface DepotHeadMapperEx {
@Param("subType") String subType,
@Param("number") String number,
@Param("creatorArray") String[] creatorArray,
@Param("amountApprovalFlag") Boolean amountApprovalFlag,
@Param("forceFlag") Boolean forceFlag,
@Param("materialParam") String materialParam,
@Param("depotList") List<Long> depotList,
@Param("depotFList") List<Long> depotFList,
@@ -135,7 +135,7 @@ public interface DepotHeadMapperEx {
@Param("subType") String subType,
@Param("number") String number,
@Param("creatorArray") String[] creatorArray,
@Param("amountApprovalFlag") Boolean amountApprovalFlag,
@Param("forceFlag") Boolean forceFlag,
@Param("materialParam") String materialParam,
@Param("depotList") List<Long> depotList,
@Param("depotFList") List<Long> depotFList,
@@ -213,7 +213,7 @@ public interface DepotHeadMapperEx {
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("creatorArray") String[] creatorArray,
@Param("amountApprovalFlag") Boolean amountApprovalFlag);
@Param("forceFlag") Boolean forceFlag);
BigDecimal getBuyAndSaleRetailStatistics(
@Param("type") String type,
@@ -221,7 +221,7 @@ public interface DepotHeadMapperEx {
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("creatorArray") String[] creatorArray,
@Param("amountApprovalFlag") Boolean amountApprovalFlag);
@Param("forceFlag") Boolean forceFlag);
List<DepotHeadVo4List> debtList(
@Param("organId") Long organId,

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

@@ -70,7 +70,7 @@ public interface DepotItemMapperEx {
@Param("creatorArray") String[] creatorArray,
@Param("organArray") String [] organArray,
@Param("depotList") List<Long> depotList,
@Param("amountApprovalFlag") Boolean amountApprovalFlag,
@Param("forceFlag") Boolean forceFlag,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
@@ -82,7 +82,7 @@ public interface DepotItemMapperEx {
@Param("creatorArray") String[] creatorArray,
@Param("organArray") String [] organArray,
@Param("depotList") List<Long> depotList,
@Param("amountApprovalFlag") Boolean amountApprovalFlag);
@Param("forceFlag") Boolean forceFlag);
BigDecimal buyOrSaleNumber(
@Param("type") String type,
@@ -112,7 +112,7 @@ public interface DepotItemMapperEx {
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("creatorArray") String[] creatorArray,
@Param("amountApprovalFlag") Boolean amountApprovalFlag);
@Param("forceFlag") Boolean forceFlag);
BigDecimal inOrOutRetailPrice(
@Param("type") String type,
@@ -120,26 +120,26 @@ public interface DepotItemMapperEx {
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("creatorArray") String[] creatorArray,
@Param("amountApprovalFlag") Boolean amountApprovalFlag);
@Param("forceFlag") Boolean forceFlag);
BigDecimal getStockCheckSumByDepotList(
@Param("depotList") List<Long> depotList,
@Param("mId") Long mId,
@Param("stockApprovalFlag") Boolean stockApprovalFlag,
@Param("forceFlag") Boolean forceFlag,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime);
DepotItemVo4Stock getSkuStockByParamWithDepotList(
@Param("depotList") List<Long> depotList,
@Param("meId") Long meId,
@Param("stockApprovalFlag") Boolean stockApprovalFlag,
@Param("forceFlag") Boolean forceFlag,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime);
DepotItemVo4Stock getStockByParamWithDepotList(
@Param("depotList") List<Long> depotList,
@Param("mId") Long mId,
@Param("stockApprovalFlag") Boolean stockApprovalFlag,
@Param("forceFlag") Boolean forceFlag,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime);