Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/slickWash.js
===================================================================
diff -u -r24920 -r24934
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/slickWash.js	(.../slickWash.js)	(revision 24920)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/slickWash.js	(.../slickWash.js)	(revision 24934)
@@ -524,12 +524,12 @@
 		var offset = parseInt($("#pageOffset").val());
 		mainTable(0,[]);
 	}
-	//清洗篮筐
+	//清洗篮筐(点开时渲染空表)
 	function addCleanBasket(addBasketData){
 		dataView = new Slick.Data.DataView({ inlineFilters: true });
 		grid = new Slick.Grid("#addCleanBasketGrid", addBasketData, addBasketColumns, addBasketOption);
 	}
-	//添加，清洗篮筐的初始渲染
+	//添加，清洗篮筐的初始渲染(点开时渲染空表)
 	$("#addHandle").click(function(){
 		addCleanBasket([]);
 		$("#addCleanGetCodeArr").val("");
@@ -572,7 +572,6 @@
 			d["name"] = addBasketData[i].name;
 			d["amount"] = addBasketData[i].amount;
 			d["barcode"] = addBasketData[i].barcode;
-			// d["handle"] = addBasketData.handle;
 			d["personInCharge"] = addBasketData[i].personInCharge; 
 			d["content"]=addBasketData[i].content;
 			tempId ++;
@@ -591,7 +590,7 @@
 					tempId ++;
 				}
 			}
-		}													
+		}				
 		dataView.beginUpdate();
 		dataView.setItems(loadData);
 		dataView.setFilter(myFilter);
@@ -737,11 +736,14 @@
 		}
 		return res;
 	}
+	
 	//清洗篮筐扫描条码
 	$("#addCleanGetCode").keyup(function(e){
 			if(e.which == 13){
 				var BasketData=[];
 				var ifGetCode ={}; 
+				//判断是否执行afterajax
+				 
 				ifGetCode = addCleanCodeVerification();
 				if(ifGetCode.state=="false"){
 					window.alert(ifGetCode.mess);
@@ -757,6 +759,7 @@
 					BasketData = JSON.parse(redy);
 				}
 				var addItem;
+				var ifre;
 				$.ajax({
 					url:"/disinfectSystem/washAndDisinfect/washAndDisinfectRecordController/loadContainerContentOfJSON.mhtml",
 					type:"post",
@@ -769,8 +772,9 @@
 							$("#addCleanGetCodeArr").val(JSON.stringify(BasketData));
 						}
 						else{
+							addCleanBaskets(BasketData);
+							$("#addCleanGetCodeArr").val(JSON.stringify(BasketData));
 							window.alert(res.message);
-							return false;
 						}
 						
 					}
@@ -794,7 +798,6 @@
 		}
 		addCleanBaskets(newData);
 		$("#addCleanGetCodeArr").val(JSON.stringify(newData));
-		//addCleanAfterAjax();
 	}
 	//清洗篮筐的保存
 	$("#addCleanRefer").click(function(){
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/washingApplication/washingApplication.jsp
===================================================================
diff -u -r24916 -r24934
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/washingApplication/washingApplication.jsp	(.../washingApplication.jsp)	(revision 24916)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/washingApplication/washingApplication.jsp	(.../washingApplication.jsp)	(revision 24934)
@@ -46,6 +46,7 @@
 	<input type="hidden" class="totalPagesAll">
 	<input type="hidden" id="instr">
 	<input type="hidden" value="" id="hiddenss">
+	<!-- 清洗篮筐条码存放 -->
 	<input type="hidden" id="addCleanGetCodeArr" >
 	<input type="hidden" id="updateArr">
 	<input type="hidden" id="updateListBasketArr">
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryManagementApplication/slickDM.js
===================================================================
diff -u -r24920 -r24934
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryManagementApplication/slickDM.js	(.../slickDM.js)	(revision 24920)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryManagementApplication/slickDM.js	(.../slickDM.js)	(revision 24934)
@@ -19,6 +19,7 @@
 		"name":"流水号",
 		"field":"serialNumber",
 		 "id":"serialNumber",
+		 sortable: true,
 		 formatter: function(value, row, index, columnDef, dataContext){
 		 	var alink = '<a  class="mainFont" data-toggle="modal" data-target="#updateModal" onclick="UpdateCleanList(';
 		 	alink += dataContext.id + ',\'' + dataContext.serialNumber + '\'';
@@ -34,6 +35,7 @@
 		"name":"状态",
 		"field":"status",
 		"id":"status",
+		sortable: true,
 		formatter: function(value, row, index, columnDef, dataContext){
 			var alink;
 		if(dataContext.status=="已发货"){
@@ -48,12 +50,14 @@
 	{
 		"name":"已打印",
 		"field":"isPrint",
-		"id":"isPrint"
+		"id":"isPrint",
+		sortable: true,
 	},
 	{
 		"name":"申请科室",
 		"field":"depart",
-		"id":"depart"
+		"id":"depart",
+		sortable: true,
 	},
 	{
 		"name":"申请时间",
@@ -68,17 +72,20 @@
 	{
 		"name":"发货员",
 		"field":"sender",
-		"id":"sender"
+		"id":"sender",
+		sortable: true,
 	},
 	{
 		"name":"核对员",
 		"field":"assistantSender",
-		"id":"assistantSender"
+		"id":"assistantSender",
+		sortable: true,
 	},
 	{
 		"name":"责任人",
 		"field":"personInCharge",
-		"id":"personInCharge"
+		"id":"personInCharge",
+		sortable: true,
 	},
 	{
 		"name":"发货时间",
@@ -88,12 +95,14 @@
 	{
 		"name":"类型",
 		"field":"invoicePlanType",
-		"id":"invoicePlanType"
+		"id":"invoicePlanType",
+		sortable: true,
 	},
 	{
 		"name":"备注",
 		"field":"remark",
-		"id":"remark"
+		"id":"remark",
+		sortable: true,
 	},
 	{
 		"name":"打印时间",
@@ -103,12 +112,14 @@
 	{
 		"name":"住院号",
 		"field":"hospitalNumber",
-		"id":"hospitalNumber"
+		"id":"hospitalNumber",
+		sortable: true,
 	},
 	{
 		"name":"签收人",
 		"field":"receiptor",
-		"id":"receiptor"
+		"id":"receiptor",
+		sortable: true,
 	},
 	{
 		"name":"签收时间",
@@ -118,19 +129,22 @@
 	{
 		"name":"结算科室",
 		"field":"settleAccountsDepart",
-		"id":"settleAccountsDepart"
+		"id":"settleAccountsDepart",
+		sortable: true,
 	}
 	,
 	{
 		"name":"仓库",
 		"field":"warehouseName",
-		"id":"warehouseName"
+		"id":"warehouseName",
+		sortable: true,
 	}
 	,
 	{
 		"name":"总价",
 		"field":"totalPrice",
-		"id":"totalPrice"
+		"id":"totalPrice",
+		sortable: true,
 	}
 	
 ];
@@ -243,7 +257,7 @@
 	var pageHeight = $(window).height() - parentHead.height() - navbar.height();
 	return pageHeight;
 }
-//排序、头部菜单、筛选
+//头部菜单、筛选,会影响排序
 var checkboxSelector;
 checkboxSelector = new Slick.CheckboxSelectColumn({
 	cssClass: "slick-cell-checkboxsel"
@@ -258,13 +272,7 @@
 		filters : setFilters,
 		logicalOperator: "OR",
 		gridId: "com.forgon.disinfectsystem.invoice.findInvoiceList",
-		sorters : [
-			{
-				columnLabel: "t.id", 
-				propFullName : "",
-				direction : "desc",
-			}
-		]
+		sorters :  JSON.parse($("#sorters").val())
 	};
 	$.ajax({
 		url:"/disinfectSystem/grid/gridController/getGrid.mhtml",
@@ -282,8 +290,46 @@
 				selectActiveRow: false
 			}));
 			//复选框 end
+			//排序
+			DMGrid.onSort.subscribe(function (e, args) {
+				var cols = args.sortCols;
+				var sortName = args.sortCol.field;
+				var hisort = JSON.parse($("#sorters").val());
+				var item = [];
+				if(hisort.length==0){
+					item = [
+						{
+						columnLabel: sortName,
+						propFullName: "",
+						direction: "asc"
+						}
+					];
+				}
+				else{
+					if(hisort[0].direction=="desc"){
+						item = [
+							{
+							columnLabel: sortName,
+							propFullName: "",
+							direction: "asc"
+							}
+						];
+					}
+					else{
+						item = [
+							{
+							columnLabel: sortName,
+							propFullName: "",
+							direction: "desc"
+							}
+						];
+					}
+				} 
+				$("#sorters").val(JSON.stringify(item));
+				mainTableRefresh();
+				return 0 ;
+			})
 			
-			
 			attachAutoResizeDataGrid(DMGrid, "DMGrid", "DMGridContainer");
 			
 			$("#PageSize").val(res.limit);
@@ -298,7 +344,7 @@
 }
 //主表刷新
 function mainTableRefresh(){
-	mainTable(0,10,0)
+	mainTable(0,[])
 }
 //主表搜索
 $("#mainNav-shop-search").keyup(function(e){
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/deliveryManagementApplication/deliveryManagementApplication.jsp
===================================================================
diff -u -r24916 -r24934
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/deliveryManagementApplication/deliveryManagementApplication.jsp	(.../deliveryManagementApplication.jsp)	(revision 24916)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/deliveryManagementApplication/deliveryManagementApplication.jsp	(.../deliveryManagementApplication.jsp)	(revision 24934)
@@ -120,6 +120,8 @@
 						</div>
 					</div>
     		</div>
+				<!-- 排序的值存放 -->
+				<input type="hidden" id="sorters" runat="server" value="[]"/>
 				<!-- 存放首次加载的总页数 以及之后加载的页码数 -->
     		<input type="hidden" id="PageCount" runat="server" />
 				<!-- 存放数据条数 -->