From 36a3a6e78035ebbafc053282429d8ab84269ee9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Mon, 6 Nov 2017 10:06:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=87=E6=96=99?= =?UTF-8?q?=E5=8F=96=E6=B6=88=20=E5=A4=87=E6=96=99=E9=80=80=E5=BA=93?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/w.ctrl.js | 101 ++++++++++++++++++ public/js/wms-constant.js | 12 ++- public/js/wms-filter.js | 4 + public/js/wms-service.js | 6 ++ public/js/wms-tools.js | 8 ++ .../warehouse/cancel-task-form.html | 26 +++++ .../warehouse/quit-task-form.html | 26 +++++ .../warehouse/warehouse-list.html | 2 + 8 files changed, 181 insertions(+), 4 deletions(-) create mode 100644 public/templates/warehouseManagement/warehouse/cancel-task-form.html create mode 100644 public/templates/warehouseManagement/warehouse/quit-task-form.html diff --git a/public/js/ctrl/w.ctrl.js b/public/js/ctrl/w.ctrl.js index 5d5d9912..e0a31f4d 100644 --- a/public/js/ctrl/w.ctrl.js +++ b/public/js/ctrl/w.ctrl.js @@ -277,6 +277,72 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService scope : scope }) } + + //任务取消 + scope.cancelTaskClick = function(){ + var indexArr = scope.Tools.getTableSelectItemIndex('.warehouseTable'); //获取table所选的下标 + + if(indexArr.length == 0){ + scope.Tools.alert('请选择一条数据'); + return; + } + + if(indexArr.length > 1){ + scope.Tools.alert('只能选择一条数据'); + return; + } + + if(scope.warehouseList[indexArr[0]].otStatus == scope.constant.warehouse.finish || scope.warehouseList[indexArr[0]].otStatus == scope.constant.warehouse.cancel){ + scope.Tools.alert('只能选择未完成前的数据'); + return; + } + + scope.Tools.dialog({ + controller : 'warehouseCtrl.dialog', + template : 'templates/warehouseManagement/warehouse/cancel-task-form.html', + closeByDocument : false, + closeByEscape : false, + data : { + warehouse : scope.warehouseList[indexArr[0]] //选择的 出库数据 + }, + width : 500, + title : '任务取消', + scope : scope + }) + } + + //备料退库 click + scope.quitTaskClick = function(){ + var indexArr = scope.Tools.getTableSelectItemIndex('.warehouseTable'); //获取table所选的下标 + + if(indexArr.length == 0){ + scope.Tools.alert('请选择一条数据'); + return; + } + + if(indexArr.length > 1){ + scope.Tools.alert('只能选择一条数据'); + return; + } + + if(scope.warehouseList[indexArr[0]].otStatus != scope.constant.warehouse.finish){ + scope.Tools.alert('只能选择已完成的数据'); + return; + } + + scope.Tools.dialog({ + controller : 'warehouseCtrl.dialog', + template : 'templates/warehouseManagement/warehouse/quit-task-form.html', + closeByDocument : false, + closeByEscape : false, + data : { + warehouse : scope.warehouseList[indexArr[0]] //选择的 出库数据 + }, + width : 500, + title : '备料退库', + scope : scope + }) + } }]) .controller('warehouseCtrl.dialog',['$scope','warehouseService',function(scope,warehouseService){ //出库作业管理 dialog @@ -402,6 +468,41 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService } } + //任务取消 click + scope.saveCancelTaskClick = function(){ + var obj = { + otId : scope.ngDialogData.warehouse.otId, //id + cancleReason : scope.ngDialogData.cancleReason //取消原因 + } + warehouseService.cancleTaskForCq(obj) + .then(function(result){ + if(result.success){ + scope.Tools.alert('任务取消成功'); + scope.list(scope.listParam()); + scope.closeThisDialog(); + }else{ + scope.Tools.alert(result.message); + } + }) + } + + //备料退库 click + scope.saveQuitTaskClick = function(){ + var obj = { + otId : scope.ngDialogData.warehouse.otId, //id + cancleReason : scope.ngDialogData.cancleReason //退库原因 + } + warehouseService.quitTaskForCq(obj) + .then(function(result){ + if(result.success){ + scope.Tools.alert('备料退库成功'); + scope.list(scope.listParam()); + scope.closeThisDialog(); + }else{ + scope.Tools.alert(result.message); + } + }) + } }]) .controller('warehouseMaintenanceCtrl',['$scope','warehouseMaintenanceService',function(scope,warehouseMaintenanceService){ //仓库维护 diff --git a/public/js/wms-constant.js b/public/js/wms-constant.js index d1371a18..d6d58a50 100644 --- a/public/js/wms-constant.js +++ b/public/js/wms-constant.js @@ -95,13 +95,15 @@ angular.module('wms.constant',[]) unprocessed : 10, //未出库 execution : 20, //已出库 haveOutbound : 30, //进行中 - finish : 40 //已完成 + finish : 40, //已完成 + cancel : 50 //已取消 }, warehouseName : { //出库状态 name unprocessed : '未出库', execution : '已出库', haveOutbound : '进行中', - finish : '已完成' + finish : '已完成', + cancel : '已取消' }, defaultDropDownNullData : { //空数据 name : '', @@ -225,11 +227,13 @@ angular.module('wms.constant',[]) }, outboundOutStatus : { //备料出库状态 notOut : 10, //未出库 - out : 20 //已出库 + out : 20, //已出库 + exit : 30 //已退库 }, outboundOutStatusName : { //备料出库状态 name notOut : '未出库', //未出库 - out : '已出库' //已出库 + out : '已出库', //已出库 + exit : '已退库' }, shipmentPlanStatus : { //发运状态 untreated : '0', //未处理 diff --git a/public/js/wms-filter.js b/public/js/wms-filter.js index 0f5901d6..855f5175 100644 --- a/public/js/wms-filter.js +++ b/public/js/wms-filter.js @@ -93,6 +93,8 @@ var wmsFilter = angular.module('wms.filter', []) return constant.warehouseName.haveOutbound; }else if(input == constant.warehouse.finish){ //已完成 return constant.warehouseName.finish; + }else if(input == constant.warehouse.cancel){ //已取消 + return constant.warehouseName.cancel; } return input; } @@ -231,6 +233,8 @@ var wmsFilter = angular.module('wms.filter', []) return constant.outboundOutStatusName.notOut; }else　if(input == constant.outboundOutStatus.out){ //已出库 return constant.outboundOutStatusName.out; + }else　if(input == constant.outboundOutStatus.exit){ //已退库 + return constant.outboundOutStatusName.exit; } return input; } diff --git a/public/js/wms-service.js b/public/js/wms-service.js index 9add52a4..d7bc7fb9 100644 --- a/public/js/wms-service.js +++ b/public/js/wms-service.js @@ -257,6 +257,12 @@ var wmsService = angular.module('wms.services', []) }, outConfirm : function(data){ //出库确认 return httpService.customPOST('outboundTask/outConfirm',data); + }, + cancleTaskForCq : function(data){ //任务取消 + return httpService.customPOST('outboundTask/cancleTaskForCq',data); + }, + quitTaskForCq : function(data){ //备料退库 + return httpService.customPOST('outboundTask/quitTaskForCq',data); } } }]) diff --git a/public/js/wms-tools.js b/public/js/wms-tools.js index 6479d46c..effc8434 100644 --- a/public/js/wms-tools.js +++ b/public/js/wms-tools.js @@ -141,6 +141,10 @@ wmsService.service('Tools',['ngDialog','constant','$timeout',function(ngDialog,c { name : constant.warehouseName.finish, //已完成 value : constant.warehouse.finish + }, + { + name : constant.warehouseName.cancel, //已取消 + value : constant.warehouse.cancel } ], stockUnitStatusDropDown : [ //库位状态下拉 @@ -309,6 +313,10 @@ wmsService.service('Tools',['ngDialog','constant','$timeout',function(ngDialog,c { name : constant.outboundOutStatusName.out, //已出库 value : constant.outboundOutStatus.out + }, + { + name : constant.outboundOutStatusName.exit, //已退库 + value : constant.outboundOutStatus.exit } ], shipmentPlanStatusDropDown : [ //发运计划状态 diff --git a/public/templates/warehouseManagement/warehouse/cancel-task-form.html b/public/templates/warehouseManagement/warehouse/cancel-task-form.html new file mode 100644 index 00000000..9f81e94d --- /dev/null +++ b/public/templates/warehouseManagement/warehouse/cancel-task-form.html @@ -0,0 +1,26 @@ +
+ +
+ + +
+
+ diff --git a/public/templates/warehouseManagement/warehouse/quit-task-form.html b/public/templates/warehouseManagement/warehouse/quit-task-form.html new file mode 100644 index 00000000..c6a21f16 --- /dev/null +++ b/public/templates/warehouseManagement/warehouse/quit-task-form.html @@ -0,0 +1,26 @@ +
+ +
+ + +
+
+ diff --git a/public/templates/warehouseManagement/warehouse/warehouse-list.html b/public/templates/warehouseManagement/warehouse/warehouse-list.html index 56f3fbcb..34f837dc 100644 --- a/public/templates/warehouseManagement/warehouse/warehouse-list.html +++ b/public/templates/warehouseManagement/warehouse/warehouse-list.html @@ -4,6 +4,8 @@ -- Gitee From 4f55e870ca988b774e28a7a22b3aa4b59507b589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Mon, 6 Nov 2017 10:37:55 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=B8=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/wms-constant.js | 6 ++++-- public/js/wms-filter.js | 2 ++ public/js/wms-tools.js | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/public/js/wms-constant.js b/public/js/wms-constant.js index d6d58a50..00a07e4e 100644 --- a/public/js/wms-constant.js +++ b/public/js/wms-constant.js @@ -197,13 +197,15 @@ angular.module('wms.constant',[]) unStart : 10, //未开始 planned : 20, //已计划 confirmed : 30, //已备料 - finish : 40 //已完成 + finish : 40, //已完成 + cancel : 50 //已取消 }, outboundStatusName : { //备料单 status name unStart : '未开始', planned : '已计划', confirmed : '已备料', - finish : '已完成' + finish : '已完成', + cancel : '已取消' }, outboundType : { //出库类型 dispatcherOutbound : 10, //调拨出库 diff --git a/public/js/wms-filter.js b/public/js/wms-filter.js index 855f5175..c3500c36 100644 --- a/public/js/wms-filter.js +++ b/public/js/wms-filter.js @@ -199,6 +199,8 @@ var wmsFilter = angular.module('wms.filter', []) return constant.outboundStatusName.confirmed; }else　if(input == constant.outboundStatus.finish){ //已完成 return constant.outboundStatusName.finish; + }else　if(input == constant.outboundStatus.cancel){ //已取消 + return constant.outboundStatusName.cancel; } return input; } diff --git a/public/js/wms-tools.js b/public/js/wms-tools.js index effc8434..c110c208 100644 --- a/public/js/wms-tools.js +++ b/public/js/wms-tools.js @@ -293,6 +293,10 @@ wmsService.service('Tools',['ngDialog','constant','$timeout',function(ngDialog,c { name : constant.outboundStatusName.finish, //已完成 value : constant.outboundStatus.finish + }, + { + name : constant.outboundStatusName.cancel, //已取消 + value : constant.outboundStatus.cancel } ], sexDropDown : [ //性别 -- Gitee From ad12a0b886654e2d3a91ed587259203b8590562e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Tue, 7 Nov 2017 11:33:12 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=9D=83=E9=99=90=E9=80=92=E5=BD=92=E8=B5=8B=E5=80=BC=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/r.ctrl.js | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/public/js/ctrl/r.ctrl.js b/public/js/ctrl/r.ctrl.js index 0a9863cc..c5502179 100644 --- a/public/js/ctrl/r.ctrl.js +++ b/public/js/ctrl/r.ctrl.js @@ -806,27 +806,23 @@ wmsCtrl.controller('reservoirCtrl',['$scope','reservoirService','dropDownService .controller('roleCtrl.dialog',['$scope','$timeout','roleService',function(scope,timeout,roleService){ //角色 ctrl dialog if(scope.ngDialogData.permissions){ - timeout(function(){ - if(scope.ngDialogData.rolePermiss){ //判断是否是更新时候传递的用户所属角色 - for(var i = 0; i < scope.ngDialogData.permissions.length; i++){ - for(var j = 0; j < scope.ngDialogData.rolePermiss.length;j++){ - //判断权限是否相等默认选中 - if(scope.ngDialogData.permissions[i].id == scope.ngDialogData.rolePermiss[j].id){ - scope.ngDialogData.permissions[i].checked = true; - //判断权限下的子权限是否相等默认选中 - if(scope.ngDialogData.rolePermiss[j].childPermissionsBOList && scope.ngDialogData.rolePermiss[j].childPermissionsBOList.length > 0){ - for(var iChild = 0;iChild < scope.ngDialogData.permissions[i].childPermissionsBOList.length;iChild++){ - for(var jChild = 0;jChild < scope.ngDialogData.rolePermiss[j].childPermissionsBOList.length;jChild++){ - if(scope.ngDialogData.permissions[i].childPermissionsBOList[iChild].id == scope.ngDialogData.rolePermiss[j].childPermissionsBOList[jChild].id){ - scope.ngDialogData.permissions[i].childPermissionsBOList[iChild].checked = true; - } - } - } - } - } + //递归循环赋值 + scope.recursivePermissions = function(permiss,rolePermiss){ + for(var i = 0; i < permiss.length; i++){ + for(var j = 0; j < rolePermiss.length;j++){ + if(permiss[i].id == rolePermiss[j].id){ + permiss[i].checked = true; + } + if(rolePermiss[j].childPermissionsBOList){ + scope.recursivePermissions(permiss[i].childPermissionsBOList,rolePermiss[j].childPermissionsBOList); } } } + } + timeout(function(){ + if(scope.ngDialogData.rolePermiss){ //判断是否是更新时候传递的用户所属角色 + scope.recursivePermissions(scope.ngDialogData.permissions,scope.ngDialogData.rolePermiss); + } scope.permissionsZtree = $.fn.zTree.init( $('.permissionsZtree'), -- Gitee From f8c86bb8c322f5322311df3a27cb170d9a31d779 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Tue, 7 Nov 2017 20:28:21 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/wms-constant.js | 6 ++++-- public/js/wms-filter.js | 4 ++++ public/js/wms-tools.js | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/public/js/wms-constant.js b/public/js/wms-constant.js index 00a07e4e..2baf2dc6 100644 --- a/public/js/wms-constant.js +++ b/public/js/wms-constant.js @@ -7,7 +7,8 @@ angular.module('wms.constant',[]) billsType : { //单据类型 systemSchedul : '1', //TMS推送 manualEntry : '2', //WMS业务产生库内返工、委外返工 - add : '3' //WMS新增 + add : '3', //WMS新增 + exit : '7' //备料退库 }, inspectionResults : { //检验结果 asnOrderPass : '10', //合格 @@ -23,7 +24,8 @@ angular.module('wms.constant',[]) billsTypeName : { //单据类型名称 systemSchedul : 'TMS推送', manualEntry : 'WMS业务产生库内返工、委外返工', - add : 'WMS新增' + add : 'WMS新增', + exit : '备料退库' }, inspectionResultsName : { //检验结果名称 asnOrderPass : '合格', diff --git a/public/js/wms-filter.js b/public/js/wms-filter.js index c3500c36..a25ff59a 100644 --- a/public/js/wms-filter.js +++ b/public/js/wms-filter.js @@ -9,6 +9,10 @@ var wmsFilter = angular.module('wms.filter', []) return constant.billsTypeName.systemSchedul; }else　if(input == constant.billsType.manualEntry){ //手工录入 return constant.billsTypeName.manualEntry; + }else　if(input == constant.billsType.add){ //wms新增 + return constant.billsTypeName.add; + }else　if(input == constant.billsType.exit){ //备料退库 + return constant.billsTypeName.exit; } return input; } diff --git a/public/js/wms-tools.js b/public/js/wms-tools.js index c110c208..7d022d5b 100644 --- a/public/js/wms-tools.js +++ b/public/js/wms-tools.js @@ -35,6 +35,10 @@ wmsService.service('Tools',['ngDialog','constant','$timeout',function(ngDialog,c { name:constant.billsTypeName.add, //wms新增 value:constant.billsType.add + }, + { + name:constant.billsTypeName.exit, //备料退库 + value:constant.billsType.exit } ], orderStatusDropDown : [ //订单状态下拉 -- Gitee From 8af9fdd34bae64e5f9d9ba7070cd9ef6d3f4b73c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Wed, 8 Nov 2017 11:39:13 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8vin=E5=8F=B7=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inStorageManagement/inputWork/input-work-list.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/templates/inStorageManagement/inputWork/input-work-list.html b/public/templates/inStorageManagement/inputWork/input-work-list.html index c9ad1375..8865329c 100644 --- a/public/templates/inStorageManagement/inputWork/input-work-list.html +++ b/public/templates/inStorageManagement/inputWork/input-work-list.html @@ -180,6 +180,7 @@ 货主 + 底盘号(VIN号) 调度单号 单据号 单据类型 @@ -191,7 +192,6 @@ 目的地 车型 车型描述 - 底盘号(VIN号) 承运商 承运商司机 司机手机号 @@ -209,6 +209,7 @@ + @@ -220,7 +221,6 @@ - -- Gitee