diff --git a/public/js/ctrl/a.ctrl.js b/public/js/ctrl/a.ctrl.js
index b03fb6e92e0978a7d366ed8d1005d7333bbc14be..3e3634ce74b2b41afd676ec93f4dfeb9f080a8b2 100644
--- a/public/js/ctrl/a.ctrl.js
+++ b/public/js/ctrl/a.ctrl.js
@@ -480,7 +480,8 @@ wmsCtrl.controller('asnCtrl',['$scope','dropDownService','inStorageBillService',
     $scope.getDetail = function(e){
         var abmImg = {
             orderId:$(e.target).parents('tr').attr('orderid'),
-            excpType:$(e.target).parents('tr').attr('excptype')
+            excpType:$(e.target).parents('tr').attr('excptype'),
+            excpTimestamp:$(e.target).parents('tr').attr('excpTimestamp')
         };
         abnormalManagementService.getImageList(abmImg).then(function(res){
             if(res.success){
diff --git a/public/js/ctrl/c.ctrl.js b/public/js/ctrl/c.ctrl.js
index b2bc812ff7d635f12412c0cce7d79c15fff5d2b7..62ba47cab43e5711c5f2376174e73cc94ef82c5f 100644
--- a/public/js/ctrl/c.ctrl.js
+++ b/public/js/ctrl/c.ctrl.js
@@ -12,7 +12,8 @@ wmsCtrl.controller('closeAbnormalCtrl',['$scope','$rootScope','$timeout','ngDial
             orderId : obj.orderId,
             excpType: obj.excpType,
             dealResultDesc: $scope.abm_desc,
-            excpTypeCode: obj.excpTypeCode
+            excpTypeCode: obj.excpTypeCode,
+            excpTimestamp:obj.excpTimestamp
         };
         abnormalManagementService.updateToClosed(temp).then(function(res){
             if(res.success){
diff --git a/public/js/ctrl/d.ctrl.js b/public/js/ctrl/d.ctrl.js
index ed36504c52532b2ff8fd29e800e9f6de3dbbfabe..502a743eb24b19c40c9ad7b89fe7f8bcb8ef0aa2 100644
--- a/public/js/ctrl/d.ctrl.js
+++ b/public/js/ctrl/d.ctrl.js
@@ -470,7 +470,8 @@ wmsCtrl.controller('distributionCtrl',['$scope','$rootScope','$timeout','$state'
                 excpDesc: obj.excpDesc,
                 dealType: $scope.layer_dealType,
                 vin:      obj.vin,
-                excpTypeCode: obj.excpTypeCode
+                excpTypeCode: obj.excpTypeCode,
+                excpTimestamp:obj.excpTimestamp
             };
             abnormalManagementService.updateToDeal(temp).then(function(res){
                 if(res.success){
diff --git a/public/js/ctrl/o.ctrl.js b/public/js/ctrl/o.ctrl.js
index 757c8cdc765ce657633c76a9553dddec0449325a..5657c5e0af0b9453691b963eba061df4e98f919e 100644
--- a/public/js/ctrl/o.ctrl.js
+++ b/public/js/ctrl/o.ctrl.js
@@ -539,7 +539,6 @@ wmsCtrl.controller('outboundOrderCtrl', ['$scope','warehouseService','warehouseM
         window.clearTimeout($rootScope.bs_timer5);
 
         $rootScope.bs_timer1 =  setTimeout(function(){
-            console.log('开始跳转');
             $state.go('transferDepot')
         },$rootScope.bs_intervalTime*60000)
 
diff --git a/public/js/ctrl/r.ctrl.js b/public/js/ctrl/r.ctrl.js
index 0c8586fdea8701cda4855237937d0fb37f2e27f1..0158d23886c9e151aff9c0ca3d903d8c9a228334 100644
--- a/public/js/ctrl/r.ctrl.js
+++ b/public/js/ctrl/r.ctrl.js
@@ -217,21 +217,18 @@ wmsCtrl.controller('reservoirCtrl',['$scope','reservoirService','dropDownService
     scope.dropDownList = {
         repairType : scope.Tools.dropDown.repairTypeDropDown.concat(),   //维修类型
         repairStatus : scope.Tools.dropDown.repairStatusDropDown.concat(), //维修状态
-        repairResult : scope.Tools.dropDown.repairResultDropDown.concat(),   //维修结果
-        inspectionResults : scope.Tools.dropDown.inspectionResultsDropDown.concat() //检验结果
+        repairResult : scope.Tools.dropDown.repairResultDropDown.concat()   //维修结果
     }
 
     scope.dropDownList.repairType.unshift(scope.constant.defaultDropDownNullData);   //插入维修状态
     scope.dropDownList.repairStatus.unshift(scope.constant.defaultDropDownNullData);   //插入维修状态
     scope.dropDownList.repairResult.unshift(scope.constant.defaultDropDownNullData);   //插入维修结果
-    scope.dropDownList.inspectionResults.unshift(scope.constant.defaultDropDownNullData);   //插入检验结果
 
     //设置默认值
     scope.dropDownDefault = {
         repairType : scope.dropDownList.repairType[0], //维修类型
         repairStatus : scope.dropDownList.repairStatus[0], //维修状态
-        repairResult : scope.dropDownList.repairResult[0],   //维修结果
-        inspectionResults : scope.dropDownList.inspectionResults[0] //检验结果
+        repairResult : scope.dropDownList.repairResult[0]   //维修结果
     }
 
     //列表查询参数
@@ -251,26 +248,12 @@ wmsCtrl.controller('reservoirCtrl',['$scope','reservoirService','dropDownService
             scope.search.rpType = scope.dropDownDefault.repairType.value;   //维修类型
             scope.search.rpStatus = scope.dropDownDefault.repairStatus.value;    //维修状态
             scope.search.rpRepairResult = scope.dropDownDefault.repairResult.value;//维修结果
-            scope.search.rpCheckResult = scope.dropDownDefault.inspectionResults.value;  //检验结果
-            scope.search.rpCustomerName = scope.dropDownDefault.shipper.customerId ? scope.dropDownDefault.shipper.customerId.name : '';   //货主
             return scope.search;
         }else{
             return scope.search;
         }
     }
 
-    //获取货主
-    dropDownService.getCustomerInfo()
-        .then(function(result){
-            if(result.success){
-                scope.dropDownList.shipper = result.data;
-                scope.dropDownList.shipper.unshift(scope.constant.defaultDropDownNullData); //插入空值
-                scope.dropDownDefault.shipper = scope.dropDownList.shipper[0];  //设置默认值
-            }else{
-                scope.Tools.alert(result.message);
-            }
-        })
-
     //列表
     scope.fristSelect = true;   //判断是否是第一次查询
     scope.list = function(params){
@@ -355,50 +338,15 @@ wmsCtrl.controller('reservoirCtrl',['$scope','reservoirService','dropDownService
         scope.search = {};
         scope.dropDownDefault.repairType = scope.dropDownList.repairType[0];
         scope.dropDownDefault.repairStatus = scope.dropDownList.repairStatus[0];
-        scope.dropDownDefault.shipper = scope.dropDownList.shipper[0];
-        scope.dropDownDefault.inspectionResults = scope.dropDownList.inspectionResults[0];
         scope.dropDownDefault.repairResult = scope.dropDownList.repairResult[0];
     }
 
-    //新增维修单
-    scope.addRepairBillClick = function(){
-        //获取货主
-        dropDownService.getCustomerInfo()
-            .then(function(result){
-                if(result.success){
-                    scope.Tools.dialog({
-                        controller:'repairBillCtrl.dialog',
-                        template : 'templates/maintenanceManagement/repairBill/repair-bill-form.html',
-                        closeByDocument : false,
-                        closeByEscape : false,
-                        data:{
-                            repairType : scope.Tools.dropDown.repairTypeDropDown,    //维修类型
-                            inspectionResults : scope.Tools.dropDown.inspectionResultsDropDown,    //检验结果
-                            shipper:result.data, //货主
-                            dropDownDefault : {
-                                repairType : scope.Tools.dropDown.repairTypeDropDown[0], //维修类型默认值
-                                inspectionResults : scope.Tools.dropDown.inspectionResultsDropDown[0], //检验结果默认值
-                                shipper : result.data[0], //货主默认值
-                            },
-                            repair : {
-                            }
-                        },
-                        width : 770,
-                        title : '新增维修单',
-                        scope : scope
-                    })
-                }else{
-                    scope.Tools.alert(result.message);
-                }
-            })
-    }
-
     //提交维修 click
     scope.submitRepairBillClick = function(){
 
         var indexArr = scope.Tools.getTableSelectItemIndex('.repairTable');  //获取table所选的下标
 
-        if(indexArr.length == 0){
+        /*if(indexArr.length == 0){
             scope.Tools.alert('请选择需要提交维修的数据');
             return;
         }
@@ -410,9 +358,21 @@ wmsCtrl.controller('reservoirCtrl',['$scope','reservoirService','dropDownService
                 scope.Tools.alert('只能选择未处理的数据');
                 return;
             }
-        }
+        }*/
+
+        scope.Tools.dialog({
+            controller : 'repairBillCtrl.dialog',
+            template : 'templates/maintenanceManagement/repairBill/repair-bill-form.html',
+            closeByDocument : false,
+            closeByEscape : false,
+            data : {
+            },
+            width : 350,
+            title : '提交维修单',
+            scope : scope
+        })
 
-        scope.Tools.dialogConfirm('确定要提交维修选中的数据吗？')
+        /*scope.Tools.dialogConfirm('确定要提交维修选中的数据吗？')
             .then(function(res){
                 if(res){
                     repairBillService.submitRepair(repairBillList)
@@ -425,182 +385,11 @@ wmsCtrl.controller('reservoirCtrl',['$scope','reservoirService','dropDownService
                             }
                         })
                 }
-            })
-    }
-
-    //维修后检查 click
-    scope.repairCheckClick = function(){
-
-        var indexArr = scope.Tools.getTableSelectItemIndex('.repairTable');  //获取table所选的下标
-
-        if(indexArr.length == 0){
-            scope.Tools.alert('请选择需要维修后检验的数据');
-            return;
-        }
-
-        if(indexArr.length > 1){
-            scope.Tools.alert('只能选择一条维修后检验的数据');
-            return;
-        }
-
-        //获取选中的数据
-        var repairBillList = scope.Tools.getDataTOIndex(indexArr,scope.repairBillList);
-
-        if(repairBillList[0].rpStatus != scope.constant.repairStatus.maintenance){
-            scope.Tools.alert('只能选择维修中的数据');
-            return;
-        }
-
-        repairBillService.getById(repairBillList[0].rpId)
-            .then(function(result){
-                if(result.success){
-
-                    //维修结果默认值
-                    var repairResult = null;
-                    if(result.data.rpRepairResult){
-                        repairResult = scope.Tools.getRepairResultDropDownByKey(result.data.rpRepairResult);
-                    }else{
-                        repairResult = scope.Tools.dropDown.repairResultDropDown[0]
-                    }
-
-                    scope.Tools.dialog({
-                        controller:'repairBillCtrl.dialog',
-                        template : 'templates/maintenanceManagement/repairBill/repair-check-form.html',
-                        closeByDocument : false,
-                        closeByEscape : false,
-                        data:{
-                            repairType : scope.Tools.dropDown.repairTypeDropDown,    //维修类型
-                            repairResult : scope.Tools.dropDown.repairResultDropDown,    //维修结果
-                            inspectionResults : scope.Tools.dropDown.inspectionResultsDropDown,    //检验结果
-                            dropDownDefault : {
-                                repairType : scope.Tools.getRepairTypeDropDownByKey(result.data.rpType), //维修类型默认值
-                                repairResult : repairResult, //维修结果默认值
-                                inspectionResults : scope.Tools.getInspectionResultsDropDownByKey(result.data.rpCheckResult) //检验结果默认值
-                            },
-                            repair : result.data,
-                            repairChange : {  //维修方 修改change的属性
-                                rpRepairParty : result.data.rpRepairPerson
-                            }
-                        },
-                        width : 770,
-                        title : '维修后检查',
-                        scope : scope
-                    })
-                }else{
-                    scope.Tools.alert(result.message);
-                }
-            })
+            })*/
     }
 }])
 .controller('repairBillCtrl.dialog',['$scope','repairBillService',function(scope,repairBillService){  //维修单 controller  dialog
 
-    //新增修改 维修单 click
-    scope.saveOrUpdaterepairClick = function(){
-
-        //判断是否有id 如果没有id则为新增、有则为修改
-        if(scope.ngDialogData.repair.rpId){   //修改
-
-            if(scope.ngDialogData.dropDownDefault.repairResult.value != scope.constant.repairResult.qualified){   //为不合格
-                //维修类型
-                if(scope.ngDialogData.dropDownDefault.repairType){
-                    scope.ngDialogData.repair.rpType = scope.ngDialogData.dropDownDefault.repairType.value;
-                }
-
-                //检验结果
-                if(scope.ngDialogData.dropDownDefault.inspectionResults){
-                    scope.ngDialogData.repair.rpCheckResult = scope.ngDialogData.dropDownDefault.inspectionResults.value;
-                }
-                //维修方赋值
-                scope.ngDialogData.repair.rpRepairParty = scope.ngDialogData.repairChange.rpRepairParty;
-
-                //维修结果
-                scope.ngDialogData.repair.rpRepairResult = scope.ngDialogData.dropDownDefault.repairResult.value;
-            }else{  //合格
-                //维修结果
-                scope.ngDialogData.repair.rpRepairResult = scope.ngDialogData.dropDownDefault.repairResult.value;
-            }
-
-            repairBillService.submitAfterCheckAdd(scope.ngDialogData.repair)
-                .then(function(result){
-                    if(result.success){
-                        scope.Tools.alert('更新维修单成功');
-                        scope.list(scope.listParam());
-                        scope.closeThisDialog();
-                    }else{
-                        scope.Tools.alert(result.message);
-                    }
-                })
-        }else{  //新增
-
-            //维修类型
-            if(scope.ngDialogData.dropDownDefault.repairType){
-                scope.ngDialogData.repair.rpType = scope.ngDialogData.dropDownDefault.repairType.value;
-            }
-
-            //检验结果
-            if(scope.ngDialogData.dropDownDefault.inspectionResults){
-                scope.ngDialogData.repair.rpCheckResult = scope.ngDialogData.dropDownDefault.inspectionResults.value;
-            }
-
-            //货主
-            if(scope.ngDialogData.dropDownDefault.shipper){
-                scope.ngDialogData.repair.rpCustomerNo = scope.ngDialogData.dropDownDefault.shipper.customerId ? scope.ngDialogData.dropDownDefault.shipper.customerId.code : '';   //货主 code
-                scope.ngDialogData.repair.rpCustomerName = scope.ngDialogData.dropDownDefault.shipper.customerId ? scope.ngDialogData.dropDownDefault.shipper.customerId.name : '';   //货主 name
-            }
-
-            repairBillService.addWmsRepair(scope.ngDialogData.repair)
-                .then(function(result){
-                    if(result.success){
-                        scope.Tools.alert('新增维修单成功');
-                        scope.$parent.fristSelect = true;   //设置为第一次查询
-                        scope.list(scope.listParam());
-                        scope.closeThisDialog();
-                    }else{
-                        scope.Tools.alert(result.message);
-                    }
-                })
-        }
-    }
-
-    //维修结果 change
-    scope.repairResultChange = function(item){
-        //选择合格的时候把数据还原
-        if(item.value == scope.constant.repairResult.qualified){
-            //维修类型
-            scope.ngDialogData.dropDownDefault.repairType = scope.Tools.getRepairTypeDropDownByKey(scope.ngDialogData.repair.rpType);
-
-            //检验结果
-            scope.ngDialogData.dropDownDefault.inspectionResults = scope.Tools.getInspectionResultsDropDownByKey(scope.ngDialogData.repair.rpCheckResult);
-        }
-    }
-
-    //复制并新增 click
-    scope.copyAddClick = function(){
-
-        //维修类型
-        if(scope.ngDialogData.dropDownDefault.repairType){
-            scope.ngDialogData.repair.rpType = scope.ngDialogData.dropDownDefault.repairType.value;
-        }
-
-        //检验结果
-        if(scope.ngDialogData.dropDownDefault.inspectionResults){
-            scope.ngDialogData.repair.rpCheckResult = scope.ngDialogData.dropDownDefault.inspectionResults.value;
-        }
-        //维修方赋值
-        scope.ngDialogData.repair.rpRepairParty = scope.ngDialogData.repairChange.rpRepairParty;
-        //维修结果
-        scope.ngDialogData.repair.rpRepairResult = scope.ngDialogData.dropDownDefault.repairResult.value;
-
-        repairBillService.submitAfterCheckCopyAndAdd(scope.ngDialogData.repair)
-            .then(function(result){
-                if(result.success){
-                    scope.Tools.alert('复制并新增维修单成功');
-                    scope.list(scope.listParam());
-                }else{
-                    scope.Tools.alert(result.message);
-                }
-            })
-    }
 }])
 .controller('roleCtrl',['$scope','roleService','permissionsService',function(scope,roleService,permissionsService){   //角色 ctrl
     //更多条件默认值
diff --git a/public/js/ctrl/w.ctrl.js b/public/js/ctrl/w.ctrl.js
index 1d3f61bd577550e44e531b1fa9c1de299db5f840..c5a2e3ec6ecb0cae739bf230e82b72775e12de58 100644
--- a/public/js/ctrl/w.ctrl.js
+++ b/public/js/ctrl/w.ctrl.js
@@ -18,14 +18,17 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService
 
     /*状态数据*/
     scope.dropDownList = {
-        status : scope.Tools.dropDown.warehouseDropDown.concat()    //出库状态
+        status : scope.Tools.dropDown.warehouseDropDown.concat(),    //出库状态
+        quitTask : scope.Tools.dropDown.quitTaskDropDown.concat()   //是否退库
     }
 
-    scope.dropDownList.status.unshift(scope.constant.defaultDropDownNullData) //插入出库状态数据
+    scope.dropDownList.status.unshift(scope.constant.defaultDropDownNullData); //插入出库状态数据
+    scope.dropDownList.quitTask.unshift(scope.constant.defaultDropDownNullData); //插入出库状态数据
 
     //设置默认值
     scope.dropDownDefault = {
-        status :  scope.dropDownList.status[0] //出库状态
+        status :  scope.dropDownList.status[0], //出库状态
+        quitTask : scope.dropDownList.quitTask[0]   //是否退库
     }
 
     //获取车型
@@ -56,6 +59,18 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService
             }
         })
 
+    //获取司机
+    dropDownService.getUserByWarehouse()
+        .then(function(result){
+            if(result.success){
+                scope.dropDownList.driver= result.data;
+                scope.dropDownList.driver.unshift(scope.constant.defaultDropDownNullData); //插入空值
+                scope.dropDownDefault.driver = scope.dropDownList.driver[0];  //设置默认值
+            }else{
+                scope.Tools.alert(result.message);
+            }
+        })
+
     //列表查询接口参数构造
     scope.listParam = function(){
 
@@ -72,7 +87,9 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService
         if(scope.otherForm){    //展开了更多
             scope.search.otStatus = scope.dropDownDefault.status.value;    //出库状态
             scope.search.otVehicleSpecName = scope.dropDownDefault.vehicleSpec.name;   //车型
-            scope.search.otEstimateLane = scope.dropDownDefaults.otEstimateLane.elName;
+            scope.search.otEstimateLane = scope.dropDownDefaults.otEstimateLane.elName; //装车道
+            scope.search.otDriver = scope.dropDownDefault.driver.id;    //备料司机id
+            scope.search.otQuitFlag = scope.dropDownDefault.quitTask.value; //是否退库
             return scope.search;
         }else{  //没有展开
             return {
@@ -811,6 +828,7 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService
 
             if(scope.otherForm){    //展开了更多
                 scope.search.otVehicleSpecName = scope.dropDownDefault.vehicleSpec.name;   //车型
+                scope.search.otOutboundFlag = scope.dropDownDefault.shipmentStatus.value;   //发运状态
                 return scope.search;
             }else{  //没有展开
                 return {
@@ -821,8 +839,17 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService
             }
         }
 
-        scope.dropDownList = {};    //初始化 下拉对象
-        scope.dropDownDefault = {}; //初始化下拉默认对象
+        //下拉对象
+        scope.dropDownList = {
+            shipmentStatus : scope.Tools.dropDown.shipmentPlanStatusDropDown.concat()
+        };
+
+        scope.dropDownList.shipmentStatus.unshift(scope.constant.defaultDropDownNullData);  //插入空值
+        //下拉默认值
+        scope.dropDownDefault = {
+            shipmentStatus : scope.dropDownList.shipmentStatus[0]
+        };
+
         //获取车型
         dropDownService.getVehicleSpec()
             .then(function(result){
diff --git a/public/js/wms-config.js b/public/js/wms-config.js
index f2284d3106bc41027bc36d798e030dde01c4277e..ab807272d29d16a259d39506d1978f858a159e15 100644
--- a/public/js/wms-config.js
+++ b/public/js/wms-config.js
@@ -478,7 +478,6 @@ angular.module('wmsApp', ['ui.router', 'wms.controllers', 'wms.services','wms.fi
                 templateUrl:'templates/bigScreen/searchWaybillStatus.html'
             });
 
-
         $urlRouterProvider.otherwise('index');
 
         //配置restangular路径
diff --git a/public/js/wms-constant.js b/public/js/wms-constant.js
index 561cc7ad008cb2a817360aff9e811669bf02dbb9..1ba7bd8a188ae86242e191625f74ad13e4d51a33 100644
--- a/public/js/wms-constant.js
+++ b/public/js/wms-constant.js
@@ -66,12 +66,12 @@ angular.module('wms.constant',[])
             stop : '禁用'
         },
         repairType : {  //维修类型
-            inner : 10, //委内维修
-            outer : 20  //委外维修
+            inner : 10, //库内维修
+            outer : 20  //库外维修
         },
         repairTypeName : {  //维修类型 Name
-            inner : '委内维修',
-            outer : '委外维修'
+            inner : '库内维修',
+            outer : '库外维修'
         },
         repairStatus : {    //维修状态
             unprocessed : 10,   //未处理
@@ -89,8 +89,8 @@ angular.module('wms.constant',[])
             cancellinStocks : 30 //退库
         },
         repairResultName : {    //维修结果 name
-            qualified : '合格',   //合格
-            disqualification : '不合格',   //不合格
+            qualified : '返修验车合格',   //合格
+            disqualification : '返修验车不合格',   //不合格
             cancellinStocks : '退库' //退库
         },
         warehouse : {    //出库状态
@@ -242,12 +242,12 @@ angular.module('wms.constant',[])
             exit : '已退库'
         },
         shipmentPlanStatus : {  //发运状态
-            untreated : '0',  //未处理
-            treated : '1' //已处理
+            untreated : '0',  //未发运
+            treated : '1' //已发运
         },
         shipmentPlanStatusName : {  //发运状态 name
-            untreated : '未处理',
-            treated : '已处理'
+            untreated : '未发运',
+            treated : '已发运'
         },
         userType : {    //用户类型
             pc : 1, //pc
@@ -385,5 +385,13 @@ angular.module('wms.constant',[])
         gateController : {  //闸门控制
             notOpen : 0,    //不开闸门
             open : 1    //开闸
+        },
+        quitTask : {    //是否退库
+            yes : 1,
+            no : 0
+        },
+        quitTaskName : {    //是否退库  name
+            yes : '是',
+            no : '否'
         }
     })
\ No newline at end of file
diff --git a/public/js/wms-directive.js b/public/js/wms-directive.js
index f8da3aed9c934abb951cf784c1b242ebdd6ab37a..76ef526f78919bbb571c16dfd0f3bb531122302c 100644
--- a/public/js/wms-directive.js
+++ b/public/js/wms-directive.js
@@ -131,7 +131,7 @@ var directive = angular.module('wms.directives', [])
                 },
                 templateUrl:'/templates/bigScreen/components/percentage.html',
                 link : function(scope, elem, attrs, ctrl,$timeout){
-
+                    scope.thisPt = (scope.pt*100.00).toFixed(2);
                 }
             }
     }])
diff --git a/public/js/wms-filter.js b/public/js/wms-filter.js
index 0442ecda0b0db3cafd4a7e70d4440580be2da1a0..171513c21a3a222b70238e050fec7051925ae765 100644
--- a/public/js/wms-filter.js
+++ b/public/js/wms-filter.js
@@ -539,21 +539,41 @@ var wmsFilter = angular.module('wms.filter', [])
     })
     .filter('abnormal_excpDesc',function($sce){
         return function(str){
-            var temp = '';
-            var arr = str.split(',');
-            for(var i=0;i<arr.length;i++){
+            if(str){
+                var temp = '';
+                var arr = str.split(',');
+                for(var i=0;i<arr.length;i++){
                     temp+="<p style='text-align:left'>"+arr[i]+"</p>";
                 }
-            return $sce.trustAsHtml(temp);
+                return $sce.trustAsHtml(temp);
+            } else {
+                var str = '<div style="height: auto;text-align: center">无</div>';
+                return $sce.trustAsHtml(str)
+            }
             }
     })
     .filter('isHasIcon',function(){
         return function(str){
-            if(str.indexOf(',')==-1){
-                return false;
+            if(str){
+                if(str.indexOf(',')==-1){
+                    return false;
+                } else {
+                    return true;
+                }
             } else {
-                return true;
+                return false
             }
+
         }
     })
 
+    .filter('quitTaskFilter',['constant',function(constant){  //是否退库
+        return function(input,param){
+            if(input == constant.quitTask.yes){   //是
+                return constant.quitTaskName.yes;
+            }else if(input == constant.quitTask.no){   //否
+                return constant.quitTaskName.no;
+            }
+            return input;
+        }
+    }])
diff --git a/public/js/wms-service.js b/public/js/wms-service.js
index 85c9405ba89fcdbf639d391d861f678432169b69..2a050441b5869900a3fdee75a930d82403ce4018 100644
--- a/public/js/wms-service.js
+++ b/public/js/wms-service.js
@@ -418,6 +418,9 @@ var wmsService = angular.module('wms.services', [])
             },
             getColorList : function(){  //车型颜色
                 return httpService.customGET('/baseData/getColorList');
+            },
+            getUserByWarehouse : function(){    //获取司机
+                return httpService.customGET('/sysUser/getUserByWarehouse');
             }
         }
     }])
@@ -608,7 +611,7 @@ var wmsService = angular.module('wms.services', [])
             open : function(channel,open,led1,led2,sound){ //打开闸门
                 return http({
                     method : 'POST',
-                    url : 'http://127.0.0.1:8080/Open',
+                    url : 'http://192.168.5.210:8080/Open',
                     headers:{'Content-Type': 'text/plain;charset=UTF-8'},
                     data : {
                         cmd : 'lpr',
diff --git a/public/js/wms-tools.js b/public/js/wms-tools.js
index f98ebfd4c17eeb5d40b67de76743902c7158af7f..12e7b2d33314cb2f24e27f8048a6307c69abee15 100644
--- a/public/js/wms-tools.js
+++ b/public/js/wms-tools.js
@@ -93,11 +93,11 @@ wmsService.service('Tools',['ngDialog','constant','$timeout',function(ngDialog,c
             ],
             repairTypeDropDown : [  //维修类型状态
                 {
-                    name : constant.repairTypeName.inner,   //委内维修
+                    name : constant.repairTypeName.inner,   //库内维修
                     value : constant.repairType.inner
                 },
                 {
-                    name : constant.repairTypeName.outer,   //委外维修
+                    name : constant.repairTypeName.outer,   //库外维修
                     value : constant.repairType.outer
                 }
             ],
@@ -123,11 +123,11 @@ wmsService.service('Tools',['ngDialog','constant','$timeout',function(ngDialog,c
                 {
                     name : constant.repairResultName.disqualification,   //不合格
                     value : constant.repairResult.disqualification
-                },
+                }/*,
                 {
                     name : constant.repairResultName.cancellinStocks,   //退库
                     value : constant.repairResult.cancellinStocks
-                }
+                }*/
             ],
             warehouseDropDown : [    //出库状态
                 {
@@ -472,6 +472,16 @@ wmsService.service('Tools',['ngDialog','constant','$timeout',function(ngDialog,c
                     name : constant.departureTypeName.errorDeparture,   //异常离场
                     value : constant.departureType.errorDeparture
                 }
+            ],
+            quitTaskDropDown : [    //是否退库
+                {
+                    name : constant.quitTaskName.yes,   //是
+                    value : constant.quitTask.yes
+                },
+                {
+                    name : constant.quitTaskName.no,   //否
+                    value : constant.quitTask.no
+                }
             ]
         },
         modelAssignment : function(valueObj,scope){  //给model赋值
diff --git a/public/templates/bigScreen/components/percentage.html b/public/templates/bigScreen/components/percentage.html
index 01936d3a849f990e5e86b0978688db40ca74c468..48f190477ab206de84ede049ed2930bf412115ec 100644
--- a/public/templates/bigScreen/components/percentage.html
+++ b/public/templates/bigScreen/components/percentage.html
@@ -1,6 +1,6 @@
 <div id="bs_ow_cp_pt_main">
     <div id="bs_ow_cp_pt_percentage" style="width: {{pt*100+'%'}}" >
-        <span class="bs_ow_cp_pt_temp1">{{pt*100 +'%'}}</span>
+        <span class="bs_ow_cp_pt_temp1">{{thisPt +'%'}}</span>
     </div>
-    <span class="bs_ow_cp_pt_temp"></span>
+    <span class="bs_ow_cp_pt_temp" ng-show="false"></span>
 </div>
\ No newline at end of file
diff --git a/public/templates/maintenanceManagement/abnormalManagement/abnormalManagement.html b/public/templates/maintenanceManagement/abnormalManagement/abnormalManagement.html
index 443a05408e875e204053f7716544966af1e84f86..82a0db57d16b637a9ad34b28d4b4693573d33e61 100644
--- a/public/templates/maintenanceManagement/abnormalManagement/abnormalManagement.html
+++ b/public/templates/maintenanceManagement/abnormalManagement/abnormalManagement.html
@@ -120,7 +120,7 @@
                     <th>处理结果描述</th>
                     <th>处理完成时间</th>
                 </tr>
-                <tr ng-repeat="(key,item) in tableList"  repeat-finish ng-click="Tools.initTableClick($event)" key="{{key}}" excptype="{{item.excpType}}" orderid="{{item.orderId}}">
+                <tr ng-repeat="(key,item) in tableList"  repeat-finish ng-click="Tools.initTableClick($event)" key="{{key}}" excptype="{{item.excpType}}" orderid="{{item.orderId}}" excpTimestamp="{{item.excpTimestamp}}">
                     <td>
                         <input type="checkbox" name="same" lay-skin="primary" lay-filter="test">
                     </td>
@@ -133,13 +133,16 @@
                         <div class="abm_desc_div">
                             <!--<i class="layui-icon" style="font-size:12px;">&#xe61a;</i>&nbsp;&nbsp;{{item.excpDesc | abnormal_excpDesc}}-->
                             <i class="layui-icon abm_table_icon" ng-show="item.excpDesc|isHasIcon">&#xe61a;</i>
-                            <i class="layui-icon abm_table_icon" ng-show="!(item.excpDesc|isHasIcon)" style="opacity: 0">&#xe61a;</i>
+                            <i class="layui-icon abm_table_icon" ng-show="!(item.excpDesc | isHasIcon)" style="opacity: 0">&#xe61a;</i>
                             &nbsp;&nbsp;
                             <span ng-bind-html="item.excpDesc | abnormal_excpDesc" style="float: left"></span>
                         </div>
                     </td>
                     <td ng-bind="item.involvedParty"></td>
-                    <td><span style="color: #de531a; text-decoration: underline" ng-click="getDetail($event)">查看</span></td>
+                    <td>
+                        <span style="color: #de531a; text-decoration: underline" ng-click="getDetail($event)" ng-show="item.excpDesc">查看</span>
+                        <span ng-show="!item.excpDesc">无</span>
+                    </td>
                     <td ng-bind="item.gmtCreate"></td>
                     <td ng-bind="item.dealType | abnormal_dealType"></td>
                     <td ng-bind="item.dealResultDesc"></td>
diff --git a/public/templates/maintenanceManagement/repairBill/repair-bill-form.html b/public/templates/maintenanceManagement/repairBill/repair-bill-form.html
index ed2c8d176493a62f2671b2cb73e693ea51a55de6..d26aa3f08ea3363c1fef428588273d252c1f5d96 100644
--- a/public/templates/maintenanceManagement/repairBill/repair-bill-form.html
+++ b/public/templates/maintenanceManagement/repairBill/repair-bill-form.html
@@ -1,134 +1,26 @@
-<div class="dialog-body">
+<div class="dialog-body" style="height: 200px;">
     <ul class="dialog-body-ul">
         <li class="dialog-body-li">
             <div class="dialog-body-item">
-                <div class="dialog-label">维修单号</div>
+                <div class="dialog-label">维修单位</div>
                 <div class="dialog-content">
                     <input type="text" class="layui-input" ng-model="ngDialogData.repair.rpRepairNo"/>
                 </div>
             </div>
-            <div class="dialog-body-item">
-                <div class="dialog-label">维修类型</div>
-                <div class="dialog-content">
-                    <ui-select ng-model="ngDialogData.dropDownDefault.repairType">
-                        <ui-select-match>
-                            <span ng-bind="$select.selected.name"></span>
-                        </ui-select-match>
-                        <ui-select-choices repeat="repairType in (ngDialogData.repairType | filter: $select.search) track by repairType.value">
-                            <span ng-bind="repairType.name"></span>
-                        </ui-select-choices>
-                        <ui-select-no-choice>
-                            没有加载到数据
-                        </ui-select-no-choice>
-                    </ui-select>
-                </div>
-            </div>
-            <div class="dialog-body-item">
-                <div class="dialog-label">质损单号</div>
-                <div class="dialog-content">
-                    <input type="text" class="layui-input" ng-model="ngDialogData.repair.rpZsNo"/>
-                </div>
-            </div>
         </li>
-
         <li class="dialog-body-li">
             <div class="dialog-body-item">
-                <div class="dialog-label">维修出库单号</div>
-                <div class="dialog-content">
-                    <input type="text" class="layui-input" ng-model="ngDialogData.repair.rpOutbillNo"/>
-                </div>
-            </div>
-            <div class="dialog-body-item">
-                <div class="dialog-label">底盘号</div>
-                <div class="dialog-content">
-                    <input type="text" class="layui-input" ng-model="ngDialogData.repair.rpVin"/>
-                </div>
-            </div>
-            <div class="dialog-body-item">
-                <div class="dialog-label">运输单号</div>
+                <div class="dialog-label">维修完成时间</div>
                 <div class="dialog-content">
-                    <input type="text" class="layui-input" ng-model="ngDialogData.repair.rpWaybillNo"/>
+                    <input type="text" lay-verify="date" placeholder="yyyy-mm-dd" ng-model="search.rpEndDate" ng-click="Tools.modelAssignment($event,this)" autocomplete="off" class="layui-input" onclick="layui.laydate({elem: this,format:'YYYY-MM-DD',choose : angular.element(this).scope().Tools.modelAssignment,scope:angular.element(this).scope()})">
                 </div>
             </div>
         </li>
-
-        <li class="dialog-body-li">
-            <div class="dialog-body-item">
-                <div class="dialog-label">货主</div>
-                <div class="dialog-content">
-                    <!--<input type="text" class="layui-input" ng-model="ngDialogData.repair.rpCustomerNo"/>-->
-                    <ui-select ng-model="ngDialogData.dropDownDefault.shipper">
-                        <ui-select-match>
-                            <span ng-bind="$select.selected.customerId.name"></span>
-                        </ui-select-match>
-                        <ui-select-choices repeat="shipper in (dropDownList.shipper | filter: $select.search)">
-                            <span ng-bind="shipper.customerId.name"></span>
-                        </ui-select-choices>
-                        <ui-select-no-choice>
-                            没有加载到数据
-                        </ui-select-no-choice>
-                    </ui-select>
-                </div>
-            </div>
-            <div class="dialog-body-item">
-                <div class="dialog-label">目的地</div>
-                <div class="dialog-content">
-                    <input type="text" class="layui-input" ng-model="ngDialogData.repair.rpDest"/>
-                </div>
-            </div>
-            <div class="dialog-body-item">
-                <div class="dialog-label">货物说明</div>
-                <div class="dialog-content">
-                    <input type="text" class="layui-input" ng-model="ngDialogData.repair.rpGoodsExplain"/>
-                </div>
-            </div>
-        </li>
-
-        <li class="dialog-body-li">
-            <div class="dialog-body-item">
-                <div class="dialog-label">检验结果</div>
-                <div class="dialog-content">
-                    <ui-select ng-model="ngDialogData.dropDownDefault.inspectionResults">
-                        <ui-select-match>
-                            <span ng-bind="$select.selected.name"></span>
-                        </ui-select-match>
-                        <ui-select-choices repeat="inspectionResults in (ngDialogData.inspectionResults | filter: $select.search) track by inspectionResults.value">
-                            <span ng-bind="inspectionResults.name"></span>
-                        </ui-select-choices>
-                        <ui-select-no-choice>
-                            没有加载到数据
-                        </ui-select-no-choice>
-                    </ui-select>
-                </div>
-            </div>
-            <div class="dialog-body-item">
-                <div class="dialog-label">车辆问题描述</div>
-                <div class="dialog-content">
-                    <input type="text" class="layui-input" ng-model="ngDialogData.repair.rpProblemDescribe"/>
-                </div>
-            </div>
-            <div class="dialog-body-item">
-                <div class="dialog-label">责任方</div>
-                <div class="dialog-content">
-                    <input type="text" class="layui-input" ng-model="ngDialogData.repair.rpResponsibleParty"/>
-                </div>
-            </div>
-        </li>
-
-        <li class="dialog-body-li">
-            <div class="dialog-body-item">
-                <div class="dialog-label">维修方</div>
-                <div class="dialog-content">
-                    <input type="text" class="layui-input" ng-model="ngDialogData.repair.rpRepairParty"/>
-                </div>
-            </div>
-        </li>
-
         <li class="dialog-body-li">
             <div class="dialog-body-item">
-                <div class="dialog-label">备注</div>
+                <div class="dialog-label">备注说明</div>
                 <div class="dialog-content">
-                    <textarea cols="101" rows="5" ng-model="ngDialogData.repair.remark"></textarea>
+                    <textarea cols="22" rows="5" ng-model="ngDialogData.receipt.odRemark"></textarea>
                 </div>
             </div>
         </li>
diff --git a/public/templates/maintenanceManagement/repairBill/repair-bill-list.html b/public/templates/maintenanceManagement/repairBill/repair-bill-list.html
index 37054df1105b638d642e9d5aff87deb96e9f16a2..9719263f772b72e94199404484241734b2a2fe70 100644
--- a/public/templates/maintenanceManagement/repairBill/repair-bill-list.html
+++ b/public/templates/maintenanceManagement/repairBill/repair-bill-list.html
@@ -2,9 +2,9 @@
     <div class="main-content">
         <div class="page-function">
             <ul class="wms-wbm-fun-left">
-                <button class="layui-btn" ng-click="addRepairBillClick()" >新增</button>
+                <!--<button class="layui-btn" ng-click="addRepairBillClick()" >新增</button>-->
                 <button class="layui-btn" ng-click="submitRepairBillClick()">提交维修</button>
-                <button class="layui-btn" ng-click="repairCheckClick()">维修后检验</button>
+                <!--<button class="layui-btn" ng-click="repairCheckClick()">维修后检验</button>-->
                 <button class="layui-btn">打印</button>
             </ul>
             <div class="wms-wbm-fun-right">
@@ -16,6 +16,12 @@
         <div class="otherForm" style="width: 96%" ng-show="otherForm">
             <ul>
                 <li>
+                    <div class="otherFormItem">
+                        <div>维修单号</div>
+                        <div>
+                            <input type="text" class="layui-input" ng-model="search.rpRepairNo"/>
+                        </div>
+                    </div>
                     <div class="otherFormItem">
                         <div>维修类型</div>
                         <div>
@@ -48,59 +54,6 @@
                             </ui-select>
                         </div>
                     </div>
-                    <div class="otherFormItem">
-                        <div>底盘号</div>
-                        <div>
-                            <input type="text" class="layui-input" ng-model="search.rpVin"/>
-                        </div>
-                    </div>
-                    <div class="otherFormItem">
-                        <div>运输单号</div>
-                        <div>
-                            <input type="text" class="layui-input" ng-model="search.rpWaybillNo"/>
-                        </div>
-                    </div>
-                </li>
-
-                <li>
-                    <div class="otherFormItem">
-                        <div>货主</div>
-                        <div>
-                            <ui-select ng-model="dropDownDefault.shipper">
-                                <ui-select-match>
-                                    <span ng-bind="$select.selected.customerId.name"></span>
-                                </ui-select-match>
-                                <ui-select-choices repeat="shipper in (dropDownList.shipper | filter: $select.search)">
-                                    <span ng-bind="shipper.customerId.name"></span>
-                                </ui-select-choices>
-                                <ui-select-no-choice>
-                                    没有加载到数据
-                                </ui-select-no-choice>
-                            </ui-select>
-                        </div>
-                    </div>
-                    <div class="otherFormItem">
-                        <div>目的地</div>
-                        <div>
-                            <input type="text" class="layui-input" ng-model="search.rpDest"/>
-                        </div>
-                    </div>
-                    <div class="otherFormItem">
-                        <div>检验结果</div>
-                        <div>
-                            <ui-select ng-model="dropDownDefault.inspectionResults">
-                                <ui-select-match>
-                                    <span ng-bind="$select.selected.name"></span>
-                                </ui-select-match>
-                                <ui-select-choices repeat="inspectionResults in (dropDownList.inspectionResults | filter: $select.search)">
-                                    <span ng-bind="inspectionResults.name"></span>
-                                </ui-select-choices>
-                                <ui-select-no-choice>
-                                    没有加载到数据
-                                </ui-select-no-choice>
-                            </ui-select>
-                        </div>
-                    </div>
                     <div class="otherFormItem">
                         <div>维修结果</div>
                         <div>
@@ -118,7 +71,6 @@
                         </div>
                     </div>
                 </li>
-
                 <li>
                     <div class="otherFormItem">
                         <div>创建日期</div>
@@ -133,7 +85,7 @@
                         </div>
                     </div>
                     <div class="otherFormItem">
-                        <div>维修完成时间</div>
+                        <div>实际完成时间</div>
                         <div>
                             <input type="text" lay-verify="date" placeholder="yyyy-mm-dd" ng-model="search.rpStartDate" ng-click="Tools.modelAssignment($event,this)" autocomplete="off" class="layui-input" onclick="layui.laydate({elem: this,format:'YYYY-MM-DD',choose : angular.element(this).scope().Tools.modelAssignment,scope:angular.element(this).scope()})">
                         </div>
@@ -164,25 +116,18 @@
                                 <i class="layui-icon"></i>
                             </div>
                         </th>
-                        <th>序号</th>
                         <th>维修单号</th>
+                        <th>车架号</th>
+                        <th>车辆问题描述</th>
                         <th>维修类型</th>
                         <th>维修状态</th>
-                        <th>质损单号</th>
-                        <th>维修出库单号</th>
-                        <th>底盘号</th>
-                        <th>运输单号</th>
-                        <th>货主</th>
-                        <th>目的地</th>
-                        <th>货物说明</th>
-                        <th>检验结果</th>
-                        <th>车辆问题描述</th>
                         <th>责任方</th>
-                        <th>维护方</th>
-                        <th>维修结果</th>
-                        <th>维修完成时间</th>
-                        <th>创建人</th>
                         <th>创建时间</th>
+                        <th>维修单位</th>
+                        <th>预计维修完成时间</th>
+                        <th>维修结果</th>
+                        <th>实际维修完成时间</th>
+                        <th>维修耗时(小时)</th>
                         <th>备注</th>
                     </tr>
                     <tr ng-repeat="repairBill in repairBillList" ng-click="Tools.initTableClick($event)">
@@ -192,25 +137,18 @@
                                 <i class="layui-icon"></i>
                             </div>
                         </td>
-                        <td ng-bind="$index + 1"></td>
                         <td ng-bind="repairBill.rpRepairNo"></td>
-                        <td ng-bind="repairBill.rpType | repairTypeFilter"></td>
-                        <td ng-bind="repairBill.rpStatus | repairStatusFilter"></td>
-                        <td ng-bind="repairBill.rpZsNo"></td>
-                        <td ng-bind="repairBill.rpOutbillNo"></td>
                         <td ng-bind="repairBill.rpVin"></td>
-                        <td ng-bind="repairBill.rpWaybillNo"></td>
-                        <td ng-bind="repairBill.rpCustomerName"></td>
-                        <td ng-bind="repairBill.rpDest"></td>
-                        <td ng-bind="repairBill.rpGoodsExplain"></td>
-                        <td ng-bind="repairBill.rpCheckResult | inspectionResultsFilter"></td>
                         <td ng-bind="repairBill.rpProblemDescribe"></td>
-                        <td ng-bind="repairBill.rpResponsibility"></td>
-                        <td ng-bind="repairBill.rpRepairPerson"></td>
-                        <td ng-bind="repairBill.rpRepairResult | repairResultFilter"></td>
-                        <td ng-bind="repairBill.rpEndDate"></td>
-                        <td ng-bind="repairBill.createPerson"></td>
+                        <td ng-bind="repairBill.rpType | repairTypeFilter"></td>
+                        <td ng-bind="repairBill.rpStatus | repairStatusFilter"></td>
+                        <td ng-bind="repairBill.rpResponsibleParty"></td>
                         <td ng-bind="repairBill.gmtCreate"></td>
+                        <td ng-bind="repairBill.rpRepairParty"></td>
+                        <td ng-bind="repairBill.rpEndDate"></td>
+                        <td ng-bind="repairBill.rpRepairResult | repairResultFilter"></td>
+                        <td ng-bind="repairBill.a3"></td>
+                        <td ng-bind="repairBill.a4"></td>
                         <td ng-bind="repairBill.remark"></td>
                     </tr>
                 </tbody>
diff --git a/public/templates/maintenanceManagement/repairBill/repair-check-form.html b/public/templates/maintenanceManagement/repairBill/repair-check-form.html
deleted file mode 100644
index 383d0a11964f5e2f256f3f8f725f50136d3091f5..0000000000000000000000000000000000000000
--- a/public/templates/maintenanceManagement/repairBill/repair-check-form.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<div class="dialog-body">
-    <ul class="dialog-body-ul">
-        <li class="dialog-body-li">
-            <div class="dialog-body-item">
-                <div class="dialog-label">维修单号</div>
-                <div class="dialog-content">
-                    <input type="text" class="layui-input layui-disabled" ng-model="ngDialogData.repair.rpRepairNo" ng-readonly="true" />
-                </div>
-            </div>
-            <div class="dialog-body-item">
-                <div class="dialog-label">维修类型</div>
-                <div class="dialog-content" ng-show="ngDialogData.dropDownDefault.repairResult.value != constant.repairResult.qualified">
-                    <ui-select ng-model="ngDialogData.dropDownDefault.repairType">
-                        <ui-select-match>
-                            <span ng-bind="$select.selected.name"></span>
-                        </ui-select-match>
-                        <ui-select-choices repeat="repairType in (ngDialogData.repairType | filter: $select.search) track by repairType.value">
-                            <span ng-bind="repairType.name"></span>
-                        </ui-select-choices>
-                        <ui-select-no-choice>
-                            没有加载到数据
-                        </ui-select-no-choice>
-                    </ui-select>
-                </div>
-                <div class="dialog-content" ng-show="ngDialogData.dropDownDefault.repairResult.value == constant.repairResult.qualified">
-                    <input type="text" class="layui-input layui-disabled" ng-model="ngDialogData.dropDownDefault.repairType.name" ng-readonly="true"/>
-                </div>
-            </div>
-            <div class="dialog-body-item">
-                <div class="dialog-label">质损单号</div>
-                <div class="dialog-content">
-                    <input type="text" class="layui-input layui-disabled" ng-model="ngDialogData.repair.rpZsNo"/>
-                </div>
-            </div>
-        </li>
-
-        <li class="dialog-body-li">
-            <div class="dialog-body-item">
-                <div class="dialog-label">维修出库单号</div>
-                <div class="dialog-content">
-                    <input type="text" class="layui-input layui-disabled" ng-model="ngDialogData.repair.rpOutbillNo"/>
-                </div>
-            </div>
-            <div class="dialog-body-item">
-                <div class="dialog-label">底盘号</div>
-                <div class="dialog-content">
-                    <input type="text" class="layui-input layui-disabled" ng-model="ngDialogData.repair.rpVin"/>
-                </div>
-            </div>
-            <div class="dialog-body-item">
-                <div class="dialog-label">运输单号</div>
-                <div class="dialog-content">
-                    <input type="text" class="layui-input layui-disabled" ng-model="ngDialogData.repair.rpWaybillNo"/>
-                </div>
-            </div>
-        </li>
-
-        <li class="dialog-body-li">
-            <div class="dialog-body-item">
-                <div class="dialog-label">货主</div>
-                <div class="dialog-content">
-                    <input type="text" class="layui-input layui-disabled" ng-model="ngDialogData.repair.rpCustomerNo"/>
-                </div>
-            </div>
-            <div class="dialog-body-item">
-                <div class="dialog-label">目的地</div>
-                <div class="dialog-content">
-                    <input type="text" class="layui-input layui-disabled" ng-model="ngDialogData.repair.rpDest"/>
-                </div>
-            </div>
-            <div class="dialog-body-item">
-                <div class="dialog-label">货物说明</div>
-                <div class="dialog-content">
-                    <input type="text" class="layui-input layui-disabled" ng-model="ngDialogData.repair.rpGoodsExplain"/>
-                </div>
-            </div>
-        </li>
-
-        <li class="dialog-body-li">
-            <div class="dialog-body-item">
-                <div class="dialog-label">检验结果</div>
-                <div class="dialog-content" ng-show="ngDialogData.dropDownDefault.repairResult.value != constant.repairResult.qualified">
-                    <ui-select ng-model="ngDialogData.dropDownDefault.inspectionResults">
-                        <ui-select-match>
-                            <span ng-bind="$select.selected.name"></span>
-                        </ui-select-match>
-                        <ui-select-choices repeat="inspectionResults in (ngDialogData.inspectionResults | filter: $select.search) track by inspectionResults.value">
-                            <span ng-bind="inspectionResults.name"></span>
-                        </ui-select-choices>
-                        <ui-select-no-choice>
-                            没有加载到数据
-                        </ui-select-no-choice>
-                    </ui-select>
-                </div>
-                <div class="dialog-content" ng-show="ngDialogData.dropDownDefault.repairResult.value == constant.repairResult.qualified">
-                    <input type="text" class="layui-input layui-disabled" ng-model="ngDialogData.dropDownDefault.inspectionResults.name" ng-readonly="true"/>
-                </div>
-            </div>
-            <div class="dialog-body-item">
-                <div class="dialog-label">车辆问题描述</div>
-                <div class="dialog-content">
-                    <input type="text" class="layui-input layui-disabled" ng-model="ngDialogData.repair.rpProblemDescribe"/>
-                </div>
-            </div>
-            <div class="dialog-body-item">
-                <div class="dialog-label">责任方</div>
-                <div class="dialog-content">
-                    <input type="text" class="layui-input layui-disabled" ng-model="ngDialogData.repair.rpResponsibleParty"/>
-                </div>
-            </div>
-        </li>
-
-        <li class="dialog-body-li">
-            <div class="dialog-body-item">
-                <div class="dialog-label">维修方</div>
-                <div class="dialog-content" ng-show="ngDialogData.dropDownDefault.repairResult.value == constant.repairResult.qualified">
-                    <input type="text" class="layui-input layui-disabled" ng-model="ngDialogData.repair.rpRepairParty" ng-readonly="true"/>
-                </div>
-                <div class="dialog-content" ng-show="ngDialogData.dropDownDefault.repairResult.value != constant.repairResult.qualified">
-                    <input type="text" class="layui-input"  ng-model="ngDialogData.repairChange.rpRepairParty"/>
-                </div>
-            </div>
-            <div class="dialog-body-item">
-                <div class="dialog-label">维修结果</div>
-                <div class="dialog-content">
-                    <ui-select ng-model="ngDialogData.dropDownDefault.repairResult" on-select="repairResultChange($item)">
-                        <ui-select-match>
-                            <span ng-bind="$select.selected.name"></span>
-                        </ui-select-match>
-                        <ui-select-choices repeat="repairResult in (ngDialogData.repairResult | filter: $select.search) track by repairResult.value">
-                            <span ng-bind="repairResult.name"></span>
-                        </ui-select-choices>
-                        <ui-select-no-choice>
-                            没有加载到数据
-                        </ui-select-no-choice>
-                    </ui-select>
-                </div>
-            </div>
-            <div class="dialog-body-item">
-                <div class="dialog-label">维修完成时间</div>
-                <div class="dialog-content">
-                    <input type="text" lay-verify="date" placeholder="yyyy-mm-dd" ng-model="ngDialogData.repair.rpEndDate" ng-click="Tools.modelAssignment($event,this)" autocomplete="off" class="layui-input" onclick="layui.laydate({elem: this,format:'YYYY-MM-DD',choose : angular.element(this).scope().Tools.modelAssignment,scope:angular.element(this).scope()})">
-                </div>
-            </div>
-        </li>
-        <li class="dialog-body-li">
-            <div class="dialog-body-item">
-                <div class="dialog-label">备注</div>
-                <div class="dialog-content">
-                    <textarea cols="61" rows="5" ng-model="ngDialogData.repair.remark"></textarea>
-                </div>
-            </div>
-        </li>
-    </ul>
-</div>
-
-<div class="dialog-toolbar">
-    <button class="layui-btn" ng-click="copyAddClick()" ng-show="ngDialogData.dropDownDefault.repairResult.value != constant.repairResult.qualified">复制并新增</button>
-    <button class="layui-btn" ng-click="saveOrUpdaterepairClick()">保存</button>
-    <button class="layui-btn" ng-click="closeThisDialog()">取消</button>
-</div>
\ No newline at end of file
diff --git a/public/templates/warehouseManagement/warehouse/warehouse-list.html b/public/templates/warehouseManagement/warehouse/warehouse-list.html
index 6d11d30a3f6c0af8cc3e19758d5eb013c919e068..f7a45d2b15076b156fc9c211374e0cfe50d01e69 100644
--- a/public/templates/warehouseManagement/warehouse/warehouse-list.html
+++ b/public/templates/warehouseManagement/warehouse/warehouse-list.html
@@ -4,7 +4,6 @@
             <ul class="wms-wbm-fun-left">
                 <button class="layui-btn" ng-click="outboundWarehouseClick()" ng-if="userInfo.whCode.indexOf(constant.userWarehouseType.UNLCN_XN_) != -1">备料出库</button>
                 <button class="layui-btn" ng-click="outboundConfirmClick()" ng-if="userInfo.whCode.indexOf(constant.userWarehouseType.UNLCN_XN_) != -1">备料确认</button>
-                <!--<button class="layui-btn" ng-click="printOutboundReceiptClick()" ng-if="userInfo.whCode.indexOf(constant.userWarehouseType.JM_) != -1">打印出库交接单</button>-->
                 <button class="layui-btn" ng-click="cancelTaskClick()" ng-if="userInfo.whCode.indexOf(constant.userWarehouseType.UNLCN_XN_) != -1">任务取消</button>
                 <button class="layui-btn" ng-click="quitTaskClick()" ng-if="userInfo.whCode.indexOf(constant.userWarehouseType.UNLCN_XN_) != -1">备料退库</button>
                 <button class="layui-btn" ng-click="outConfirmClick()" ng-if="userInfo.whCode.indexOf(constant.userWarehouseType.JM_) != -1">出库确认</button>
@@ -106,6 +105,40 @@
                         </div>
                     </div>
                 </li>
+                <li>
+                    <div class="otherFormItem">
+                        <div>是否退库</div>
+                        <div>
+                            <ui-select ng-model="dropDownDefault.quitTask">
+                                <ui-select-match>
+                                    <span ng-bind="$select.selected.name"></span>
+                                </ui-select-match>
+                                <ui-select-choices repeat="quitTask in (dropDownList.quitTask | filter: $select.search) track by quitTask.value">
+                                    <span ng-bind="quitTask.name"></span>
+                                </ui-select-choices>
+                                <ui-select-no-choice>
+                                    没有加载到数据
+                                </ui-select-no-choice>
+                            </ui-select>
+                        </div>
+                    </div>
+                    <div class="otherFormItem">
+                        <div>备料司机</div>
+                        <div>
+                            <ui-select ng-model="dropDownDefault.driver">
+                                <ui-select-match>
+                                    <span ng-bind="$select.selected.name"></span>
+                                </ui-select-match>
+                                <ui-select-choices repeat="driver in (dropDownList.driver | filter: $select.search)">
+                                    <span ng-bind="driver.name"></span>
+                                </ui-select-choices>
+                                <ui-select-no-choice>
+                                    没有加载到数据
+                                </ui-select-no-choice>
+                            </ui-select>
+                        </div>
+                    </div>
+                </li>
 
                 <li>
                     <div class="otherFormItem otherFormItemButton">
@@ -134,6 +167,7 @@
                         <th>库位</th>
                         <th>装车道</th>
                         <th>状态</th>
+                        <th ng-if="userInfo.whCode.indexOf(constant.userWarehouseType.UNLCN_XN_) != -1">是否退库</th>
                         <th>备料司机</th>
                         <th>任务开始时间</th>
                         <th>任务完成时间</th>
@@ -155,6 +189,7 @@
                         <td ng-bind="warehouse.otLocationCode"></td>
                         <td ng-bind="warehouse.otEstimateLane"></td>
                         <td ng-bind="warehouse.otStatus | warehouseFilter"></td>
+                        <td ng-bind="warehouse.a1 | quitTaskFilter" ng-if="userInfo.whCode.indexOf(constant.userWarehouseType.UNLCN_XN_) != -1"></td>
                         <td ng-bind="warehouse.otDriver"></td>
                         <td ng-bind="warehouse.otTaskStartTime"></td>
                         <td ng-bind="warehouse.otTaskEndTime"></td>
diff --git a/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html b/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html
index 0fbcbdf9ceb75bb25d78457b28d313c3f31a7e76..ee2e93b75eb3a6b5c050008a085eade8af0dc840 100644
--- a/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html
+++ b/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html
@@ -33,6 +33,25 @@
                             </ui-select>
                         </div>
                     </div>
+                    <div class="otherFormItem">
+                        <div>发运状态</div>
+                        <div>
+                            <ui-select ng-model="dropDownDefault.shipmentStatus">
+                                <ui-select-match>
+                                    <span ng-bind="$select.selected.name"></span>
+                                </ui-select-match>
+                                <ui-select-choices repeat="shipmentStatus in (dropDownList.shipmentStatus | filter: $select.search)">
+                                    <span ng-bind="shipmentStatus.name"></span>
+                                </ui-select-choices>
+                                <ui-select-no-choice>
+                                    没有加载到数据
+                                </ui-select-no-choice>
+                            </ui-select>
+                        </div>
+                    </div>
+                </li>
+
+                <li>
                     <div class="otherFormItem">
                         <div>出库确认时间</div>
                         <div>
@@ -66,6 +85,8 @@
                         <th>出库类型</th>
                         <th>出库确认时间</th>
                         <th>出库确认人</th>
+                        <th ng-if="userInfo.whCode.indexOf(constant.userWarehouseType.UNLCN_XN_) != -1">发运状态</th>
+                        <th ng-if="userInfo.whCode.indexOf(constant.userWarehouseType.UNLCN_XN_) != -1">发运时间</th>
                         <th ng-if="userInfo.whCode.indexOf(constant.userWarehouseType.UNLCN_XN_) != -1">板车出库时间</th>
                     </tr>
                     <tr ng-repeat="inventoryRecords in inventoryRecordsList" ng-click="Tools.initTableClick($event)">
@@ -76,6 +97,8 @@
                         <td ng-bind="inventoryRecords.otType | outboundTypeFilter"></td>
                         <td ng-bind="inventoryRecords.otBlConfirmTime"></td>
                         <td ng-bind="inventoryRecords.modifyUserName"></td>
+                        <td ng-bind="inventoryRecords.otOutboundFlag | shipmentPlanStatusFilter"></td>
+                        <td ng-bind="inventoryRecords.inspectTime"></td>
                         <td ng-bind="inventoryRecords.otDepartureTime" ng-if="userInfo.whCode.indexOf(constant.userWarehouseType.UNLCN_XN_) != -1"></td>
                     </tr>
                 </tbody>
diff --git a/routes/resource/base-config.js b/routes/resource/base-config.js
index 1ccfe44f6eb1f0c02363698627c510fc719810f2..bafd2932e356fd0e80b47e78780de38b0beaf7ac 100644
--- a/routes/resource/base-config.js
+++ b/routes/resource/base-config.js
@@ -1,3 +1,3 @@
-/**Created on 2017-11-28*/
+/**Created on 2017-11-30*/
 
'use strict';
 
module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://120.77.8.167/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"123456a"}};
\ No newline at end of file