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

给报表中增加单位

Browse Source
This commit is contained in:
季圣华
2021-08-07 21:13:29 +08:00
parent 491a74e424
commit a7d6c71e45
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -287,7 +287,7 @@ public class DepotItemController {
String materialOther = getOtherInfo(mpArr, diEx);
item.put("materialOther", materialOther);
item.put("materialColor", diEx.getMColor());
item.put("unitName", getUName(diEx.getMaterialUnit(), diEx.getUnitName()));
item.put("unitName", diEx.getMaterialUnit());
item.put("prevSum", depotItemService.getStockByParam(depotId,mId,null,timeA));
item.put("inSum", depotItemService.getInNumByParam(depotId,mId,timeA,timeB));

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InOutMCount.java
View File

@@ -17,6 +17,8 @@ public class DepotHeadVo4InOutMCount {
private String categoryName;
private String materialUnit;
private BigDecimal numSum;
private BigDecimal priceSum;
@@ -71,6 +73,14 @@ public class DepotHeadVo4InOutMCount {
this.categoryName = categoryName;
}
public String getMaterialUnit() {
return materialUnit;
}
public void setMaterialUnit(String materialUnit) {
this.materialUnit = materialUnit;
}
public BigDecimal getNumSum() {
return numSum;
}