From ca1538adebada0bfb5e4dcbe44e81cab8c04849f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Fri, 20 Oct 2017 09:09:49 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=A5=E5=BA=93=E7=A1=AE=E8=AE=A4=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inStorageManagement/inputWork/input-work-list.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/templates/inStorageManagement/inputWork/input-work-list.html b/public/templates/inStorageManagement/inputWork/input-work-list.html index 7aaaab45..6395f022 100644 --- a/public/templates/inStorageManagement/inputWork/input-work-list.html +++ b/public/templates/inStorageManagement/inputWork/input-work-list.html @@ -198,6 +198,7 @@ 收货员工 收货日期 移库司机 + 入库时间 备注 @@ -226,6 +227,7 @@ + -- Gitee From 732a0f2e3d2cd04c5e110afbdaeffd803b59dbaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Fri, 20 Oct 2017 10:41:44 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inStorageManagement/inputWork/input-work-list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/templates/inStorageManagement/inputWork/input-work-list.html b/public/templates/inStorageManagement/inputWork/input-work-list.html index 6395f022..e4b455ba 100644 --- a/public/templates/inStorageManagement/inputWork/input-work-list.html +++ b/public/templates/inStorageManagement/inputWork/input-work-list.html @@ -227,7 +227,7 @@ - + -- Gitee From ef38bb69dc210996bd5046a7e4ce3f56d9f952a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Fri, 20 Oct 2017 15:56:05 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/i.ctrl.js | 4 ++-- public/js/wms-service.js | 6 ++++-- public/js/wms-tools.js | 20 ++++++++++++++++---- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/public/js/ctrl/i.ctrl.js b/public/js/ctrl/i.ctrl.js index ee47008e..adfc0cd7 100644 --- a/public/js/ctrl/i.ctrl.js +++ b/public/js/ctrl/i.ctrl.js @@ -812,7 +812,7 @@ wmsCtrl.controller('inStorageBillCtrl',['$scope','inStorageBillService','dropDow scope.Tools.dialogConfirm('该车辆【'+ scope.ngDialogData.queryParam +'】收货已完成，确定后打印二维码') .then(function(res){ if(res){ - scope.Tools.printQr(result.data.odRemark); + scope.Tools.printQr(result.data.odRemark,result.data.asnOrderDetailDTOList[0].oddVin,result.data.asnOrderDetailDTOList[0].oddWhLocName,result.data.odWaybillNo,2); } }) }else{ @@ -1137,7 +1137,7 @@ wmsCtrl.controller('inStorageBillCtrl',['$scope','inStorageBillService','dropDow } angular.forEach(scope.ngDialogData.printList,function(v,k){ - scope.Tools.printQr(v.barcode); + scope.Tools.printQr(v.barcode,v.vin,v.locNo,v.asnOrderBillNo,2); }) } }]) diff --git a/public/js/wms-service.js b/public/js/wms-service.js index f8f64138..2a3f2533 100644 --- a/public/js/wms-service.js +++ b/public/js/wms-service.js @@ -4,13 +4,15 @@ 'use strict'; var wmsService = angular.module('wms.services', []) - .service('HttpService', ['Restangular', function (restangular) { + .service('HttpService', ['Restangular','$rootScope', function (restangular,rootScope) { + return { customPOST: function (url, data,obj) { if(obj){ + obj.whCode = rootScope.userInfo.whCode; return restangular.one(url).customPOST(data,undefined,undefined,obj); }else{ - return restangular.one(url).customPOST(data); + return restangular.one(url).customPOST(data,undefined,undefined,{whCode:rootScope.userInfo.whCode}); } }, post: function (url, data) { diff --git a/public/js/wms-tools.js b/public/js/wms-tools.js index e72e08b3..5fec19db 100644 --- a/public/js/wms-tools.js +++ b/public/js/wms-tools.js @@ -458,10 +458,22 @@ wmsService.service('Tools',['ngDialog','constant','$timeout',function(ngDialog,c newWin.document.write(''); newWin.document.write(''); }, - printQr : function(base64,vin,localNo,orderBillNo){ //打印二维码 localNo 库位 orderBillNo运单号 - LODOP.ADD_PRINT_IMAGE(10,30,"13mm","13mm",''); - /*top,left,width,height,strHTML*/ - /*LODOP.ADD_PRINT_HTML(10,38,"13mm","13mm",'');*/ + printQr : function(base64,vin,localNo,orderBillNo,pages){ //打印二维码 localNo 库位 orderBillNo运单号 + + var tableStart = ''; + var tr1 = ''; + var tr2 = ''; + var tr3 = ''; + var tableEnd = '
'+vin.substring(10,17)+'
' + localNo +'
'+orderBillNo+'
'; + + var html = tableStart + tr1 + tr2 + tr3 + tableEnd; + + LODOP.PRINT_INIT("二维码打印"); + LODOP.SET_PRINT_PAGESIZE(0,300,200); + LODOP.ADD_PRINT_HTML(7,5,'13mm','18mm',html); + if(pages){ + LODOP.SET_PRINT_COPIES(pages); //打印2份 + } /*LODOP.PREVIEW(); //调试模式*/ LODOP.PRINT(); //打印模式 }, -- Gitee From 8c47daeef9c4683b3ac571c16b6dba6a40f21eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Fri, 20 Oct 2017 16:02:28 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/plugIn/Lodop6.220_CLodop3.020.zip | Bin 7268334 -> 7268223 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/plugIn/Lodop6.220_CLodop3.020.zip b/public/plugIn/Lodop6.220_CLodop3.020.zip index 757cfaf1a4eef3427321dbc2005222d1596475a0..90944bb95824c419a7720753888d9c826529d092 100644 GIT binary patch delta 1339 zcmZ|Odr(wW90%~-yYfg~0iz&ZvMdk?6$?Q=R#+tw*d$p%3|cTP1<7mKj0wXg(YMht zok`PlEwg$AF)N4_dJTpJMR)x36Ov|u{-`{DW7 z`Rw95_UO`|vfSg#M?=kN>6SxZo{t^sDe`f@)L(kt+Fdi)6QYj~wGCW5EAf zD4s+Z!m%6?h{RKP8qXjK21FwU&mtCacn&MD605KpMyx?R5@5nwtV1H6$9g1T1Co(~ zRG9GsHX;o#ViVF~K?X9Bh0Vyu7QBQU z7v)RM;c6*C^*`IB3Z~6cUV+Nj!%YkIPAqbqElzQ$yTAL`_xfFsd5ff4B;M_iLquYmoT0V~ zk9IjsG`7j<>N(}OL^|uo^@euYBIWxtB0A(uX)H`ZvD6gBp{|p{ggC}&1?DvjuP#DB zD&vimAZKx^iCu!lt0~ZARO^AQv&`ptBr!hm%el zCB;3Icpl{BUXPq5Sx+*~pP=%dpQ&v8jFY1kluRl~R}Ck5ztDu*bBsO(wyzoO4b+?4 zOT9yloOJY3`JSB-Z>Mtl4Jzk2MAZ#>zoZ>j#t>oZqecHV$%vn%Tff#vZK}V7M?XEg zmU*t!_fuPft1yhxjeh8&cM;J8)b^_zC$$4~u>xO)?k3@61mm=VqXx!c6ip1cMHAhP zoE*PJ<(3qNc91UOzL{}wkSg{9hIE^-buYuFAg_dRp_ooNf16HO4^G}1qVo6$j41_8 zpE3%E2}#wAF$H_iG4e+U{SAzM1r?VS?3Ws^D`SZ09Hq5=-o-GF$(ia0qH>I$(7p+t zl`u{XOa5f!&*+^+<2bEq*DNP7cjQcsNfXRJ_JF&xR$Ndb=XJ>sqm`ac&dPtvNbev0 KRI2J0ne;DkXgjL_ delta 1581 zcmZ|Pdr(wm7zXgYD4-~apdzBOTo%O=vCtGvP*Dh3mb)UEm?niC6b;2B#_*9DXS}4@ zu||m)Msv&xwKUN%Z>fubAjU;OO~cE?10~2XUiyyTG}Axr&Y7Lx^M3DpzH@fwdtO;) zY^y3Wt|zDm4WJS11@;E*Kzq;u>;v`%9l?HJf6xhZ1_yvH;6Tt7bOQ&0gTW!7J2({d z0EdB|;BasRI1=;%O`tdE1Nwq~pc(WBM}eck0B{WW68JJW77PT(fkEJS@D=b?Fc_Qw zP6S^ACxMf}5O4}O6?`3>28M!R;B;^XI1>y9XMwZ92rv?S1B?RafYG1@i~+4+EEosI zg9%_Fm;@$+bHRCF3OFB31>Xc0fNy~d!8C9Y_%^s0TmrrWE(O!Ucft3-3~(9v{tr}s zyg1a@%T1@#Iq1yE@lngSxqslS*XdHk6{P<1jkkw-?~>w?muQKJI=#@n-1&)9VSfLn zioojN<8G@w!yGrA$Q#;p13!9^R#PTaR|uA08a;n0~2)BoyNvZ>r= zEN^`r^W}yMyC<|9{Jha~|DLky9J6Ip(BtkDrV|SPnM)v{cXkbcRBPqHDL9*s)vIej1QgbE5F|QBqrO%soSHpF0Qk{ zae_}##d0q}Ep` za}6$i)vqcQKQ;NX5^qpkHTbKwmz7w9vztV8r4nZ-8>V5kez{syshHKG;of#?c$Jvi z=`Z__S1AdG+CYimY5{Ao#P=Ffr$~&sA`lp7=DVCp{YiM%TgtFYdEn)Vo0q( zlA^&^{Y1m&YzfD!N}^#~u0;7q-uCL|t71ET8)c%e6J_O7i9I_-IloSnqYGv7SS#Ny zk;u9xaP)x0pBlCtk~n!-G-m!L8asZLiPtHSJkXM7mt?Y_UNmIXNHo-oEsnS;5q(Rn zO=%EopWc^AWrJAj@>n9YTa>MhqTKXMCTAN(*=n!4To->xXp3W(twXz8j+46rsUaH8l&E5+$rjKK5#Hvsin5sZ0j9h&!)X zAyJei%DY-bIWtElg=Z?0=g`slio;0z vc!}%CMdd}OID^b%i???^LPV{;=HzF?{`+f<>TRbrOcCGno;uw?n Date: Fri, 20 Oct 2017 17:01:25 +0800 Subject: [PATCH 05/25] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=B3=A8=E5=86=8C=E7=A0=81=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/wms-tools.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/js/wms-tools.js b/public/js/wms-tools.js index 5fec19db..bfb89740 100644 --- a/public/js/wms-tools.js +++ b/public/js/wms-tools.js @@ -480,6 +480,7 @@ wmsService.service('Tools',['ngDialog','constant','$timeout',function(ngDialog,c checkPrintInstall : function(){ //检测打印机插件是否安装 try{ if (LODOP && LODOP.VERSION) { + LODOP.SET_LICENSES("北京知车科技有限责任公司","BC324309DFEA0DECE56958C928E1CA08","",""); //设置注册码 return true; }else{ return false; -- Gitee From 83d91a6d936f9a7bc324af10ee6136341e1a7d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BB=81=E6=9D=B0?= Date: Fri, 20 Oct 2017 17:13:11 +0800 Subject: [PATCH 06/25] =?UTF-8?q?=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/i.ctrl.js | 1 + routes/resource/base-config.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/js/ctrl/i.ctrl.js b/public/js/ctrl/i.ctrl.js index ee47008e..e8940b6f 100644 --- a/public/js/ctrl/i.ctrl.js +++ b/public/js/ctrl/i.ctrl.js @@ -815,6 +815,7 @@ wmsCtrl.controller('inStorageBillCtrl',['$scope','inStorageBillService','dropDow scope.Tools.printQr(result.data.odRemark); } }) + scope.list(); }else{ scope.ngDialogData.queryParam = ''; scope.Tools.alert(result.message); diff --git a/routes/resource/base-config.js b/routes/resource/base-config.js index 0d65b3df..71301ff2 100644 --- a/routes/resource/base-config.js +++ b/routes/resource/base-config.js @@ -1,3 +1,3 @@ -/**Created on 2017-10-18*/ +/**Created on 2017-10-20*/ 'use strict'; - module.exports = {"version":"1.0.1","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://10.20.30.111/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"123456a"}}; \ No newline at end of file + module.exports = {"version":"1.0.1","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://10.2.4.76:8080/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"123456a"}}; \ No newline at end of file -- Gitee From 87af9c81e788dc0394df3c4e016cde2fe601195d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Fri, 20 Oct 2017 17:41:26 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/i.ctrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/ctrl/i.ctrl.js b/public/js/ctrl/i.ctrl.js index dc1f6a68..13341888 100644 --- a/public/js/ctrl/i.ctrl.js +++ b/public/js/ctrl/i.ctrl.js @@ -815,7 +815,7 @@ wmsCtrl.controller('inStorageBillCtrl',['$scope','inStorageBillService','dropDow scope.Tools.printQr(result.data.odRemark,result.data.asnOrderDetailDTOList[0].oddVin,result.data.asnOrderDetailDTOList[0].oddWhLocName,result.data.odWaybillNo,2); } }) - scope.list(); + scope.list(scope.listParam()); }else{ scope.ngDialogData.queryParam = ''; scope.Tools.alert(result.message); -- Gitee From c05f0e3ec400084f6e9241fd9249f15295f108e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BB=81=E6=9D=B0?= Date: Fri, 20 Oct 2017 18:25:14 +0800 Subject: [PATCH 08/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/wms-constant.js | 12 ++++++------ public/js/wms-tools.js | 16 ++++++++-------- .../inputWork/input-work-list.html | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/public/js/wms-constant.js b/public/js/wms-constant.js index f168f1a9..fb6ec37e 100644 --- a/public/js/wms-constant.js +++ b/public/js/wms-constant.js @@ -11,9 +11,9 @@ angular.module('wms.constant',[]) }, inspectionResults : { //检验结果 asnOrderPass : '10', //合格 - asnOrderNotpassInRepair : '20', //不合格-库位返修 - asnOrderNotpassOutRepair : '30', //不合格-委外返工 - asnOrderNotpass : '40' //不合格-退厂 + asnOrderNotpassInRepair : '20' //不合格-库位返修 + // asnOrderNotpassOutRepair : '30', //不合格-委外返工 + // asnOrderNotpass : '40' //不合格-退厂 }, orderStatus : { //订单状态 wmsInboundCreate : '10', //未收货 @@ -27,9 +27,9 @@ angular.module('wms.constant',[]) }, inspectionResultsName : { //检验结果名称 asnOrderPass : '合格', - asnOrderNotpassInRepair : '不合格-库内返修', - asnOrderNotpassOutRepair : '不合格-委外返工', - asnOrderNotpass : '不合格-退厂' + asnOrderNotpassInRepair : '异常' + // asnOrderNotpassOutRepair : '不合格-委外返工', + // asnOrderNotpass : '不合格-退厂' }, orderStatusName : { //订单状态名称 wmsInboundCreate : '未收货', diff --git a/public/js/wms-tools.js b/public/js/wms-tools.js index bfb89740..4cd1b9f9 100644 --- a/public/js/wms-tools.js +++ b/public/js/wms-tools.js @@ -67,15 +67,15 @@ wmsService.service('Tools',['ngDialog','constant','$timeout',function(ngDialog,c { name : constant.inspectionResultsName.asnOrderNotpassInRepair, //不合格-库内返修 value : constant.inspectionResults.asnOrderNotpassInRepair - }, - { - name : constant.inspectionResultsName.asnOrderNotpassOutRepair, //不合格-委外返工 - value : constant.inspectionResults.asnOrderNotpassOutRepair - }, - { - name : constant.inspectionResultsName.asnOrderNotpass, //不合格-退厂 - value : constant.inspectionResults.asnOrderNotpass } + // { + // name : constant.inspectionResultsName.asnOrderNotpassOutRepair, //不合格-委外返工 + // value : constant.inspectionResults.asnOrderNotpassOutRepair + // }, + // { + // name : constant.inspectionResultsName.asnOrderNotpass, //不合格-退厂 + // value : constant.inspectionResults.asnOrderNotpass + // } ], statusDropDown : [ //状态下拉 { diff --git a/public/templates/inStorageManagement/inputWork/input-work-list.html b/public/templates/inStorageManagement/inputWork/input-work-list.html index e4b455ba..e278d8fd 100644 --- a/public/templates/inStorageManagement/inputWork/input-work-list.html +++ b/public/templates/inStorageManagement/inputWork/input-work-list.html @@ -155,7 +155,7 @@
-
运单号
+
单据号
-- Gitee From 08777ab06733142be57b0135f3c3e44f6ea05e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Fri, 20 Oct 2017 19:41:45 +0800 Subject: [PATCH 09/25] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=89=80=E6=9C=89?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=20header=20=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/wms-config.js | 18 +++++++++++++++++- public/js/wms-service.js | 3 +-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/public/js/wms-config.js b/public/js/wms-config.js index 9713d83a..bb813abb 100644 --- a/public/js/wms-config.js +++ b/public/js/wms-config.js @@ -9,7 +9,7 @@ angular.module('wmsApp', ['ui.router', 'wms.controllers', 'wms.services','wms.fi path: contextPath } }) - .run(['$rootScope', '$location', '$state', 'Settings','Tools','constant','dropDownService','$cookies','permissionsService', function ($rootScope, $location, $state, Settings,Tools,constant,dropDownService,cookies,permissionsService) { + .run(['$rootScope', '$location', '$state', 'Settings','Tools','constant','dropDownService','$cookies','permissionsService','Restangular', function ($rootScope, $location, $state, Settings,Tools,constant,dropDownService,cookies,permissionsService,restangular) { $rootScope.$ = layui.jquery; layui.use(['form', 'laydate'], function () { $rootScope.$ = layui.jquery; @@ -211,6 +211,22 @@ angular.module('wmsApp', ['ui.router', 'wms.controllers', 'wms.services','wms.fi location.href = '/'; } + restangular.addFullRequestInterceptor(function (element, operation, route, url, headers, params, httpConfig) { + if(headers){ + headers.whCode = $rootScope.userInfo.whCode; + headers.token = $rootScope.userInfo.token; + }else{ + headers = { + whCode : $rootScope.userInfo.whCode, + token : $rootScope.userInfo.token + } + } + return { + headers: headers + }; + }); + + initNav(); }]) .config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationProvider','RestangularProvider','Settings', function ($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider,RestangularProvider,Settings) { diff --git a/public/js/wms-service.js b/public/js/wms-service.js index 2a3f2533..52909458 100644 --- a/public/js/wms-service.js +++ b/public/js/wms-service.js @@ -9,10 +9,9 @@ var wmsService = angular.module('wms.services', []) return { customPOST: function (url, data,obj) { if(obj){ - obj.whCode = rootScope.userInfo.whCode; return restangular.one(url).customPOST(data,undefined,undefined,obj); }else{ - return restangular.one(url).customPOST(data,undefined,undefined,{whCode:rootScope.userInfo.whCode}); + return restangular.one(url).customPOST(data); } }, post: function (url, data) { -- Gitee From 987ce1b32a8d86ba422314098cc8699c8083a3a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BB=81=E6=9D=B0?= Date: Fri, 20 Oct 2017 19:54:19 +0800 Subject: [PATCH 10/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/r.ctrl.js | 104 +++++++----------- public/js/ctrl/s.ctrl.js | 85 ++++++-------- .../reservoirManagement/reservoir-form.html | 14 +-- .../stockUnitManagement/stock-unit-form.html | 12 +- 4 files changed, 76 insertions(+), 139 deletions(-) diff --git a/public/js/ctrl/r.ctrl.js b/public/js/ctrl/r.ctrl.js index aaffbbda..2824d368 100644 --- a/public/js/ctrl/r.ctrl.js +++ b/public/js/ctrl/r.ctrl.js @@ -6,29 +6,23 @@ wmsCtrl.controller('reservoirCtrl',['$scope','reservoirService','dropDownService //新增库区 click scope.addReservoirClick = function(){ - //获取仓库 - dropDownService.getWarehouse() - .then(function(result){ - if(result.success){ - scope.Tools.dialog({ - controller : 'reservoirCtrl.dialog', - template : 'templates/locationManagement/reservoirManagement/reservoir-form.html', - closeByDocument : false, - closeByEscape : false, - data : { - warehouse : result.data, //仓库 - dropDownDefault : { //下拉框默认值 - warehouse : result.data[0] //仓库默认值 - } - }, - width : 530, - title : '新增库区', - scope : scope - }) - }else{ - scope.Tools.alert(result.message); + scope.Tools.dialog({ + controller : 'reservoirCtrl.dialog', + template : 'templates/locationManagement/reservoirManagement/reservoir-form.html', + closeByDocument : false, + closeByEscape : false, + data : { + dropDownDefault : { //下拉框默认值 + warehouse : { + whName: scope.userInfo.whName, + whCode:scope.userInfo.whCode + } } - }) + }, + width : 530, + title : '新增库区', + scope : scope + }) } //更新库区 click @@ -49,39 +43,24 @@ wmsCtrl.controller('reservoirCtrl',['$scope','reservoirService','dropDownService reservoirService.getById(scope.reservoirList[indexArr[0]].zeId) .then(function(result){ if(result.success){ - dropDownService.getWarehouse() - .then(function(warehouseResult){ - if(warehouseResult.success){ - //设置仓库默认值 - var defaultWarehouse = null; - angular.forEach(warehouseResult.data,function(v,k){ - if(v.whCode == result.data.zeWhCode){ - defaultWarehouse = v; - } - }) - - scope.Tools.dialog({ - controller : 'reservoirCtrl.dialog', - template : 'templates/locationManagement/reservoirManagement/reservoir-form.html', - closeByDocument : false, - closeByEscape : false, - data : { - warehouse : warehouseResult.data, //仓库 - dropDownDefault : { //下拉框默认值 - warehouse : defaultWarehouse //仓库默认值 - }, - reservoir : result.data - }, - width : 530, - title : '更新库区', - scope : scope - }) - }else{ - scope.Tools.alert(result.message); - } - }) - - + scope.Tools.dialog({ + controller : 'reservoirCtrl.dialog', + template : 'templates/locationManagement/reservoirManagement/reservoir-form.html', + closeByDocument : false, + closeByEscape : false, + data : { + dropDownDefault : { //下拉框默认值 + warehouse : { + whName : result.data.zeWhName, + whCode : result.data.zeWhCode + } + }, + reservoir : result.data + }, + width : 530, + title : '更新库区', + scope : scope + }) }else{ scope.Tools.alert(result.message); } @@ -169,6 +148,9 @@ wmsCtrl.controller('reservoirCtrl',['$scope','reservoirService','dropDownService scope.saveOrUpdateReservoirClick = function(){ //新增库区 + scope.ngDialogData.reservoir.zeWhName = scope.ngDialogData.dropDownDefault.warehouse.whName; + scope.ngDialogData.reservoir.zeWhCode = scope.ngDialogData.dropDownDefault.warehouse.whCode; + //存在id 则为更新 不存在 新增 if(scope.ngDialogData.reservoir.zeId){ //更新 reservoirService.update(scope.ngDialogData.reservoir) @@ -195,18 +177,6 @@ wmsCtrl.controller('reservoirCtrl',['$scope','reservoirService','dropDownService }) } } - - //仓库修改 change - scope.changeWarehouseChange = function(item){ - if(!scope.ngDialogData.reservoir){ - scope.ngDialogData.reservoir = {}; - } - scope.ngDialogData.reservoir.zeWhName = item.whName; - scope.ngDialogData.reservoir.zeWhCode = item.whCode; - } - - //默认选择仓库名称 - scope.changeWarehouseChange(scope.ngDialogData.dropDownDefault.warehouse); }]) .controller('repairBillCtrl',['$scope','repairBillService','dropDownService',function(scope,repairBillService,dropDownService){ //维修单管理 controller diff --git a/public/js/ctrl/s.ctrl.js b/public/js/ctrl/s.ctrl.js index 5f5c14df..319c7f36 100644 --- a/public/js/ctrl/s.ctrl.js +++ b/public/js/ctrl/s.ctrl.js @@ -78,9 +78,11 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService closeByDocument: false, closeByEscape: false, data: { - warehouse: warehouse, //仓库 - dropDownDefault: { //下拉框默认值 - warehouse: warehouse[0] //仓库默认值 + dropDownDefault : { //下拉框默认值 + warehouse : { + whName: scope.userInfo.whName, + whCode:scope.userInfo.whCode + } } }, width: 530, @@ -111,56 +113,41 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService stockUnitService.getById(scope.stockUnitList[indexArr[0]].locId) .then(function(result){ if(result.success){ - - //获取仓库 - dropDownService.getWarehouse() - .then(function(warehouseResult){ - if(warehouseResult.success){ - //设置仓库默认值 - var defaultCk = {}; - for(var i = 0; i < warehouseResult.data.length;i++){ - if(warehouseResult.data[i].whCode == result.data.locWhCode){ - defaultCk = warehouseResult.data[i]; - break; + var warehouse = { + whName : result.data.locWhName, + whCode : result.data.locWhCode + } + //获取库区信息 + scope.dropDownService.getZoneList(warehouse.whCode) + .then(function(zoneResult){ + if(zoneResult.success){ + //库区默认值 + var defaultZone = null; + for(var i = 0; i < zoneResult.data.length; i++){ + if(zoneResult.data[i].zeZoneCode == result.data.locZoneCode){ + defaultZone = zoneResult.data[i]; } } - //获取库区信息 - scope.dropDownService.getZoneList(defaultCk.whCode) - .then(function(zoneResult){ - if(zoneResult.success){ - //库区默认值 - var defaultZone = null; - for(var i = 0; i < zoneResult.data.length; i++){ - if(zoneResult.data[i].zeZoneCode == result.data.locZoneCode){ - defaultZone = zoneResult.data[i]; - } - } - - scope.Tools.dialog({ - controller : 'stockUnitCtrl.dialog', - template : 'templates/locationManagement/stockUnitManagement/stock-unit-form.html', - closeByDocument : false, - closeByEscape : false, - data : { - warehouse : warehouseResult.data, //仓库 - zone : zoneResult.data, - dropDownDefault : { //下拉框默认值 - warehouse : defaultCk, //仓库默认值 - zone : defaultZone //库区默认值 - }, - stockUnit : result.data - }, - width : 530, - title : '更新库位', - scope : scope - }) - }else{ - scope.Tools.alert(res.message); - } - }) + scope.Tools.dialog({ + controller : 'stockUnitCtrl.dialog', + template : 'templates/locationManagement/stockUnitManagement/stock-unit-form.html', + closeByDocument : false, + closeByEscape : false, + data : { + zone : zoneResult.data, + dropDownDefault : { //下拉框默认值 + warehouse : warehouse, //仓库默认值 + zone : defaultZone //库区默认值 + }, + stockUnit : result.data + }, + width : 530, + title : '更新库位', + scope : scope + }) }else{ - scope.Tools.alert(result.message); + scope.Tools.alert(res.message); } }) }else{ diff --git a/public/templates/locationManagement/reservoirManagement/reservoir-form.html b/public/templates/locationManagement/reservoirManagement/reservoir-form.html index 3f62aa7a..4a53649c 100644 --- a/public/templates/locationManagement/reservoirManagement/reservoir-form.html +++ b/public/templates/locationManagement/reservoirManagement/reservoir-form.html @@ -19,23 +19,13 @@
所属仓库代码
- - - - - - - - - 没有加载到数据 - - +
所属仓库名称
- +
diff --git a/public/templates/locationManagement/stockUnitManagement/stock-unit-form.html b/public/templates/locationManagement/stockUnitManagement/stock-unit-form.html index f997ef09..8817367c 100644 --- a/public/templates/locationManagement/stockUnitManagement/stock-unit-form.html +++ b/public/templates/locationManagement/stockUnitManagement/stock-unit-form.html @@ -48,17 +48,7 @@
所属仓库代码
- - - - - - - - - 没有加载到数据 - - +
-- Gitee From cfcd1001b88bcba7189c5f6b77c0a3c0e09d6761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BB=81=E6=9D=B0?= Date: Fri, 20 Oct 2017 20:34:31 +0800 Subject: [PATCH 11/25] =?UTF-8?q?=E5=9B=9E=E8=BD=A6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/pom.json | 12 ++++++++++++ .../shipmentPlan/shipment-plan-list.html | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/config/pom.json b/config/pom.json index 1084a421..41f33747 100644 --- a/config/pom.json +++ b/config/pom.json @@ -66,5 +66,17 @@ "phone": "11111111111", "password": "123456a" } + }, + "lbLocal":{ + "version": "1.0.1", + "compressed": false, + "devView": true, + "validate": false, + "tmsMap" : true, + "host" : "http://10.2.4.80:8080/ils-wms-extra-web/", + "ticketUser": { + "phone": "11111111111", + "password": "123456a" + } } } \ No newline at end of file diff --git a/public/templates/warehouseManagement/shipmentPlan/shipment-plan-list.html b/public/templates/warehouseManagement/shipmentPlan/shipment-plan-list.html index 62252138..83bad007 100644 --- a/public/templates/warehouseManagement/shipmentPlan/shipment-plan-list.html +++ b/public/templates/warehouseManagement/shipmentPlan/shipment-plan-list.html @@ -5,7 +5,7 @@
- +
-- Gitee From 8f392cb67f5606dd6b5a3879eb003a77eed1da08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Fri, 20 Oct 2017 21:13:34 +0800 Subject: [PATCH 12/25] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/i.ctrl.js | 2 +- public/js/wms-tools.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/ctrl/i.ctrl.js b/public/js/ctrl/i.ctrl.js index 13341888..a70d08c2 100644 --- a/public/js/ctrl/i.ctrl.js +++ b/public/js/ctrl/i.ctrl.js @@ -1182,7 +1182,7 @@ wmsCtrl.controller('inStorageBillCtrl',['$scope','inStorageBillService','dropDow scope.search.pageNo = scope.pageNo; } if(scope.otherForm){ //展开了更多 - scope.search.odd_vehicle_spec_code = scope.dropDownDefault.vehicleSpec.code; + scope.search.odd_vehicle_spec_name = scope.dropDownDefault.vehicleSpec.name; return scope.search; }else{ //没有展开 return {}; diff --git a/public/js/wms-tools.js b/public/js/wms-tools.js index 4cd1b9f9..b6445131 100644 --- a/public/js/wms-tools.js +++ b/public/js/wms-tools.js @@ -472,7 +472,7 @@ wmsService.service('Tools',['ngDialog','constant','$timeout',function(ngDialog,c LODOP.SET_PRINT_PAGESIZE(0,300,200); LODOP.ADD_PRINT_HTML(7,5,'13mm','18mm',html); if(pages){ - LODOP.SET_PRINT_COPIES(pages); //打印2份 + LODOP.SET_PRINT_COPIES(pages); //设置打印数量 } /*LODOP.PREVIEW(); //调试模式*/ LODOP.PRINT(); //打印模式 -- Gitee From a2de08a06326de4db2109ba9855bdf5f13b92eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Fri, 20 Oct 2017 21:44:12 +0800 Subject: [PATCH 13/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/s.ctrl.js | 47 +++++++------------ .../stockUnitManagement/stock-unit-list.html | 16 ------- 2 files changed, 18 insertions(+), 45 deletions(-) diff --git a/public/js/ctrl/s.ctrl.js b/public/js/ctrl/s.ctrl.js index 319c7f36..872512ef 100644 --- a/public/js/ctrl/s.ctrl.js +++ b/public/js/ctrl/s.ctrl.js @@ -36,53 +36,37 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService status : scope.dropDownList.status[0] //库位状态 } - //获取仓库 - dropDownService.getWarehouse() + //库区查询 + scope.dropDownService.getZoneList(scope.userInfo.whCode) .then(function(result){ if(result.success){ - scope.dropDownList.warehouse = result.data; - scope.dropDownList.warehouse.unshift(scope.constant.defaultDropDownNullData); //插入空数据 - scope.dropDownDefault.warehouse = scope.dropDownList.warehouse[0]; //仓库默认值 + scope.dropDownList.zone = result.data; + scope.dropDownList.zone.unshift(scope.constant.defaultDropDownNullData); + scope.dropDownDefault.zone = scope.dropDownList.zone[0]; }else{ scope.Tools.alert(result.message); } }) - //仓库 change - scope.changeWarehouseChange = function(item){ - if(item.whCode){ - scope.dropDownService.getZoneList(item.whCode) - .then(function(result){ - if(result.success){ - scope.dropDownList.zone = result.data; - scope.dropDownList.zone.unshift(scope.constant.defaultDropDownNullData); - scope.dropDownDefault.zone = scope.dropDownList.zone[0]; - }else{ - scope.Tools.alert(result.message); - } - }) - } - } - //新增库位 click scope.addStockUnitClick = function(){ - //获取仓库 - dropDownService.getWarehouse() + scope.dropDownService.getZoneList(scope.userInfo.whCode) .then(function(result){ if(result.success){ - var warehouse = result.data; //仓库 scope.Tools.dialog({ controller: 'stockUnitCtrl.dialog', template: 'templates/locationManagement/stockUnitManagement/stock-unit-form.html', closeByDocument: false, closeByEscape: false, data: { + zone : result.data, dropDownDefault : { //下拉框默认值 warehouse : { whName: scope.userInfo.whName, whCode:scope.userInfo.whCode - } + }, + zone : result.data[0] } }, width: 530, @@ -179,8 +163,9 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService scope.search.pageSize = scope.pageSize; //设置最大页 if(scope.otherForm){ //展开了更多 scope.search.locEnableFlag = scope.dropDownDefault.status.value; //状态 - scope.search.locWhId = scope.dropDownDefault.warehouse.value; //仓库 - scope.search.locZoneId = scope.dropDownDefault.zone.zeId; //库区 + scope.search.locWhCode = scope.userInfo.whCode; //仓库code + scope.search.locZoneId = scope.dropDownDefault.zone.zeId; //库区id + scope.search.locZoneCode = scope.dropDownDefault.zone.zeZoneCode; //库区code return scope.search; }else{ return scope.search; @@ -312,6 +297,10 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService //新增或更新 scope.addOrUpdateClick = function(){ + + scope.ngDialogData.stockUnit.locWhName = scope.ngDialogData.warehouse.whName; + scope.ngDialogData.stockUnit.locWhCode = scope.ngDialogData.warehouse.whCode; + //有库位id则为更新 没有则为 新增 if(scope.ngDialogData.stockUnit.locId){ stockUnitService.update(scope.ngDialogData.stockUnit) @@ -341,7 +330,7 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService } } - //仓库修改 change + /*//仓库修改 change scope.changeWarehouseChange = function(item){ if(!scope.ngDialogData.stockUnit){ scope.ngDialogData.stockUnit = {}; @@ -364,7 +353,7 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService } //默认选择仓库名称 - scope.changeWarehouseChange(scope.ngDialogData.dropDownDefault.warehouse); + scope.changeWarehouseChange(scope.ngDialogData.dropDownDefault.warehouse);*/ //库区修改 change scope.changeZoneChange = function(item){ diff --git a/public/templates/locationManagement/stockUnitManagement/stock-unit-list.html b/public/templates/locationManagement/stockUnitManagement/stock-unit-list.html index f4765f1c..cd0fa14b 100644 --- a/public/templates/locationManagement/stockUnitManagement/stock-unit-list.html +++ b/public/templates/locationManagement/stockUnitManagement/stock-unit-list.html @@ -22,22 +22,6 @@
-
-
所属仓库
-
- - - - - - - - - 没有加载到数据 - - -
-
所属库区
-- Gitee From 2dc8337e76ebbe1a26758ad8be14af7f217da09c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Fri, 20 Oct 2017 21:51:48 +0800 Subject: [PATCH 14/25] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/s.ctrl.js | 11 +++++------ .../stockUnitManagement/stock-unit-form.html | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/public/js/ctrl/s.ctrl.js b/public/js/ctrl/s.ctrl.js index 872512ef..29bd8dd8 100644 --- a/public/js/ctrl/s.ctrl.js +++ b/public/js/ctrl/s.ctrl.js @@ -50,7 +50,6 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService //新增库位 click scope.addStockUnitClick = function(){ - scope.dropDownService.getZoneList(scope.userInfo.whCode) .then(function(result){ if(result.success){ @@ -62,11 +61,11 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService data: { zone : result.data, dropDownDefault : { //下拉框默认值 - warehouse : { - whName: scope.userInfo.whName, - whCode:scope.userInfo.whCode - }, zone : result.data[0] + }, + stockUnit : { + locWhName: scope.userInfo.whName, + locWhCode:scope.userInfo.whCode } }, width: 530, @@ -354,7 +353,6 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService //默认选择仓库名称 scope.changeWarehouseChange(scope.ngDialogData.dropDownDefault.warehouse);*/ - //库区修改 change scope.changeZoneChange = function(item){ if(!scope.ngDialogData.stockUnit){ @@ -365,6 +363,7 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService scope.ngDialogData.stockUnit.locZoneName = item.zeZoneName; } } + scope.changeZoneChange(scope.ngDialogData.dropDownDefault.zone); }]) .controller('stockUnitStrategyCtrl',['$scope','stockUnitStrategyService','dropDownService',function(scope,stockUnitStrategyService,dropDownService){ //库位策略 controller //列表条件参数 diff --git a/public/templates/locationManagement/stockUnitManagement/stock-unit-form.html b/public/templates/locationManagement/stockUnitManagement/stock-unit-form.html index 8817367c..a97467f1 100644 --- a/public/templates/locationManagement/stockUnitManagement/stock-unit-form.html +++ b/public/templates/locationManagement/stockUnitManagement/stock-unit-form.html @@ -48,7 +48,7 @@
所属仓库代码
- +
-- Gitee From 1700ddcf66bb53d1f5875f07bff972fca1c771ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Fri, 20 Oct 2017 21:53:13 +0800 Subject: [PATCH 15/25] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/s.ctrl.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/public/js/ctrl/s.ctrl.js b/public/js/ctrl/s.ctrl.js index 29bd8dd8..526c50ea 100644 --- a/public/js/ctrl/s.ctrl.js +++ b/public/js/ctrl/s.ctrl.js @@ -297,9 +297,6 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService //新增或更新 scope.addOrUpdateClick = function(){ - scope.ngDialogData.stockUnit.locWhName = scope.ngDialogData.warehouse.whName; - scope.ngDialogData.stockUnit.locWhCode = scope.ngDialogData.warehouse.whCode; - //有库位id则为更新 没有则为 新增 if(scope.ngDialogData.stockUnit.locId){ stockUnitService.update(scope.ngDialogData.stockUnit) -- Gitee From 70c881fe4a777951c8c0a65e03aa604436de7ae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Fri, 20 Oct 2017 21:59:22 +0800 Subject: [PATCH 16/25] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=93=E5=8C=BAid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/s.ctrl.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/js/ctrl/s.ctrl.js b/public/js/ctrl/s.ctrl.js index 526c50ea..e65a9142 100644 --- a/public/js/ctrl/s.ctrl.js +++ b/public/js/ctrl/s.ctrl.js @@ -358,6 +358,7 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService if(item){ scope.ngDialogData.stockUnit.locZoneCode = item.zeZoneCode; scope.ngDialogData.stockUnit.locZoneName = item.zeZoneName; + scope.ngDialogData.stockUnit.locZoneId = item.zeId; } } scope.changeZoneChange(scope.ngDialogData.dropDownDefault.zone); -- Gitee From 12716abb39d0dcb835df6f0a7ccf929b1bdda151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Sat, 21 Oct 2017 09:15:48 +0800 Subject: [PATCH 17/25] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/s.ctrl.js | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/public/js/ctrl/s.ctrl.js b/public/js/ctrl/s.ctrl.js index e65a9142..ec9732d3 100644 --- a/public/js/ctrl/s.ctrl.js +++ b/public/js/ctrl/s.ctrl.js @@ -326,30 +326,6 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService } } - /*//仓库修改 change - scope.changeWarehouseChange = function(item){ - if(!scope.ngDialogData.stockUnit){ - scope.ngDialogData.stockUnit = {}; - } - scope.ngDialogData.stockUnit.locWhName = item.whName; - scope.ngDialogData.stockUnit.locWhCode = item.whCode; - scope.ngDialogData.stockUnit.locWhId = item.whId; - - //获取库区信息 - scope.dropDownService.getZoneList(item.whCode) - .then(function(result){ - if(result.success){ - scope.ngDialogData.zone = result.data; - scope.ngDialogData.dropDownDefault.zone = result.data[0]; - scope.changeZoneChange(scope.ngDialogData.dropDownDefault.zone); - }else{ - scope.Tools.alert(result.message); - } - }) - } - - //默认选择仓库名称 - scope.changeWarehouseChange(scope.ngDialogData.dropDownDefault.warehouse);*/ //库区修改 change scope.changeZoneChange = function(item){ if(!scope.ngDialogData.stockUnit){ -- Gitee From dc519421998cdf2083feb818ad07e0ae8f2d044a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BB=81=E6=9D=B0?= Date: Sat, 21 Oct 2017 11:45:42 +0800 Subject: [PATCH 18/25] =?UTF-8?q?=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/s.ctrl.js | 1 - 1 file changed, 1 deletion(-) diff --git a/public/js/ctrl/s.ctrl.js b/public/js/ctrl/s.ctrl.js index ec9732d3..a20fbd0c 100644 --- a/public/js/ctrl/s.ctrl.js +++ b/public/js/ctrl/s.ctrl.js @@ -226,7 +226,6 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService //重置 click scope.resetClick = function(){ scope.search = {}; - scope.dropDownDefault.warehouse = scope.dropDownList.warehouse[0]; scope.dropDownDefault.zone = scope.dropDownList.zone[0]; scope.dropDownDefault.status = scope.dropDownList.status[0]; } -- Gitee From 83a19ac0d49ba33ada12625845299b0eec27c5bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BB=81=E6=9D=B0?= Date: Sat, 21 Oct 2017 14:48:05 +0800 Subject: [PATCH 19/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/o.ctrl.js | 15 ++++++++ .../outboundOrder/outbound-order-list.html | 37 +++++++++---------- .../shipmentPlan/shipment-plan-list.html | 2 +- 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/public/js/ctrl/o.ctrl.js b/public/js/ctrl/o.ctrl.js index 8d834617..c0d652b4 100644 --- a/public/js/ctrl/o.ctrl.js +++ b/public/js/ctrl/o.ctrl.js @@ -32,6 +32,19 @@ wmsCtrl.controller('outboundOrderCtrl', ['$scope','warehouseService','warehouseM outboundStatus : scope.dropDownList.outboundStatus[0] //备料状态默认值 } + //获取装车道 + warehouseMaintenanceService.getEstimateLaneByWhCode(scope.userInfo.whCode) + .then(function(estimateLaneResult){ + if(estimateLaneResult.success){ + scope.dropDownLists = { + estimateLane : estimateLaneResult.data + } + scope.dropDownLists.estimateLane.unshift(scope.constant.defaultDropDownNullData); //向前插入空值 + }else{ + scope.Tools.alert(estimateLaneResult.message); + } + }) + //列表查询接口参数构造 scope.listParam = function(){ @@ -42,6 +55,7 @@ wmsCtrl.controller('outboundOrderCtrl', ['$scope','warehouseService','warehouseM if(scope.otherForm){ //展开了更多 scope.search.ppStatus = scope.dropDownDefault.outboundStatus.value; //备料状态 scope.search.ppOutstockStatus = scope.dropDownDefault.warehouse.value; //出库状态 + scope.search.ppEstimateLane = scope.dropDownDefault.estimateLane.elName; return scope.search; }else{ //没有展开 return scope.search; @@ -128,6 +142,7 @@ wmsCtrl.controller('outboundOrderCtrl', ['$scope','warehouseService','warehouseM scope.search = {}; scope.dropDownDefault.outboundStatus = scope.dropDownList.outboundStatus[0]; scope.dropDownDefault.warehouse = scope.dropDownList.warehouse[0]; + scope.dropDownDefault.estimateLane = scope.dropDownLists.estimateLane[0]; } //刷新 click diff --git a/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html b/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html index 778b59f4..e398170c 100644 --- a/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html +++ b/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html @@ -5,7 +5,7 @@
- +
@@ -14,19 +14,30 @@
  • -
    调度单号
    +
    计划装车道
    - + + + + + + + + + 没有加载到数据 + +
    -
    客户运单号
    +
    备料编码
    - -
    + +
+
-
运单号
+
客户运单号
@@ -65,18 +76,6 @@
  • -
    -
    发车时间
    -
    - -
    -
    -
    -
    至
    -
    - -
    -
    出库状态
    diff --git a/public/templates/warehouseManagement/shipmentPlan/shipment-plan-list.html b/public/templates/warehouseManagement/shipmentPlan/shipment-plan-list.html index 83bad007..389d1a6d 100644 --- a/public/templates/warehouseManagement/shipmentPlan/shipment-plan-list.html +++ b/public/templates/warehouseManagement/shipmentPlan/shipment-plan-list.html @@ -14,7 +14,7 @@
    • -
      订单号
      +
      客户运单号
      -- Gitee From 409f1373b0dc6e1429fe046bc64b3ca95163e377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BB=81=E6=9D=B0?= Date: Sat, 21 Oct 2017 16:06:05 +0800 Subject: [PATCH 20/25] =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/r.ctrl.js | 28 ++++++++++++++++++- public/js/ctrl/w.ctrl.js | 1 - public/js/wms-service.js | 3 ++ .../reservoirManagement/reservoir-list.html | 1 + 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/public/js/ctrl/r.ctrl.js b/public/js/ctrl/r.ctrl.js index 2824d368..2276a78a 100644 --- a/public/js/ctrl/r.ctrl.js +++ b/public/js/ctrl/r.ctrl.js @@ -24,7 +24,6 @@ wmsCtrl.controller('reservoirCtrl',['$scope','reservoirService','dropDownService scope : scope }) } - //更新库区 click scope.modifyReservoirClick = function(){ @@ -66,7 +65,34 @@ wmsCtrl.controller('reservoirCtrl',['$scope','reservoirService','dropDownService } }) } + //删除仓库维护 + scope.deleteWarehouseMaintenanceClick = function(){ + var zeIdArr = []; + var indexArr = scope.Tools.getTableSelectItemIndex('.reservoirTable'); //获取table所选的下标 + var zoneIdList = scope.Tools.getDataTOIndex(indexArr,scope.reservoirList); + if(zoneIdList.length == 0){ + scope.Tools.alert('请选择需要删除的数据'); + return; + } + scope.Tools.dialogConfirm('确定要删除选中的数据吗？') + .then(function(res){ + if(res){ + for(var i =0;i +
    -- Gitee From 84494bfea46d43b9154a0d145fae82a6aaea2e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BB=81=E6=9D=B0?= Date: Sat, 21 Oct 2017 16:49:06 +0800 Subject: [PATCH 21/25] =?UTF-8?q?=E8=A3=85=E8=BD=A6=E9=81=93=E4=B8=8B?= =?UTF-8?q?=E6=8B=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/r.ctrl.js | 2 +- public/js/ctrl/w.ctrl.js | 15 ++++++++++++++- public/js/wms-service.js | 3 +++ .../warehouse/warehouse-list.html | 12 +++++++++++- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/public/js/ctrl/r.ctrl.js b/public/js/ctrl/r.ctrl.js index 2276a78a..4b0a6b64 100644 --- a/public/js/ctrl/r.ctrl.js +++ b/public/js/ctrl/r.ctrl.js @@ -65,7 +65,7 @@ wmsCtrl.controller('reservoirCtrl',['$scope','reservoirService','dropDownService } }) } - //删除仓库维护 + //删除库区 scope.deleteWarehouseMaintenanceClick = function(){ var zeIdArr = []; var indexArr = scope.Tools.getTableSelectItemIndex('.reservoirTable'); //获取table所选的下标 diff --git a/public/js/ctrl/w.ctrl.js b/public/js/ctrl/w.ctrl.js index 107b4860..8b9b4be8 100644 --- a/public/js/ctrl/w.ctrl.js +++ b/public/js/ctrl/w.ctrl.js @@ -39,7 +39,18 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService scope.Tools.alert(result.message); } }) - + //获取装车道 + warehouseService.getEstimateLaneByWhCode(scope.userInfo.whCode) + .then(function(otEstimateLaneResult){ + if(otEstimateLaneResult.success){ + scope.dropDownLists = { + otEstimateLane : otEstimateLaneResult.data + } + scope.dropDownLists.otEstimateLane.unshift(scope.constant.defaultDropDownNullData); //向前插入空值 + }else{ + scope.Tools.alert(otEstimateLaneResult.message); + } + }) //列表查询接口参数构造 scope.listParam = function(){ @@ -53,6 +64,7 @@ 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.dropDownDefault.otEstimateLane.elName; return scope.search; }else{ //没有展开 return { @@ -130,6 +142,7 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService scope.search = {}; scope.dropDownDefault.vehicleSpec = scope.dropDownList.vehicleSpec[0]; scope.dropDownDefault.status = scope.dropDownList.status[0]; + scope.dropDownDefault.otEstimateLane = scope.dropDownLists.otEstimateLane[0]; } //刷新 click diff --git a/public/js/wms-service.js b/public/js/wms-service.js index 66e609f7..3a4d4d4b 100644 --- a/public/js/wms-service.js +++ b/public/js/wms-service.js @@ -242,6 +242,9 @@ var wmsService = angular.module('wms.services', []) }, updateStatus : function (vin) { //更新出库单状态 return httpService.customGET('extraOutbound/updateStatus/' + vin); + }, + getEstimateLaneByWhCode : function(whName){ //装车道列表 + return httpService.customPOST('estimateLane/getEstimateLaneByWhCode' ,whName,{'Content-Type':'text/plain;charset=UTF-8'}); } } }]) diff --git a/public/templates/warehouseManagement/warehouse/warehouse-list.html b/public/templates/warehouseManagement/warehouse/warehouse-list.html index aef28c63..72974fd2 100644 --- a/public/templates/warehouseManagement/warehouse/warehouse-list.html +++ b/public/templates/warehouseManagement/warehouse/warehouse-list.html @@ -41,7 +41,17 @@
    装车道
    - + + + + + + + + + 没有加载到数据 + +
    -- Gitee From 8b0e3c66142d535b120daed071a91b28536104a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BB=81=E6=9D=B0?= Date: Sat, 21 Oct 2017 17:30:18 +0800 Subject: [PATCH 22/25] =?UTF-8?q?=E8=A3=85=E8=BD=A6=E9=81=93=E4=B8=8B?= =?UTF-8?q?=E6=8B=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/o.ctrl.js | 12 ++++++++---- public/js/ctrl/w.ctrl.js | 8 ++++++-- public/js/wms-constant.js | 16 ++++++++-------- .../outboundOrder/outbound-order-list.html | 2 +- .../shipmentPlan/shipment-plan-list.html | 2 +- .../warehouse/warehouse-list.html | 2 +- 6 files changed, 25 insertions(+), 17 deletions(-) diff --git a/public/js/ctrl/o.ctrl.js b/public/js/ctrl/o.ctrl.js index c0d652b4..5384cd57 100644 --- a/public/js/ctrl/o.ctrl.js +++ b/public/js/ctrl/o.ctrl.js @@ -37,9 +37,13 @@ wmsCtrl.controller('outboundOrderCtrl', ['$scope','warehouseService','warehouseM .then(function(estimateLaneResult){ if(estimateLaneResult.success){ scope.dropDownLists = { - estimateLane : estimateLaneResult.data - } + estimateLane : estimateLaneResult.data //计划装车道默认值 + }; scope.dropDownLists.estimateLane.unshift(scope.constant.defaultDropDownNullData); //向前插入空值 + //设置默认值 + scope.dropDownDefaults = { + estimateLane : scope.dropDownLists.estimateLane[0] //计划装车道默认值 + }; }else{ scope.Tools.alert(estimateLaneResult.message); } @@ -55,7 +59,7 @@ wmsCtrl.controller('outboundOrderCtrl', ['$scope','warehouseService','warehouseM if(scope.otherForm){ //展开了更多 scope.search.ppStatus = scope.dropDownDefault.outboundStatus.value; //备料状态 scope.search.ppOutstockStatus = scope.dropDownDefault.warehouse.value; //出库状态 - scope.search.ppEstimateLane = scope.dropDownDefault.estimateLane.elName; + scope.search.ppEstimateLane = scope.dropDownDefaults.estimateLane.elName; return scope.search; }else{ //没有展开 return scope.search; @@ -142,7 +146,7 @@ wmsCtrl.controller('outboundOrderCtrl', ['$scope','warehouseService','warehouseM scope.search = {}; scope.dropDownDefault.outboundStatus = scope.dropDownList.outboundStatus[0]; scope.dropDownDefault.warehouse = scope.dropDownList.warehouse[0]; - scope.dropDownDefault.estimateLane = scope.dropDownLists.estimateLane[0]; + scope.dropDownDefaults.estimateLane = scope.dropDownLists.estimateLane[0]; } //刷新 click diff --git a/public/js/ctrl/w.ctrl.js b/public/js/ctrl/w.ctrl.js index 8b9b4be8..09b46e13 100644 --- a/public/js/ctrl/w.ctrl.js +++ b/public/js/ctrl/w.ctrl.js @@ -47,6 +47,10 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService otEstimateLane : otEstimateLaneResult.data } scope.dropDownLists.otEstimateLane.unshift(scope.constant.defaultDropDownNullData); //向前插入空值 + //设置默认值 + scope.dropDownDefaults = { + otEstimateLane : scope.dropDownLists.otEstimateLane[0] //计划装车道默认值 + }; }else{ scope.Tools.alert(otEstimateLaneResult.message); } @@ -64,7 +68,7 @@ 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.dropDownDefault.otEstimateLane.elName; + scope.search.otEstimateLane = scope.dropDownDefaults.otEstimateLane.elName; return scope.search; }else{ //没有展开 return { @@ -142,7 +146,7 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService scope.search = {}; scope.dropDownDefault.vehicleSpec = scope.dropDownList.vehicleSpec[0]; scope.dropDownDefault.status = scope.dropDownList.status[0]; - scope.dropDownDefault.otEstimateLane = scope.dropDownLists.otEstimateLane[0]; + scope.dropDownDefaults.otEstimateLane = scope.dropDownLists.otEstimateLane[0]; } //刷新 click diff --git a/public/js/wms-constant.js b/public/js/wms-constant.js index fb6ec37e..7be97e86 100644 --- a/public/js/wms-constant.js +++ b/public/js/wms-constant.js @@ -192,16 +192,16 @@ angular.module('wms.constant',[]) unqualified : '不合格' }, outboundStatus : { //备料单 status - unStart : 10, //未开始 - planned : 20, //已计划 - confirmed : 30, //已备料 - finish : 40 //已完成 + unStart : 10, //未出库 + planned : 20 //已出库 + // confirmed : 30, //已备料 + // finish : 40 //已完成 }, outboundStatusName : { //备料单 status name - unStart : '未开始', - planned : '已计划', - confirmed : '已备料', - finish : '已完成' + unStart : '未出库', + planned : '已出库' + // confirmed : '已备料', + // finish : '已完成' }, outboundType : { //出库类型 dispatcherOutbound : 10, //调拨出库 diff --git a/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html b/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html index e398170c..211a9a4b 100644 --- a/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html +++ b/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html @@ -16,7 +16,7 @@
    计划装车道
    - + diff --git a/public/templates/warehouseManagement/shipmentPlan/shipment-plan-list.html b/public/templates/warehouseManagement/shipmentPlan/shipment-plan-list.html index 389d1a6d..6019e2d5 100644 --- a/public/templates/warehouseManagement/shipmentPlan/shipment-plan-list.html +++ b/public/templates/warehouseManagement/shipmentPlan/shipment-plan-list.html @@ -105,7 +105,7 @@
    指令号 - 订单号 + 客户运单号 状态 创建时间 货主 diff --git a/public/templates/warehouseManagement/warehouse/warehouse-list.html b/public/templates/warehouseManagement/warehouse/warehouse-list.html index 72974fd2..65a28cd6 100644 --- a/public/templates/warehouseManagement/warehouse/warehouse-list.html +++ b/public/templates/warehouseManagement/warehouse/warehouse-list.html @@ -41,7 +41,7 @@
    装车道
    - + -- Gitee From d9bf0b0aabd3e9952401f21c1b4ba7766f3d59a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BB=81=E6=9D=B0?= Date: Sat, 21 Oct 2017 18:00:58 +0800 Subject: [PATCH 23/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/wms-constant.js | 28 +++++++++---------- .../outboundOrder/outbound-order-list.html | 2 +- .../warehouse/warehouse-list.html | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/public/js/wms-constant.js b/public/js/wms-constant.js index 7be97e86..19da4589 100644 --- a/public/js/wms-constant.js +++ b/public/js/wms-constant.js @@ -94,14 +94,14 @@ angular.module('wms.constant',[]) warehouse : { //出库状态 unprocessed : 10, //未领取 execution : 20, //待开始 - haveOutbound : 30, //进行中 - finish : 40 //已完成 + // haveOutbound : 30, //进行中 + // finish : 40 //已完成 }, warehouseName : { //出库状态 name - unprocessed : '未领取', - execution : '待开始', - haveOutbound : '进行中', - finish : '已完成' + unprocessed : '未出库', + execution : '已出库' + // haveOutbound : '进行中', + // finish : '已完成' }, defaultDropDownNullData : { //空数据 name : '', @@ -192,16 +192,16 @@ angular.module('wms.constant',[]) unqualified : '不合格' }, outboundStatus : { //备料单 status - unStart : 10, //未出库 - planned : 20 //已出库 - // confirmed : 30, //已备料 - // finish : 40 //已完成 + unStart : 10, //未开始 + planned : 20, //已计划 + confirmed : 30, //已备料 + finish : 40 //已完成 }, outboundStatusName : { //备料单 status name - unStart : '未出库', - planned : '已出库' - // confirmed : '已备料', - // finish : '已完成' + unStart : '未开始', + planned : '已计划', + confirmed : '已备料', + finish : '已完成' }, outboundType : { //出库类型 dispatcherOutbound : 10, //调拨出库 diff --git a/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html b/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html index 211a9a4b..2e206c1a 100644 --- a/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html +++ b/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html @@ -20,7 +20,7 @@ - + diff --git a/public/templates/warehouseManagement/warehouse/warehouse-list.html b/public/templates/warehouseManagement/warehouse/warehouse-list.html index 65a28cd6..b2f741ff 100644 --- a/public/templates/warehouseManagement/warehouse/warehouse-list.html +++ b/public/templates/warehouseManagement/warehouse/warehouse-list.html @@ -45,7 +45,7 @@ - + -- Gitee From a56984e436b5339f3dae273dcc33e5c62f965449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BB=81=E6=9D=B0?= Date: Sat, 21 Oct 2017 18:23:49 +0800 Subject: [PATCH 24/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/wms-constant.js | 4 +-- .../outboundOrder/outbound-order-list.html | 36 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/public/js/wms-constant.js b/public/js/wms-constant.js index 19da4589..a205bb99 100644 --- a/public/js/wms-constant.js +++ b/public/js/wms-constant.js @@ -92,8 +92,8 @@ angular.module('wms.constant',[]) cancellinStocks : '退库' //退库 }, warehouse : { //出库状态 - unprocessed : 10, //未领取 - execution : 20, //待开始 + unprocessed : 10, //未出库 + execution : 20, //已出库 // haveOutbound : 30, //进行中 // finish : 40 //已完成 }, diff --git a/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html b/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html index 2e206c1a..d33e09f4 100644 --- a/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html +++ b/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html @@ -75,24 +75,24 @@
    • -
  • -
    -
    出库状态
    -
    - - - - - - - - - 没有加载到数据 - - -
    -
    -
    • + + + + + + + + + + + + + + + + + +
  • -- Gitee From 5baebc8219387a98e9c999e9b914f15af3c6b556 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, 23 Oct 2017 11:31:36 +0800 Subject: [PATCH 25/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/pom.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/pom.json b/config/pom.json index 41f33747..d6604ea8 100644 --- a/config/pom.json +++ b/config/pom.json @@ -26,6 +26,10 @@ "pro": { "version": "1.0.1", "compressed": true, + "devView": true, + "validate": false, + "tmsMap" : true, + "host" : "http://10.20.30.137:8180/wms-extra-web", "ticketUser": { "phone": "11111111111", "password": "plc_SUnCe)F*`WI" -- Gitee