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

优化安全库存，调整为每个仓库的安全库存

Browse Source
This commit is contained in:
季圣华
2021-10-29 19:52:20 +08:00
parent 8f30705c79
commit 72e3e31c4a
13 changed files with 383 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotEx.java
View File

@@ -19,4 +19,8 @@ public class DepotEx extends Depot{
private BigDecimal currentStock;
private BigDecimal lowSafeStock;
private BigDecimal highSafeStock;
}

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

@@ -11,8 +11,6 @@ public class Material {
private String mfrs;
private BigDecimal safetyStock;
private String model;
private String standard;
@@ -29,6 +27,8 @@ public class Material {
private Integer expiryNum;
private BigDecimal weight;
private Boolean enabled;
private String otherField1;
@@ -77,14 +77,6 @@ public class Material {
this.mfrs = mfrs == null ? null : mfrs.trim();
}
public BigDecimal getSafetyStock() {
return safetyStock;
}
public void setSafetyStock(BigDecimal safetyStock) {
this.safetyStock = safetyStock;
}
public String getModel() {
return model;
}
@@ -149,6 +141,14 @@ public class Material {
this.expiryNum = expiryNum;
}
public BigDecimal getWeight() {
return weight;
}
public void setWeight(BigDecimal weight) {
this.weight = weight;
}
public Boolean getEnabled() {
return enabled;
}

120
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java
View File

@@ -365,66 +365,6 @@ public class MaterialExample {
return (Criteria) this;
}
public Criteria andSafetyStockIsNull() {
addCriterion("safety_stock is null");
return (Criteria) this;
}
public Criteria andSafetyStockIsNotNull() {
addCriterion("safety_stock is not null");
return (Criteria) this;
}
public Criteria andSafetyStockEqualTo(BigDecimal value) {
addCriterion("safety_stock =", value, "safetyStock");
return (Criteria) this;
}
public Criteria andSafetyStockNotEqualTo(BigDecimal value) {
addCriterion("safety_stock <>", value, "safetyStock");
return (Criteria) this;
}
public Criteria andSafetyStockGreaterThan(BigDecimal value) {
addCriterion("safety_stock >", value, "safetyStock");
return (Criteria) this;
}
public Criteria andSafetyStockGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("safety_stock >=", value, "safetyStock");
return (Criteria) this;
}
public Criteria andSafetyStockLessThan(BigDecimal value) {
addCriterion("safety_stock <", value, "safetyStock");
return (Criteria) this;
}
public Criteria andSafetyStockLessThanOrEqualTo(BigDecimal value) {
addCriterion("safety_stock <=", value, "safetyStock");
return (Criteria) this;
}
public Criteria andSafetyStockIn(List<BigDecimal> values) {
addCriterion("safety_stock in", values, "safetyStock");
return (Criteria) this;
}
public Criteria andSafetyStockNotIn(List<BigDecimal> values) {
addCriterion("safety_stock not in", values, "safetyStock");
return (Criteria) this;
}
public Criteria andSafetyStockBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("safety_stock between", value1, value2, "safetyStock");
return (Criteria) this;
}
public Criteria andSafetyStockNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("safety_stock not between", value1, value2, "safetyStock");
return (Criteria) this;
}
public Criteria andModelIsNull() {
addCriterion("model is null");
return (Criteria) this;
@@ -965,6 +905,66 @@ public class MaterialExample {
return (Criteria) this;
}
public Criteria andWeightIsNull() {
addCriterion("weight is null");
return (Criteria) this;
}
public Criteria andWeightIsNotNull() {
addCriterion("weight is not null");
return (Criteria) this;
}
public Criteria andWeightEqualTo(BigDecimal value) {
addCriterion("weight =", value, "weight");
return (Criteria) this;
}
public Criteria andWeightNotEqualTo(BigDecimal value) {
addCriterion("weight <>", value, "weight");
return (Criteria) this;
}
public Criteria andWeightGreaterThan(BigDecimal value) {
addCriterion("weight >", value, "weight");
return (Criteria) this;
}
public Criteria andWeightGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("weight >=", value, "weight");
return (Criteria) this;
}
public Criteria andWeightLessThan(BigDecimal value) {
addCriterion("weight <", value, "weight");
return (Criteria) this;
}
public Criteria andWeightLessThanOrEqualTo(BigDecimal value) {
addCriterion("weight <=", value, "weight");
return (Criteria) this;
}
public Criteria andWeightIn(List<BigDecimal> values) {
addCriterion("weight in", values, "weight");
return (Criteria) this;
}
public Criteria andWeightNotIn(List<BigDecimal> values) {
addCriterion("weight not in", values, "weight");
return (Criteria) this;
}
public Criteria andWeightBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("weight between", value1, value2, "weight");
return (Criteria) this;
}
public Criteria andWeightNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("weight not between", value1, value2, "weight");
return (Criteria) this;
}
public Criteria andEnabledIsNull() {
addCriterion("enabled is null");
return (Criteria) this;

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

@@ -11,6 +11,10 @@ public class MaterialInitialStock {
private BigDecimal number;
private BigDecimal lowSafeStock;
private BigDecimal highSafeStock;
private Long tenantId;
private String deleteFlag;
@@ -47,6 +51,22 @@ public class MaterialInitialStock {
this.number = number;
}
public BigDecimal getLowSafeStock() {
return lowSafeStock;
}
public void setLowSafeStock(BigDecimal lowSafeStock) {
this.lowSafeStock = lowSafeStock;
}
public BigDecimal getHighSafeStock() {
return highSafeStock;
}
public void setHighSafeStock(BigDecimal highSafeStock) {
this.highSafeStock = highSafeStock;
}
public Long getTenantId() {
return tenantId;
}

120
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialInitialStockExample.java
View File

@@ -345,6 +345,126 @@ public class MaterialInitialStockExample {
return (Criteria) this;
}
public Criteria andLowSafeStockIsNull() {
addCriterion("low_safe_stock is null");
return (Criteria) this;
}
public Criteria andLowSafeStockIsNotNull() {
addCriterion("low_safe_stock is not null");
return (Criteria) this;
}
public Criteria andLowSafeStockEqualTo(BigDecimal value) {
addCriterion("low_safe_stock =", value, "lowSafeStock");
return (Criteria) this;
}
public Criteria andLowSafeStockNotEqualTo(BigDecimal value) {
addCriterion("low_safe_stock <>", value, "lowSafeStock");
return (Criteria) this;
}
public Criteria andLowSafeStockGreaterThan(BigDecimal value) {
addCriterion("low_safe_stock >", value, "lowSafeStock");
return (Criteria) this;
}
public Criteria andLowSafeStockGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("low_safe_stock >=", value, "lowSafeStock");
return (Criteria) this;
}
public Criteria andLowSafeStockLessThan(BigDecimal value) {
addCriterion("low_safe_stock <", value, "lowSafeStock");
return (Criteria) this;
}
public Criteria andLowSafeStockLessThanOrEqualTo(BigDecimal value) {
addCriterion("low_safe_stock <=", value, "lowSafeStock");
return (Criteria) this;
}
public Criteria andLowSafeStockIn(List<BigDecimal> values) {
addCriterion("low_safe_stock in", values, "lowSafeStock");
return (Criteria) this;
}
public Criteria andLowSafeStockNotIn(List<BigDecimal> values) {
addCriterion("low_safe_stock not in", values, "lowSafeStock");
return (Criteria) this;
}
public Criteria andLowSafeStockBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("low_safe_stock between", value1, value2, "lowSafeStock");
return (Criteria) this;
}
public Criteria andLowSafeStockNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("low_safe_stock not between", value1, value2, "lowSafeStock");
return (Criteria) this;
}
public Criteria andHighSafeStockIsNull() {
addCriterion("high_safe_stock is null");
return (Criteria) this;
}
public Criteria andHighSafeStockIsNotNull() {
addCriterion("high_safe_stock is not null");
return (Criteria) this;
}
public Criteria andHighSafeStockEqualTo(BigDecimal value) {
addCriterion("high_safe_stock =", value, "highSafeStock");
return (Criteria) this;
}
public Criteria andHighSafeStockNotEqualTo(BigDecimal value) {
addCriterion("high_safe_stock <>", value, "highSafeStock");
return (Criteria) this;
}
public Criteria andHighSafeStockGreaterThan(BigDecimal value) {
addCriterion("high_safe_stock >", value, "highSafeStock");
return (Criteria) this;
}
public Criteria andHighSafeStockGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("high_safe_stock >=", value, "highSafeStock");
return (Criteria) this;
}
public Criteria andHighSafeStockLessThan(BigDecimal value) {
addCriterion("high_safe_stock <", value, "highSafeStock");
return (Criteria) this;
}
public Criteria andHighSafeStockLessThanOrEqualTo(BigDecimal value) {
addCriterion("high_safe_stock <=", value, "highSafeStock");
return (Criteria) this;
}
public Criteria andHighSafeStockIn(List<BigDecimal> values) {
addCriterion("high_safe_stock in", values, "highSafeStock");
return (Criteria) this;
}
public Criteria andHighSafeStockNotIn(List<BigDecimal> values) {
addCriterion("high_safe_stock not in", values, "highSafeStock");
return (Criteria) this;
}
public Criteria andHighSafeStockBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("high_safe_stock between", value1, value2, "highSafeStock");
return (Criteria) this;
}
public Criteria andHighSafeStockNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("high_safe_stock not between", value1, value2, "highSafeStock");
return (Criteria) this;
}
public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null");
return (Criteria) this;