From fd015b28cf08938cc7d260ec8e6d1e6a312208e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Wed, 5 Jul 2017 00:32:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AC=BE=E5=8F=B7=E4=B8=BA?= =?UTF-8?q?=E5=9E=8B=E5=8F=B7=E3=80=81=E9=A2=9C=E8=89=B2=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsh/action/materials/MaterialAction.java | 4 ++-- .../java/com/jsh/service/materials/DepotItemService.java | 2 +- src/main/webapp/pages/materials/material.jsp | 8 ++++---- src/main/webapp/pages/reports/buy_in_report.jsp | 2 +- src/main/webapp/pages/reports/in_out_stock_report.jsp | 2 +- src/main/webapp/pages/reports/sale_out_report.jsp | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/jsh/action/materials/MaterialAction.java b/src/main/java/com/jsh/action/materials/MaterialAction.java index 9fac20cd..017568b7 100644 --- a/src/main/java/com/jsh/action/materials/MaterialAction.java +++ b/src/main/java/com/jsh/action/materials/MaterialAction.java @@ -320,8 +320,8 @@ public class MaterialAction extends BaseAction 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); } diff --git a/src/main/java/com/jsh/service/materials/DepotItemService.java b/src/main/java/com/jsh/service/materials/DepotItemService.java index 9982b771..df0a6904 100644 --- a/src/main/java/com/jsh/service/materials/DepotItemService.java +++ b/src/main/java/com/jsh/service/materials/DepotItemService.java @@ -90,7 +90,7 @@ public class DepotItemService extends BaseService 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]); diff --git a/src/main/webapp/pages/materials/material.jsp b/src/main/webapp/pages/materials/material.jsp index f8139648..4a6ae81e 100644 --- a/src/main/webapp/pages/materials/material.jsp +++ b/src/main/webapp/pages/materials/material.jsp @@ -65,12 +65,12 @@ - 款号 - + 型号 + 颜色 - + 单位 @@ -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}, diff --git a/src/main/webapp/pages/reports/buy_in_report.jsp b/src/main/webapp/pages/reports/buy_in_report.jsp index 5ad0e637..ee2eb891 100644 --- a/src/main/webapp/pages/reports/buy_in_report.jsp +++ b/src/main/webapp/pages/reports/buy_in_report.jsp @@ -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}, diff --git a/src/main/webapp/pages/reports/in_out_stock_report.jsp b/src/main/webapp/pages/reports/in_out_stock_report.jsp index 1379cabb..580d0526 100644 --- a/src/main/webapp/pages/reports/in_out_stock_report.jsp +++ b/src/main/webapp/pages/reports/in_out_stock_report.jsp @@ -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){ diff --git a/src/main/webapp/pages/reports/sale_out_report.jsp b/src/main/webapp/pages/reports/sale_out_report.jsp index 74bf98d4..0e2c12be 100644 --- a/src/main/webapp/pages/reports/sale_out_report.jsp +++ b/src/main/webapp/pages/reports/sale_out_report.jsp @@ -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},