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-31 23:46:10 +08:00
parent 1698b1fd8a
commit c9ac3d2197
3 changed files with 64 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -554,6 +554,14 @@ public class DepotItemController {
diEx.setMOtherField3(disw.getMOtherField3());
disw.setMaterialOther(getOtherInfo(mpArr, diEx));
disw.setMaterialUnit(getUName(disw.getMaterialUnit(), disw.getUnitName()));
if(disw.getCurrentNumber().compareTo(disw.getLowSafeStock())<0) {
disw.setLowCritical(disw.getLowSafeStock().subtract(disw.getCurrentNumber()));
disw.setHighCritical(BigDecimal.ZERO);
}
if(disw.getCurrentNumber().compareTo(disw.getHighSafeStock())>0) {
disw.setLowCritical(BigDecimal.ZERO);
disw.setHighCritical(disw.getCurrentNumber().subtract(disw.getHighSafeStock()));
}
}
}
int total = depotItemService.findStockWarningCountTotal(materialParam,depotId);

52
jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotItemStockWarningCount.java
View File

@@ -31,11 +31,17 @@ public class DepotItemStockWarningCount {
private String MOtherField3;
private BigDecimal safetystock;//安全库存量
private String depotName;
private BigDecimal currentNumber;//库存
private BigDecimal currentNumber;
private BigDecimal linjieNumber;//临界库存
private BigDecimal lowSafeStock;
private BigDecimal highSafeStock;
private BigDecimal lowCritical;
private BigDecimal highCritical;
public Long getMId() {
return MId;
@@ -141,12 +147,12 @@ public class DepotItemStockWarningCount {
this.MOtherField3 = MOtherField3;
}
public BigDecimal getSafetystock() {
return safetystock;
public String getDepotName() {
return depotName;
}
public void setSafetystock(BigDecimal safetystock) {
this.safetystock = safetystock;
public void setDepotName(String depotName) {
this.depotName = depotName;
}
public BigDecimal getCurrentNumber() {
@@ -157,11 +163,35 @@ public class DepotItemStockWarningCount {
this.currentNumber = currentNumber;
}
public BigDecimal getLinjieNumber() {
return linjieNumber;
public BigDecimal getLowSafeStock() {
return lowSafeStock;
}
public void setLinjieNumber(BigDecimal linjieNumber) {
this.linjieNumber = linjieNumber;
public void setLowSafeStock(BigDecimal lowSafeStock) {
this.lowSafeStock = lowSafeStock;
}
public BigDecimal getHighSafeStock() {
return highSafeStock;
}
public void setHighSafeStock(BigDecimal highSafeStock) {
this.highSafeStock = highSafeStock;
}
public BigDecimal getLowCritical() {
return lowCritical;
}
public void setLowCritical(BigDecimal lowCritical) {
this.lowCritical = lowCritical;
}
public BigDecimal getHighCritical() {
return highCritical;
}
public void setHighCritical(BigDecimal highCritical) {
this.highCritical = highCritical;
}
}