gyzz/openerp
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
Show Stats 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]);

8
src/main/webapp/pages/materials/material.jsp
View File

@ -65,12 +65,12 @@
</td>
</tr>
<tr>
<td>款号</td>
<td style="padding:5px"><input name="Model" id="Model" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 180px;height: 20px"/></td>
<td>型号</td>
<td style="padding:5px"><input name="Model" id="Model" class="easyui-validatebox" data-options="required:true,validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
</tr>
<tr>
<td>颜色</td>
<td style="padding:5px"><input name="Color" id="Color" class="easyui-validatebox" data-options="required:true,validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
<td style="padding:5px"><input name="Color" id="Color" class="easyui-validatebox" data-options="validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
</tr>
<tr>
<td>单位</td>
@ -316,7 +316,7 @@
columns:[[
{ field: 'Id',width:35,align:"center",checkbox:true},
{ title: '名称',field: 'Name',width:80},
{ title: '款号',field: 'Model',width:80},
{ title: '型号',field: 'Model',width:80},
{ title: '颜色',field: 'Color',width:40},
{ title: '单位',field: 'Unit',width:50},
{ title: '零售价',field: 'RetailPrice',width:50},

2
src/main/webapp/pages/reports/buy_in_report.jsp
View File

@ -78,7 +78,7 @@
pageList: [10,50,100],
columns:[[
{ title: '名称',field: 'MaterialName',width:60},
{ title: '款号',field: 'MaterialModel',width:80},
{ title: '型号',field: 'MaterialModel',width:80},
{ title: '颜色',field: 'MaterialColor',width:80},
{ title: '单位',field: 'MaterialUnit',width:80},
{ title: '进货数量',field: 'InSum',width:60},

2
src/main/webapp/pages/reports/in_out_stock_report.jsp
View File

@ -98,7 +98,7 @@
pageList: [10,50,100],
columns:[[
{ title: '名称',field: 'MaterialName',width:60},
{ title: '款号',field: 'MaterialModel',width:80},
{ title: '型号',field: 'MaterialModel',width:80},
{ title: '颜色',field: 'MaterialColor',width:80},
{ title: '单位',field: 'MaterialUnit',width:80},
{ title: '单价',field: 'UnitPrice',width:60,formatter: function(value,row,index){

2
src/main/webapp/pages/reports/sale_out_report.jsp
View File

@ -80,7 +80,7 @@
pageList: [10,50,100],
columns:[[
{ title: '名称',field: 'MaterialName',width:60},
{ title: '款号',field: 'MaterialModel',width:80},
{ title: '型号',field: 'MaterialModel',width:80},
{ title: '颜色',field: 'MaterialColor',width:80},
{ title: '单位',field: 'MaterialUnit',width:80},
{ title: '销售数量',field: 'OutSum',width:60},