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

优化单据接口

Browse Source
This commit is contained in:
季圣华
2020-07-08 23:52:18 +08:00
parent fda716cd03
commit fd80ad6c43
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erp_web/js/easyui/themes/icon.css
View File

@@ -108,4 +108,7 @@
} }
.icon-user{ .icon-user{
background:url('icons/user.png') no-repeat center center; background:url('icons/user.png') no-repeat center center;
}
.icon-nullify{
background:url('icons/nullify.png') no-repeat center center;
} }

BIN
erp_web/js/easyui/themes/icons/nullify.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

4
src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -178,8 +178,10 @@ public class DepotItemController {
String materialOther = getOtherInfo(mpArr, diEx); String materialOther = getOtherInfo(mpArr, diEx);
MaterialName = MaterialName + materialOther + ((diEx.getUName() == null || diEx.getUName().equals("")) ? "" : "(" + diEx.getUName() + ")") + ratio; MaterialName = MaterialName + materialOther + ((diEx.getUName() == null || diEx.getUName().equals("")) ? "" : "(" + diEx.getUName() + ")") + ratio;
item.put("MaterialName", MaterialName == null ? "" : MaterialName); item.put("MaterialName", MaterialName == null ? "" : MaterialName);
item.put("Stock", depotItemService.getStockByParam(diEx.getDepotid(),diEx.getMaterialid(),null,null,tenantId)); BigDecimal stock = depotItemService.getStockByParam(diEx.getDepotid(),diEx.getMaterialid(),null,null,tenantId);
item.put("Stock", stock);
item.put("Unit", diEx.getMunit()); item.put("Unit", diEx.getMunit());
item.put("currentStock", diEx.getOpernumber().add(stock));
item.put("OperNumber", diEx.getOpernumber()); item.put("OperNumber", diEx.getOpernumber());
item.put("BasicNumber", diEx.getBasicnumber()); item.put("BasicNumber", diEx.getBasicnumber());
item.put("UnitPrice", diEx.getUnitprice()); item.put("UnitPrice", diEx.getUnitprice());