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

修改款号为型号、颜色去掉必填限制

Browse Source
This commit is contained in:
季圣华
2017-07-05 00:32:42 +08:00
parent bfb1fe531f
commit fd015b28cf
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/jsh/action/materials/MaterialAction.java
View File

@@ -320,8 +320,8 @@ public class MaterialAction extends BaseAction<MaterialModel>
item.put("Id", material.getId());
//名称
String MaterialName = ((material.getModel().equals(""))?"":""+material.getModel()) +" "+ material.getName()
+ ((material.getColor() == null)?"":"("+material.getColor() + ")")
+ ((material.getUnit() == null)?"":"("+material.getUnit() + ")");
+ ((material.getColor() == null || material.getColor().equals(""))?"":"("+material.getColor() + ")")
+ ((material.getUnit() == null || material.getUnit().equals(""))?"":"("+material.getUnit() + ")");
item.put("MaterialName", MaterialName);
dataArray.add(item);
}

2
src/main/java/com/jsh/service/materials/DepotItemService.java
View File

@@ -90,7 +90,7 @@ public class DepotItemService extends BaseService<DepotItem> implements DepotIte
WritableSheet sheet = workbook.createSheet("进销存报表", 0);
//增加列头
int[] colunmWidth = {10,10,10,10,10,15,15,15,15,15};
String[] colunmName = {"名称","款号","颜色","单位","单价","上月结存数量","入库数量","出库数量","本月结存数量","结存金额"};
String[] colunmName = {"名称","型号","颜色","单位","单价","上月结存数量","入库数量","出库数量","本月结存数量","结存金额"};
for(int i = 0 ;i < colunmWidth.length;i ++)
{
sheet.setColumnView(i,colunmWidth[i]);