Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
===================================================================
diff -u -r15390 -r15391
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 15390)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 15391)
@@ -6,6 +6,7 @@
 	{name : 'endDate'},
 	{name : 'washBasket'},
 	{name : 'personInCharge'},
+	{name : 'position'},
     {name : 'washRecordID'},
     {name : 'washDataAmount'}
 ]);
@@ -32,6 +33,7 @@
 						    {name : 'endDate'},
 						    {name : 'washBasket'},
 						    {name : 'personInCharge'},
+						    {name : 'position'},
 						    {name : 'washRecordID'},
 						    {name : 'washDataAmount'}
 						]
@@ -43,6 +45,7 @@
         		    {header : "清洗篮筐",dataIndex : 'washBasket',width : 120, menuDisabled: true},
         		    {header : "操作员",dataIndex : 'washOperator',width : 70, menuDisabled: true},
         		    {header : "责任人",dataIndex : 'personInCharge',width : 70, menuDisabled: true},
+        		    {header : "位置",dataIndex : 'position',width : 70, menuDisabled: true},
         		    {header : "开始时间",dataIndex : 'startDate',width : 160, menuDisabled: true,renderer : myDateFormatBySecond},
         		    {id : 'endDate',header : "结束时间",dataIndex : 'endDate',width : 160, menuDisabled: true,renderer : myDateFormatBySecond},
         		    {header : "清洗参数",dataIndex : 'washDataAmount',width : 70, menuDisabled: true,renderer : function(v,p,record){
@@ -764,6 +767,7 @@
 					var personInCharge = jsonItem.personInCharge;
 					var washRecordID = jsonItem.washRecordID;
 					var washDataAmount = jsonItem.washDataAmount;
+					var position = jsonItem.position;
 					
 					if(disinfectIdentification != null && disinfectIdentification != ""){
 						var WashRecordData = new WashRecord({
@@ -774,6 +778,7 @@
 							endDate : endDate,
 							washBasket : washBasket,
 							personInCharge : personInCharge,
+							position : position,
 							washRecordID : washRecordID,
 							washDataAmount : washDataAmount
 						});
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r15390 -r15391
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 15390)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 15391)
@@ -831,6 +831,7 @@
 							obj.put("startDate", record.getStartDateStr());
 							obj.put("endDate", record.getEndDateStr());
 							obj.put("washBasket", basket.getContainerName());
+							obj.put("position", basket.getPosition());
 							obj.put("personInCharge", basket.getPersonInCharge());
 							basketJsons.add(obj);
 						}