From 79a9b832b65cedf2602fe4a620f8d81c3aa14118 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期四, 07 九月 2023 14:06:20 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/order/order.js | 3 +-- src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 3 +-- src/main/webapp/static/js/orderLog/orderLog.js | 2 +- src/main/webapp/views/login.html | 13 +++++++------ 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java index 11a327c..d99f017 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -206,8 +206,7 @@ throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触"); } - DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getOwner(),elem.getWeight()); - detlDto.setPayment(orderDetl.getPayment()); + DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getWeight()); if (DetlDto.has(detlDtos, detlDto)) { DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch()); assert one != null; diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js index 232a262..afa749e 100644 --- a/src/main/webapp/static/js/order/order.js +++ b/src/main/webapp/static/js/order/order.js @@ -588,8 +588,7 @@ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){ layer.closeAll(); layer.load(1, {shade: [0.1,'#fff']}); - // location.href = "http://192.168.4.121:8082/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo; - location.href = "http://10.114.97.100:8080/stwms/order/printExport/auth?orderNo="+data.orderNo; + location.href = baseUrl+"/order/printExport/auth?orderNo="+data.orderNo; layer.closeAll('loading'); }); } diff --git a/src/main/webapp/static/js/orderLog/orderLog.js b/src/main/webapp/static/js/orderLog/orderLog.js index 46f4ae1..0c02c95 100644 --- a/src/main/webapp/static/js/orderLog/orderLog.js +++ b/src/main/webapp/static/js/orderLog/orderLog.js @@ -555,7 +555,7 @@ layer.closeAll(); layer.load(1, {shade: [0.1,'#fff']}); // location.href = "http://192.168.4.121:8082/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo; - location.href = "http://10.114.97.100:8080/stwms/orderLog/printExport/auth?orderNo="+data.orderNo; + location.href = baseUrl+"/orderLog/printExport/auth?orderNo="+data.orderNo; layer.closeAll('loading'); }); } diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html index 788255e..75221ca 100644 --- a/src/main/webapp/views/login.html +++ b/src/main/webapp/views/login.html @@ -121,13 +121,14 @@ if (password === "") { layer.tips('璇疯緭鍏ュ瘑鐮�', '#password', {tips: [4, '#ff0000']}); return; - }else { - if(!checkPassword(password)){ - //瀵嗙爜蹇呴』鍖呭惈瀛楃鍜屾暟瀛� - layer.tips('瀵嗙爜蹇呴』鍖呭惈瀛楃鍜屾暟瀛楅暱搴︿笉鑳藉皯浜�8浣嶏紝涓斾笉鑳藉寘鍚繛缁暟瀛楀拰鍥涗綅閲嶅鏁板瓧', '#password', {tips: [4, '#ff0000']}); - return ; - } } + // else { + // if(!checkPassword(password)){ + // //瀵嗙爜蹇呴』鍖呭惈瀛楃鍜屾暟瀛� + // layer.tips('瀵嗙爜蹇呴』鍖呭惈瀛楃鍜屾暟瀛楅暱搴︿笉鑳藉皯浜�8浣嶏紝涓斾笉鑳藉寘鍚繛缁暟瀛楀拰鍥涗綅閲嶅鏁板瓧', '#password', {tips: [4, '#ff0000']}); + // return ; + // } + // } $.ajax({ url: baseUrl+"/login.action", data: { -- Gitblit v1.9.1