Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r15714 -r15906
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 15714)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 15906)
@@ -1760,8 +1760,9 @@
 	    {header : "发货时间",width : 120,dataIndex : 'sendTime',renderer : myDateFormatByMinute},
 	    {header : "状态",width : 70,dataIndex : 'status',renderer : renderColor},
 	    {header : "类型",width : 110,dataIndex : 'invoicePlan.type',sortable:false},
-	    {header : "已打印",width : 70,dataIndex : 'isPrint',renderer : renderPrintColor},
+	    {header : "打印时间",width : 120,dataIndex : 'printTime'},
 	    {id : 'remark',header : "备注",width : 110,dataIndex : 'remark'},
+	    {header : "已打印",width : 50,dataIndex : 'isPrint',renderer : renderPrintColor},
 	    {header : "住院号",width : 70,dataIndex : 'hospitalNumber'},
 	    {header : "签收人",width : 70,dataIndex : 'receiptor'},
 	    {header : "签收时间",width : 120,dataIndex : 'receiptingTime',renderer : myDateFormatByMinute},
@@ -1774,6 +1775,7 @@
 	    {name : 'id'},
 	    {name : 'serialNumber'},
 	    {name : 'depart'},
+	    {name : 'printTime'},
 	    {name : 'settleAccountsDepart'},
 	    {name : 'isPrint'},
 	    {name : 'spelling'},
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r15899 -r15906
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15899)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15906)
@@ -966,12 +966,13 @@
 	@Override
 	public void updatePrintStatus(String invoiceIds) {
 		Session session = objectDao.getHibernateSession();
-		String sql = String.format("update Invoice set isPrint = '是' where id in(%s)", invoiceIds);
+		String nowTime = Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS.format(new Date());
+		String sql = String.format("update Invoice set isPrint = '是',printTime = '%s' where id in(%s)", nowTime, invoiceIds);
+//		String sql = String.format("update Invoice set isPrint = '是' where id in(%s)", invoiceIds);
 		Query query = session.createQuery(sql);
 		query.executeUpdate();
 		
-		sql = String.format("update " + InvoiceItem.class.getSimpleName() 
-				+ " set isPrint = '是' where invoice_id in (%s)", invoiceIds);
+		sql = String.format("update " + InvoiceItem.class.getSimpleName() + " set isPrint = '是' where invoice_id in (%s)", invoiceIds); 
 		session.createQuery(sql).executeUpdate();
 	}
 
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
===================================================================
diff -u -r15489 -r15906
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java	(.../Invoice.java)	(revision 15489)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java	(.../Invoice.java)	(revision 15906)
@@ -136,6 +136,10 @@
 	 */
 	private String hospitalNumber;
 	
+	/**
+	 * 发货时间
+	 */
+	private Date printTime; 
 	
 	public String getHospitalNumber() {
 		return hospitalNumber;
@@ -465,7 +469,14 @@
 		this.sourceWarehouseName = sourceWarehouseName;
 	}
 	
+	public Date getPrintTime() {
+		return printTime;
+	}
 
+	public void setPrintTime(Date printTime) {
+		this.printTime = printTime;
+	}
+
 	/**
 	 * 更新发货单的打印状态,遍历InvoiceItem,如果Item都是已打印,则打印状态为是,如果都没有打印,则为否,否则为部分打印
 	 */
@@ -481,8 +492,10 @@
 			setIsPrint(PRINT_NO);
 		}else if(printedCount == getInvoiceItem().size()){
 			setIsPrint(PRINT_YES);
+			setPrintTime(new Date());
 		}else{
 			setIsPrint(PRINT_PART);
+			setPrintTime(new Date());
 		}
 	}
 }
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r15902 -r15906
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 15902)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 15906)
@@ -1231,10 +1231,8 @@
 				//获取第一张核对人不为空的单,把核对员打到单上
 				map.put("assistantSender", StringTools.defaultIfBlank(invoiceManager.getFirstAssistant(idStrs),""));
 				tousseList = invoiceManager.loadToussePrintData(idStrs);
-				disinfectGoodslist = invoiceManager
-						.getDisinfectGoodsPrintData(idStrs);
-				diposableGoodsList = invoiceManager
-						.getDiposableGoodsPrintData(idStrs);
+				disinfectGoodslist = invoiceManager.getDisinfectGoodsPrintData(idStrs);
+				diposableGoodsList = invoiceManager.getDiposableGoodsPrintData(idStrs);
 			}