Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js
===================================================================
diff -u -r36822 -r36826
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 36822)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 36826)
@@ -1056,21 +1056,25 @@
 	var storageLocationAddr = top.Ext.getCmp("storageLocationAddr").getValue();
 	var kardexContainerHost = top.Ext.getCmp("kardexContainerHost").getValue();
 	var kardexContainerPort = top.Ext.getCmp("kardexContainerPort").getValue();
+	if(storageLocationAddr == ''){
+		showResult('开口不能为空');
+		return;
+	}
+	if(status == '取出'){
+		if(storageLocationId == ''){
+			showResult('托盘不能为空');
+			return;
+		}
+	}else {
+		storageLocationId = 0;
+	}
 	var params = {
 		storageLocationId:storageLocationId,
 		addr:storageLocationAddr,
 		status:status,
 		host:kardexContainerHost,
 		port:kardexContainerPort
 	}
-	if(storageLocationAddr == ''){
-		showResult('开口不能为空');
-		return;
-	}
-	if(storageLocationId == ''){
-		showResult('托盘不能为空');
-		return;
-	}
 	showResult('已经发送命令给货柜，托盘调度中，请稍候！');
 	Ext.Ajax.timeout=2*60*1000;
 	Ext.Ajax.request({
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js
===================================================================
diff -u -r36824 -r36826
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js	(.../operationReservationView.js)	(revision 36824)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js	(.../operationReservationView.js)	(revision 36826)
@@ -316,21 +316,25 @@
 	var storageLocationAddr = top.Ext.getCmp("storageLocationAddr").getValue();
 	var kardexContainerHost = top.Ext.getCmp("kardexContainerHost").getValue();
 	var kardexContainerPort = top.Ext.getCmp("kardexContainerPort").getValue();
+	if(storageLocationAddr == ''){
+		showResult('开口不能为空');
+		return;
+	}
+	if(status == '取出'){
+		if(storageLocationId == ''){
+			showResult('托盘不能为空');
+			return;
+		}
+	}else {
+		storageLocationId = 0;
+	}
 	var params = {
 		storageLocationId:storageLocationId,
 		addr:storageLocationAddr,
 		status:status,
 		host:kardexContainerHost,
 		port:kardexContainerPort
 	}
-	if(storageLocationAddr == ''){
-		showResult('开口不能为空');
-		return;
-	}
-	if(storageLocationId == ''){
-		showResult('托盘不能为空');
-		return;
-	}
 	showResult('已经发送命令给货柜，托盘调度中，请稍候！');
 	Ext.Ajax.timeout=2*60*1000;
 	Ext.Ajax.request({