Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
===================================================================
diff -u -r22280 -r22309
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java	(.../ExpensiveGoodsBillManagerImpl.java)	(revision 22280)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java	(.../ExpensiveGoodsBillManagerImpl.java)	(revision 22309)
@@ -306,12 +306,13 @@
 	@Override
 	public void saveExpensiveGoodsBill(ExpensiveGoodsBill expensiveGoodsBill,boolean committedStatus,Map<String, Object> result) {
 		if(CollectionUtils.isNotEmpty( expensiveGoodsBill.getItems())){
-			//是否提交
+			//检查发票号是否唯一
+			checkSerialNumber(expensiveGoodsBill.getSerialNumber());
 			if(committedStatus){
-				//保存并结算发票
+				//若提交 保存并结算发票
 				saveAndBillExpensiveGoodsBill(expensiveGoodsBill,result);
 			}else{
-				//暂存发票
+				//若暂存 暂存发票
 				saveOrUpdate(expensiveGoodsBill);
 			}
 		}else{
@@ -569,8 +570,7 @@
 				jsonObj.put("entryDate", format.format(ExpensiveGoodsInstance.getEntryDate()));
 				jsonObj.put("expDate",  format.format(ExpensiveGoodsInstance.getExpDate()));
 				jsonObj.put("price", ExpensiveGoodsInstance.getPrice());
-				jsonObj.put("warehouseName", ExpensiveGoodsInstance.getWarehouseName());
-				jsonObj.put("batchNumber", ExpensiveGoodsInstance.getBatchNumber());
+				jsonObj.put("model", ExpensiveGoodsInstance.getModel());
 				if(ExpensiveGoodsInstance.getUseRecord()!=null){
 					jsonObj.put("patientName", ExpensiveGoodsInstance.getUseRecord().getPatientName());
 				}
@@ -665,7 +665,7 @@
 	private List<ExpensiveGoodsInstance> canBillExpensiveGoodsInstanceList(Long expensiveGoodsId,Long supplierId){
 		if(DatabaseUtil.isPoIdValid(expensiveGoodsId) && DatabaseUtil.isPoIdValid(supplierId)){
 			
-			String sql = String.format(" where po.expensiveGoods.id = '%s' and  po.supplierId = '%s'"
+			String sql = String.format(" where po.expensiveGoods.id = %s and  po.supplierId = %s "
 					+ " and  po.checkStatus = '%s' and  po.settledStatus = '%s' "
 					+ " and ( ( po.entryType = '%s')or( po.entryType = '%s' and po.status = '%s')) order by po.entryType desc, po.entryDate asc ",
 					expensiveGoodsId,supplierId,
@@ -727,4 +727,16 @@
 		}
 		return null;
 	}
+	
+	//发票单号是否唯一
+	private void checkSerialNumber(String serialNumber){
+		if(StringUtils.isEmpty(serialNumber)){
+			throw new IllegalArgumentException("发票单号不能为空!");
+		}else{
+			List<ExpensiveGoodsBill> expensiveGoodsBill =  this.getByProperty("serialNumber", serialNumber);
+			if(CollectionUtils.isNotEmpty(expensiveGoodsBill)){
+				throw new IllegalArgumentException("已有发票单号为:"+serialNumber+"的发票!");
+			}
+		}
+	}
 }
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r22307 -r22309
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 22307)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 22309)
@@ -354,8 +354,8 @@
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_PurchasePlan_Manager,
 	children:[
-        {hidden :SSTS_PurchasePlan_Manager,text:"采购计划",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材采购计划",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/expensiveGoodPurchasePlanView.jsp',hrefTarget:linkTarget,leaf:true}
+        {hidden :SSTS_PurchasePlan_Manager,text:"采购计划",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.jsp',hrefTarget:linkTarget,leaf:true}
+        //{hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材采购计划",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/expensiveGoodPurchasePlanView.jsp',hrefTarget:linkTarget,leaf:true}
     ]
 },{
 	text:"器械仓库管理",
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js
===================================================================
diff -u -r22302 -r22309
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js	(.../expensiveGoodsGodownEntryForm.js)	(revision 22302)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js	(.../expensiveGoodsGodownEntryForm.js)	(revision 22309)
@@ -760,7 +760,7 @@
 							id : 'invoicePlan1',
 							name : 'invoicePlan1',
 							valueField : 'id',
-							listWidth : 350,
+							listWidth : 320,
 							width :310,
 							displayField : 'showDetail',
 							allowBlank : false,