From 8a77e18ec70c5d6606845afcac309f484ef10415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Thu, 16 Nov 2017 22:01:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0'=E5=8D=95=E4=BD=8D'=E5=AD=97=E6=AE=B5=E7=9A=84?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jsh/action/materials/DepotHeadAction.java | 1 - src/main/java/com/jsh/action/materials/DepotItemAction.java | 2 +- src/main/java/com/jsh/action/materials/MaterialAction.java | 2 +- src/main/webapp/js/pages/materials/in_out.js | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/jsh/action/materials/DepotHeadAction.java b/src/main/java/com/jsh/action/materials/DepotHeadAction.java index 2bf055cd..0f2b13d1 100644 --- a/src/main/java/com/jsh/action/materials/DepotHeadAction.java +++ b/src/main/java/com/jsh/action/materials/DepotHeadAction.java @@ -393,7 +393,6 @@ public class DepotHeadAction extends BaseAction String allReturn = ""; List dataList = pageUtil.getPageList(); if(dataList!=null) { - System.out.println("dataList:"+ dataList.size()); for (Integer i = 0; i < dataList.size(); i++) { Object dl = dataList.get(i); //获取对象 allReturn = allReturn + dl.toString() + ","; diff --git a/src/main/java/com/jsh/action/materials/DepotItemAction.java b/src/main/java/com/jsh/action/materials/DepotItemAction.java index 42aa84bc..3463192d 100644 --- a/src/main/java/com/jsh/action/materials/DepotItemAction.java +++ b/src/main/java/com/jsh/action/materials/DepotItemAction.java @@ -284,7 +284,7 @@ public class DepotItemAction extends BaseAction //品名/型号/扩展信息/包装 String MaterialName = depotItem.getMaterialId().getName() + ((depotItem.getMaterialId().getModel() == null || depotItem.getMaterialId().getModel().equals(""))?"":"("+depotItem.getMaterialId().getModel() + ")"); String materialOther = getOtherInfo(mpArr, depotItem); - MaterialName = MaterialName + materialOther + ratio; + MaterialName = MaterialName + materialOther + ((depotItem.getMaterialId().getUnit() == null || depotItem.getMaterialId().getUnit().equals(""))?"":"("+depotItem.getMaterialId().getUnit() + ")") + ratio; item.put("MaterialName", MaterialName); item.put("Unit", depotItem.getMUnit()); item.put("OperNumber", depotItem.getOperNumber()); diff --git a/src/main/java/com/jsh/action/materials/MaterialAction.java b/src/main/java/com/jsh/action/materials/MaterialAction.java index e0b9d2a7..ba70e161 100644 --- a/src/main/java/com/jsh/action/materials/MaterialAction.java +++ b/src/main/java/com/jsh/action/materials/MaterialAction.java @@ -487,7 +487,7 @@ public class MaterialAction extends BaseAction MaterialName = MaterialName + ((material.getOtherField3() == null || material.getOtherField3().equals(""))?"":"("+material.getOtherField3() + ")"); } } - MaterialName = MaterialName + ratio; + MaterialName = MaterialName + ((material.getUnit() == null || material.getUnit().equals(""))?"":"("+material.getUnit() + ")") + ratio; item.put("MaterialName", MaterialName); dataArray.add(item); } diff --git a/src/main/webapp/js/pages/materials/in_out.js b/src/main/webapp/js/pages/materials/in_out.js index 64914010..2a742d82 100644 --- a/src/main/webapp/js/pages/materials/in_out.js +++ b/src/main/webapp/js/pages/materials/in_out.js @@ -817,7 +817,7 @@ } } }, - { title: '品名(型号)(扩展信息)(包装)',field: 'MaterialId',width:230, + { title: '品名(型号)(扩展信息)(单位)',field: 'MaterialId',width:230, formatter:function(value,row,index){ return row.MaterialName; }, @@ -1187,7 +1187,7 @@ columns:[[ { title: '商品类型',field: 'MType',width:80, hidden:isShowMaterialTypeColumn}, { title: depotHeadName,field: 'DepotName',editor:'validatebox',width:90}, - { title: '品名(型号)(扩展信息)(包装)',field: 'MaterialName',width:230}, + { title: '品名(型号)(扩展信息)(单位)',field: 'MaterialName',width:230}, { title: anotherDepotHeadName,field: 'AnotherDepotName',hidden:isShowAnotherDepot,width:90}, { title: '单位',field: 'Unit',editor:'validatebox',width:60}, { title: '数量',field: 'OperNumber',editor:'validatebox',width:60},