Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java
===================================================================
diff -u -r23447 -r23450
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java	(.../ExpensiveGoodsApplicationManagerImpl.java)	(revision 23447)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java	(.../ExpensiveGoodsApplicationManagerImpl.java)	(revision 23450)
@@ -11,7 +11,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
-import org.jfree.data.DataUtilities;
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -28,7 +27,6 @@
 import com.forgon.disinfectsystem.recyclingapplication.service.InvoicePlanManager;
 import com.forgon.disinfectsystem.recyclingapplication.updateLog.ApplicationLogManager;
 import com.forgon.disinfectsystem.tousseitem.service.TousseItemManager;
-import com.forgon.disinfectsystem.vo.ApplicationItemVO;
 import com.forgon.disinfectsystem.vo.ExpensiveGoodsItemVo;
 import com.forgon.log.enums.ApplicationLogStatusEnum;
 import com.forgon.log.model.Log;
@@ -43,7 +41,6 @@
 import com.forgon.tools.string.StringTools;
 import com.forgon.tools.util.ForgonDateUtils;
 import com.forgon.tools.util.SqlUtils;
-import com.forgon.workflow.model.NodeApproval;
 import com.forgon.workflow.model.NodeDefinition;
 import com.forgon.workflow.model.WorkFlowApprovalTask;
 import com.forgon.workflow.service.NodeDefinitionManager;
@@ -213,8 +210,9 @@
 				if(firstNodeDefinition != null){
 					firstNodeDefinitionId = firstNodeDefinition.getId();
 					String sql = " where po.formId = " + invoicePlan.getId() +" and po.nodeDefinition.id =" + firstNodeDefinitionId +" order by po.createTaskTime desc";
+					@SuppressWarnings("unchecked")
 					List<WorkFlowApprovalTask> workFlowApprovalTasks = objectDao.findBySql(WorkFlowApprovalTask.class.getSimpleName(),sql);
-					if(workFlowApprovalTasks.size()>0)
+					if(CollectionUtils.isNotEmpty(workFlowApprovalTasks))
 						workFlowApprovalTask.setUserId(workFlowApprovalTasks.get(0).getUserId());
 					else
 						throw new RuntimeException("无指定用户！");
@@ -514,31 +512,7 @@
 		if (StringUtils.isBlank(serialNumber)){
 			return expensiveGoodsItemVoList;
 		}
-		System.out.println("执行loadExpensiveGoodsListBySerialNumber");
 		
-		/*
-		String sql="select distinct ip.serialNumber,ti.tousseName,ti.amount,ti.price,egs.amount stockAmount,egi.settledStatus,egi.status "
-					+"from invoicePlan ip " 
-						+"join ExpensiveGoodsApplication ega on ip.id=ega.id " 
-						+"join TousseItem ti on ti.recyclingApplication_ID =ega.id " 
-						+"join ExpensiveGoodsStock egs on egs.expensiveGoods_id=ti.expensiveGoodsId " 
-						+"join ExpensiveGoodsInstance egi on egi.expensiveGoods_id =egs.expensiveGoods_id " 
-						+"where ip.serialNumber="+serialNumber;
-		
-		String sql="select  ip.serialNumber,ti.tousseName,ti.price,egi.settledStatus,egi.status,count(0) amount, "
-							+"("
-							+"select count(0) from expensivegoodsGodownentry eg join expensivegoodsGodownentryitem egi " 
-							+"on eg.id=egi.expensivegoodsGodownentry_id "
-							+"where eg.invoiceplanid=ip.id and egi.expensiveGoodsId=ti.expensiveGoodsId "
-							+") stockAmount "
-							+"from invoicePlan ip " 
-							+"join ExpensiveGoodsApplication ega on ip.id=ega.id " 
-							+"join TousseItem ti on ti.recyclingApplication_ID =ega.id " 
-							+"join ExpensiveGoodsInstance egi on egi.invoiceplanid =ega.id and  egi.expensiveGoods_id=ti.expensiveGoodsId "
-							+"where ip.serialNumber="+serialNumber
-							+" group by ip.id,ti.expensiveGoodsId ,ip.serialNumber,ti.tousseName,ti.price,egi.settledStatus,egi.status";
-		*/
-		
 		String sql="select  ip.serialNumber,ti.tousseName,ti.price "
 		+",amount, "
 		+" (select count(0) from expensivegoodsGodownentry eg join expensivegoodsGodownentryitem egi " 
@@ -560,9 +534,10 @@
 		+"group by ip.id,ti.expensiveGoodsId ,ip.serialNumber,ti.tousseName,ti.amount,ti.price ";
 
 
-		ResultSet rs = objectDao.executeSql(sql);
+		ResultSet rs = null;
 	
 		try {
+			rs = objectDao.executeSql(sql);
 			if (rs != null) {
 				while (rs.next()) {
 					ExpensiveGoodsItemVo vo = new ExpensiveGoodsItemVo();
@@ -585,10 +560,6 @@
 		}
 		
 		return expensiveGoodsItemVoList;
-		
-		
 	}
 	
-	
-	
 }
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationView.js
===================================================================
diff -u -r23447 -r23450
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationView.js	(.../expensiveGoodsApplicationView.js)	(revision 23447)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationView.js	(.../expensiveGoodsApplicationView.js)	(revision 23450)
@@ -396,7 +396,7 @@
 		tbar: tbar,
 		sorters : {property : 'applicationTime', direction: 'DESC'},
 		extraParams : {},  //如果你要自定义参数，这里一定要先给一个空的对象，要不然会报空异常
-		showRightClick : false,
+		showRightClick : false
 	});
 	
 	
@@ -463,9 +463,4 @@
 		e.getTarget().setAttribute('data-qtitle', '&nbsp;<font size=3>申请物品列表:</font>');
 	});
 
-
-	
-	
-	
-	
 });
\ No newline at end of file