单据明细增加'单位'字段的显示

src/main/java/com/jsh/action/materials/DepotHeadAction.java

@@ -393,7 +393,6 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
 			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() + ",";

src/main/java/com/jsh/action/materials/DepotItemAction.java

@@ -284,7 +284,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
                     //品名/型号/扩展信息/包装
                     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());

src/main/java/com/jsh/action/materials/MaterialAction.java

@@ -487,7 +487,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
                             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);
                 }

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},