Index: forgon-core/src/main/java/com/forgon/serialnumber/service/SerialNumManagerImpl.java
===================================================================
diff -u -r19120 -r23730
--- forgon-core/src/main/java/com/forgon/serialnumber/service/SerialNumManagerImpl.java	(.../SerialNumManagerImpl.java)	(revision 19120)
+++ forgon-core/src/main/java/com/forgon/serialnumber/service/SerialNumManagerImpl.java	(.../SerialNumManagerImpl.java)	(revision 23730)
@@ -30,6 +30,7 @@
 	private static SerialNumVo invoiceSerialNum = null;
 	private static SerialNumVo cleanSerialNum = null;
 	private static SerialNumVo packingTaskSerialNum = null;
+	private static SerialNumVo expensiveGoodsBillSerialNum = null;
 	
 	private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
 	
@@ -70,6 +71,8 @@
 			return barcodeSerialNum;
 		}else if(SerialNum.TYPE_PACKING_TASK.equals(type)){
 			return packingTaskSerialNum;
+		}else if(SerialNum.TYPE_EXPENSIVEGOODS_BILL.equals(type)){
+			return expensiveGoodsBillSerialNum;
 		}else{
 			return null;
 		}
@@ -88,6 +91,8 @@
 			 barcodeSerialNum = vo;
 		}else if(SerialNum.TYPE_PACKING_TASK.equals(type)){
 			packingTaskSerialNum = vo;
+		}else if(SerialNum.TYPE_EXPENSIVEGOODS_BILL.equals(type)){
+			expensiveGoodsBillSerialNum = vo;
 		}
 	}
 	
@@ -122,9 +127,7 @@
 	
 	public void isEveryDayClean(SerialNumVo vo,String currentDate,String type){
 		if(vo != null){
-			if ("是".equals(vo.getIsEveryDayClean())
-					&& StringUtils.isNotBlank(vo
-							.getDateTime())) {
+			if ("是".equals(vo.getIsEveryDayClean())&& StringUtils.isNotBlank(vo.getDateTime())) {
 				if (!currentDate.equals(vo
 						.getDateTime())) {
 					vo.setDateTime(currentDate);
Index: forgon-core/src/main/java/com/forgon/oa/initdata/bean/SerialNums.java
===================================================================
diff -u -r19120 -r23730
--- forgon-core/src/main/java/com/forgon/oa/initdata/bean/SerialNums.java	(.../SerialNums.java)	(revision 19120)
+++ forgon-core/src/main/java/com/forgon/oa/initdata/bean/SerialNums.java	(.../SerialNums.java)	(revision 23730)
@@ -34,6 +34,7 @@
 				|| SerialNum.TYPE_INSERT_GODOWN.equals(type)
 				|| SerialNum.TYPE_INVOICE.equals(type)
 				|| SerialNum.TYPE_RECYCLINGAPPLICATION.equals(type)
+				|| SerialNum.TYPE_EXPENSIVEGOODS_BILL.equals(type)
 				|| SerialNum.TYPE_PACKING_TASK.equals(type)) {
 			// 验证流水号定是否以“字母或数字开头，@结尾”
 			if(Pattern.matches("^[\\d\\w][\\d\\w]*@*$", serialNumBean.getDefaultSerialNum())){
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillView.js
===================================================================
diff -u -r23581 -r23730
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillView.js	(.../expensiveGoodsBillView.js)	(revision 23581)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillView.js	(.../expensiveGoodsBillView.js)	(revision 23730)
@@ -481,7 +481,7 @@
 			var data = action.result.data;
 			//console.log(data);
 			var time = Ext.util.Format.date(new Date(data.time.time), 'Y-m-d H:i');
-			var settledTime = Ext.util.Format.date(new Date(data.settledTime.time), 'Y-m-d H:i');
+			var settledTime = Ext.util.Format.date(new Date(data.settledTime.time), 'Y-m-d');
 			var supplierId = data.supplierId;
 			top.Ext.getCmp("time").setValue(time);
 			top.Ext.getCmp("settledTime").setValue(settledTime);
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillForm.js
===================================================================
diff -u -r23395 -r23730
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillForm.js	(.../expensiveGoodsBillForm.js)	(revision 23395)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillForm.js	(.../expensiveGoodsBillForm.js)	(revision 23730)
@@ -242,9 +242,22 @@
 					fieldLabel : '开票时间',
 					id : 'settledTime',
 					name : 'settledTime',
-					format : 'Y-m-d H:i',
+					format : 'Y-m-d ',
+					invalidText :'日期输入不正确',
+					altFormats:'Y-m|Y-n|y-n|y-m|Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ym|Ymd|Yn|Ynj|yn|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
 					allowBlank : false,
-					anchor : '95%'
+					anchor : '95%',
+					listeners : {
+						specialkey : function(field, e) {
+							var key = e.getKey();
+							if (key == Ext.EventObject.ENTER) {
+								var value = field.getValue();
+								field.setValue(value);
+								top.Ext.getCmp('supplierName').focus();
+//								top.Ext.getCmp('amount1').selectText();
+							}
+						}
+					}
 				}]
 			},{
 				columnWidth : .5,
Index: forgon-core/src/main/java/com/forgon/serialnumber/model/SerialNum.java
===================================================================
diff -u -r23492 -r23730
--- forgon-core/src/main/java/com/forgon/serialnumber/model/SerialNum.java	(.../SerialNum.java)	(revision 23492)
+++ forgon-core/src/main/java/com/forgon/serialnumber/model/SerialNum.java	(.../SerialNum.java)	(revision 23730)
@@ -54,6 +54,7 @@
 	public static final String TYPE_INSERT_GODOWN = "入库单";
 	public static final String TYPE_CLEAN = "清洗消毒";
 	public static final String TYPE_BARCODE = "条码";
+	public static final String TYPE_EXPENSIVEGOODS_BILL = "高值耗材发票";
 	/**
 	 * 采购计划单
 	 */
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsBill.java
===================================================================
diff -u -r23492 -r23730
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsBill.java	(.../ExpensiveGoodsBill.java)	(revision 23492)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsBill.java	(.../ExpensiveGoodsBill.java)	(revision 23730)
@@ -39,7 +39,7 @@
 	
 	private Long id;
 	/**
-	 * 发票单号
+	 * 发票单号(需要页面手动输入)
 	 */
 	private String serialNumber;  
 	/**
@@ -76,8 +76,13 @@
 	 * 供应商id
 	 */
 	private Long supplierId;
-			
+
 	/**
+	 * 发票编号(用于打印时显示,保存时系统自动生成)
+	 */
+	private String serialNumberByAuto;
+
+	/**
 	 * 发票明细
 	 */
 	@JsonIgnore
@@ -184,6 +189,14 @@
 		this.time = time;
 	}
 	
+	public String getSerialNumberByAuto() {
+		return serialNumberByAuto;
+	}
+
+	public void setSerialNumberByAuto(String serialNumberByAuto) {
+		this.serialNumberByAuto = serialNumberByAuto;
+	}
+
 	public void calculateTotalPrice() {
 		totalPrice = 0.0;
 		List<ExpensiveGoodsBillItem> items = getItems();