diff --git a/favicon.ico b/favicon.ico
index b5b67c53edd8b61c476766d63a01ae1cfaaad3d8..db5e5219096e85ae17bcc953bb07aed1bd809fa9 100644
Binary files a/favicon.ico and b/favicon.ico differ
diff --git a/public/js/ctrl/o.ctrl.js b/public/js/ctrl/o.ctrl.js
index dc1d76ea059d1dc867662586001dccbeddbf28c0..10f3de58f08b61256b0217cccf27f3d6f761d407 100644
--- a/public/js/ctrl/o.ctrl.js
+++ b/public/js/ctrl/o.ctrl.js
@@ -264,6 +264,9 @@ wmsCtrl.controller('outboundOrderCtrl', ['$scope','warehouseService','warehouseM
                                 warehouseService.updateStatus(scope.keyVin)
                                     .then(function(result){
                                         if(result.success){
+                                            //清空输入框数据
+                                            scope.driverVin = null;
+                                            scope.keyVin = null;
                                         }else{
                                             scope.Tools.alert(result.message);
                                         }
diff --git a/public/js/ctrl/s.ctrl.js b/public/js/ctrl/s.ctrl.js
index a20fbd0cbac902b8e622c92fa3ed5f75e13a3c43..0b0ad821c3a7aab57b065a3529b99c7d95d905a8 100644
--- a/public/js/ctrl/s.ctrl.js
+++ b/public/js/ctrl/s.ctrl.js
@@ -1166,38 +1166,42 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService
     }])
     .controller('shipmentPlanCtrl.dialog',['$scope','shipmentPlanService',function(scope,shipmentPlanService){     //发运计划 ctrl dialog
 
+        scope.flag = true;  //禁止多次点击
         //保存发运计划
         scope.saveShipmentPlanClick = function () {
+            if(scope.flag){
+                scope.flag = false;
+                if(!scope.shipment || !scope.shipment.estimateLoadingTime){    //判断计划装车时间
+                    scope.Tools.alert('请选择计划装车时间');
+                    return;
+                }
 
-            if(!scope.shipment || !scope.shipment.estimateLoadingTime){    //判断计划装车时间
-                scope.Tools.alert('请选择计划装车时间');
-                return;
-            }
-
-            if(!scope.shipment || !scope.shipment.estimateFinishTime){    //判断预计完成时间
-                scope.Tools.alert('请选择预计完成时间');
-                return;
-            }
+                if(!scope.shipment || !scope.shipment.estimateFinishTime){    //判断预计完成时间
+                    scope.Tools.alert('请选择预计完成时间');
+                    return;
+                }
 
-            var listArr = new Array();
-            angular.forEach(scope.ngDialogData.Data,function (v,k) {
-                listArr.push({
-                    spId : v.spId,
-                    estimateLoadingTime : scope.shipment.estimateLoadingTime,   //计划装车时间
-                    estimateFinishTime : scope.shipment.estimateFinishTime  //预计完成时间
+                var listArr = new Array();
+                angular.forEach(scope.ngDialogData.Data,function (v,k) {
+                    listArr.push({
+                        spId : v.spId,
+                        estimateLoadingTime : scope.shipment.estimateLoadingTime,   //计划装车时间
+                        estimateFinishTime : scope.shipment.estimateFinishTime  //预计完成时间
+                    });
                 });
-            });
-            shipmentPlanService.createPreparationPlan(listArr)
-                .then(function(result){
-                    if(result.success){
-                        scope.Tools.alert('创建发运计划成功');
-                        scope.list(scope.listParam());
-                        //置空详情list
-                        scope.$parent.outboundOrderDetailList = null;
-                        scope.closeThisDialog();
-                    }else{
-                        scope.Tools.alert(result.message);
-                    }
-                })
+                shipmentPlanService.createPreparationPlan(listArr)
+                    .then(function(result){
+                        if(result.success){
+                            scope.Tools.alert('创建发运计划成功');
+                            scope.list(scope.listParam());
+                            //置空详情list
+                            scope.$parent.outboundOrderDetailList = null;
+                            scope.closeThisDialog();
+                        }else{
+                            scope.Tools.alert(result.message);
+                        }
+                        scope.flag = true;
+                    })
+            }
         }
     }])