From 9e6d4880ca1ce6ae5cb9b9dc1b865f0ee9f65fe8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 19 九月 2025 17:02:45 +0800
Subject: [PATCH] 缓冲区库存调整

---
 src/main/java/com/zy/common/utils/Http.java                   |   12 
 src/main/java/com/zy/common/web/AuthController.java           |   62 ++--
 src/main/java/com/zy/asrs/utils/OrderInAndOutUtil.java        |    2 
 src/main/webapp/static/js/waitPakin/waitPakin.js              |  292 ++++++++++---------
 src/main/java/com/zy/common/config/WebConfig.java             |   60 +++
 src/main/java/com/zy/common/constant/MesConstant.java         |   11 
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |  172 +++++-----
 src/main/webapp/static/js/common.js                           |    1 
 pom.xml                                                       |    2 
 src/main/webapp/views/login.html                              |  273 +++++++++---------
 src/main/resources/application.yml                            |    2 
 11 files changed, 496 insertions(+), 393 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6151db3..80e972e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
         <relativePath/>
     </parent>
     <groupId>com.zy</groupId>
-    <artifactId>asrs</artifactId>
+    <artifactId>asrs</artifactId>t
     <version>1.1.1</version>
     <packaging>war</packaging>
 
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 c401b70..09fcff6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -101,11 +101,11 @@
     public R WarehouseOutPickMergeV1(WarehouseOutPickMergeParam param, Long hostId, Long userId) {
         //鍒ゆ柇搴撲綅鐘舵��
         LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getLocNo()));
-        if (Cools.isEmpty(locMast)){
+        if (Cools.isEmpty(locMast)) {
             return R.error("璇ュ簱浣嶄笉瀛樺湪");
         }
-        if (!locMast.getLocSts().equals("P")){
-            return R.error("璇ュ簱浣嶇姸鎬佷负锛�"+locMast.getLocSts()+",涓嶆弧瓒虫嫞鏂欓�斾腑骞舵澘鏉′欢锛侊紒锛�");
+        if (!locMast.getLocSts().equals("P")) {
+            return R.error("璇ュ簱浣嶇姸鎬佷负锛�" + locMast.getLocSts() + ",涓嶆弧瓒虫嫞鏂欓�斾腑骞舵澘鏉′欢锛侊紒锛�");
         }
 
         Date now = new Date();
@@ -135,7 +135,7 @@
         wrkMastService.insert(wrkMast);
 
         for (OrderDetl orderDetl : param.getCombMats()) {
-            Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr",orderDetl.getMatnr()));
+            Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", orderDetl.getMatnr()));
             if (mat == null) {
                 throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鐗╂枡淇℃伅涓嶅瓨鍦細" + orderDetl.getMatnr());
             }
@@ -151,7 +151,7 @@
             wrkDetl.setModiUser(userId);
             wrkDetl.setZpallet(wrkMast.getBarcode());
             wrkDetl.setBatch(orderDetl.getBatch());
-            if(Cools.isEmpty(orderDetl.getBatch())){
+            if (Cools.isEmpty(orderDetl.getBatch())) {
                 wrkDetl.setBatch("");
             }
             wrkDetl.setBoxType1(orderDetl.getBoxType1());
@@ -165,11 +165,11 @@
 
             if (!Cools.isEmpty(orderDetl.getOrderNo())) {
                 OrderPakin order = orderPakinService.selectByNo(orderDetl.getOrderNo());
-                if (Cools.isEmpty(order)){
+                if (Cools.isEmpty(order)) {
                     continue;
                 }
-                OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
-                if (Cools.isEmpty(orderDetlPakin)){
+                OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
+                if (Cools.isEmpty(orderDetlPakin)) {
                     continue;
                 }
                 if (orderDetlPakin.getAnfme() < (orderDetlPakin.getWorkQty() + orderDetl.getAnfme())) {
@@ -177,11 +177,11 @@
                 }
                 // 淇敼璁㈠崟鏄庣粏浣滀笟鏁伴噺
                 if (!orderDetlPakinService.increaseWorkQty(orderDetlPakin.getOrderId(), orderDetlPakin.getMatnr(), orderDetlPakin.getBatch(), orderDetlPakin.getBrand(),
-                        orderDetlPakin.getStandby1(), orderDetlPakin.getStandby2(), orderDetlPakin.getStandby3(), orderDetlPakin.getBoxType1(), orderDetlPakin.getBoxType2(), orderDetlPakin.getBoxType3(),orderDetl.getAnfme())) {
+                        orderDetlPakin.getStandby1(), orderDetlPakin.getStandby2(), orderDetlPakin.getStandby3(), orderDetlPakin.getBoxType1(), orderDetlPakin.getBoxType2(), orderDetlPakin.getBoxType3(), orderDetl.getAnfme())) {
                     throw new CoolException("淇敼鍗曟嵁鏄庣粏宸ヤ綔鏁伴噺澶辫触");
                 }
 
-                if (order.getSettle() == 1){
+                if (order.getSettle() == 1) {
                     orderPakinService.updateSettle(order.getId(), 2L, userId);
                 }
             }
@@ -192,7 +192,7 @@
 
     @Override
     @Transactional
-    public R pickConfirm(PickConfirmParam param,Long userId) {
+    public R pickConfirm(PickConfirmParam param, Long userId) {
 
         LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                 .eq("loc_no", param.getLocNo()));
@@ -216,9 +216,9 @@
         //妫�楠屼紶鍙傛槸鍚﹀拰璁㈠崟鏄庣粏鍖归厤
         for (PickMatParam matParam : param.getList()) {
             orderDetlPakin = orderDetlPakinService.selectItem
-                    (matParam.getOrderNo(), matParam.getMatnr(),matParam.getBatch(),matParam.getBrand(),
-                            matParam.getStandby1(),matParam.getStandby2(),matParam.getStandby3(),
-                            matParam.getBoxType1(),matParam.getBoxType2(),matParam.getBoxType3());
+                    (matParam.getOrderNo(), matParam.getMatnr(), matParam.getBatch(), matParam.getBrand(),
+                            matParam.getStandby1(), matParam.getStandby2(), matParam.getStandby3(),
+                            matParam.getBoxType1(), matParam.getBoxType2(), matParam.getBoxType3());
             if (orderDetlPakin == null) {
                 return R.error("鐗╂枡鏁版嵁涓嶅瓨鍦�");
             }
@@ -282,7 +282,7 @@
             wrkDetl.setModiTime(now);
             wrkDetl.setModiUser(userId);
             wrkDetl.setZpallet(wrkMast.getBarcode());
-            if(Cools.isEmpty(matParam.getBatch())){
+            if (Cools.isEmpty(matParam.getBatch())) {
                 wrkDetl.setBatch("");
             }
             if (!wrkDetlService.insert(wrkDetl)) {
@@ -291,10 +291,10 @@
 
             //鏇存柊璁㈠崟宸ヤ綔鏁伴噺
             orderDetlPakinService.increaseWorkQty(orderDetlPakin.getOrderId(), matParam.getMatnr(),
-                    matParam.getBatch(),matParam.getBrand(),matParam.getStandby1(),matParam.getStandby2(),matParam.getStandby3(),
-                    matParam.getBoxType1(),matParam.getBoxType2(),matParam.getBoxType3(),matParam.getUseCount());
+                    matParam.getBatch(), matParam.getBrand(), matParam.getStandby1(), matParam.getStandby2(), matParam.getStandby3(),
+                    matParam.getBoxType1(), matParam.getBoxType2(), matParam.getBoxType3(), matParam.getUseCount());
             // 鏇存柊宸ヤ綔妗ｇ姸鎬�
-            orderPakinService.updateSettle(orderDetlPakin.getOrderId(),2L,userId);
+            orderPakinService.updateSettle(orderDetlPakin.getOrderId(), 2L, userId);
         }
         // 淇敼搴撲綅鐘舵��:   F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
         locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getLocNo()));
@@ -317,47 +317,47 @@
     public R WarehouseOutV1(CombParam combParam, Long hostId, Long userId) {
         //鍒ゆ柇搴撲綅鐘舵��
         LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", combParam.getLocNo()));
-        if (Cools.isEmpty(locMast)){
+        if (Cools.isEmpty(locMast)) {
             return R.error("璇ュ簱浣嶄笉瀛樺湪");
         }
-        if (!locMast.getLocSts().equals("P")){
-            return R.error("璇ュ簱浣嶇姸鎬佷负锛�"+locMast.getLocSts()+",涓嶆弧瓒冲苟鏉块�斾腑鎷ｉ�夋潯浠讹紒锛侊紒");
+        if (!locMast.getLocSts().equals("P")) {
+            return R.error("璇ュ簱浣嶇姸鎬佷负锛�" + locMast.getLocSts() + ",涓嶆弧瓒冲苟鏉块�斾腑鎷ｉ�夋潯浠讹紒锛侊紒");
         }
         //鏌ヨ搴撳瓨鏁版嵁
-        for (CombParam.CombMat combMat :combParam.getCombMats()){
+        for (CombParam.CombMat combMat : combParam.getCombMats()) {
             List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>()
-                            .eq("loc_no", combParam.getLocNo())
-                            .eq("matnr", combMat.getMatnr())
+                    .eq("loc_no", combParam.getLocNo())
+                    .eq("matnr", combMat.getMatnr())
             );
-            if (locDetlList.isEmpty()){
+            if (locDetlList.isEmpty()) {
                 return R.error("鏈煡璇㈠埌搴撳瓨鏁版嵁");
             }
-            if (locDetlList.size()>1){
+            if (locDetlList.size() > 1) {
                 return R.error("搴撳瓨鏁版嵁澶т簬1鏉★紝涓轰繚璇佹暟鎹噯纭�э紝璇风敤姝ｅ父娴佺▼鍑哄簱锛侊紒锛�");
             }
             LocDetl locDetl = locDetlList.get(0);
-            if (combMat.getAnfme() > locDetl.getAnfme()){
+            if (combMat.getAnfme() > locDetl.getAnfme()) {
                 return R.error("鎷ｉ�夋暟閲忛敊璇紝瓒呭嚭搴撳瓨鏁伴噺");
             }
-            if (!Cools.isEmpty(combMat.getOrderNo())){
+            if (!Cools.isEmpty(combMat.getOrderNo())) {
                 OrderPakout orderPakout = orderPakoutService.selectByNo(combMat.getOrderNo());
-                if (Cools.isEmpty(orderPakout)){
+                if (Cools.isEmpty(orderPakout)) {
                     continue;
                 }
-                if (orderPakout.getSettle() == 1){
-                    OrderInAndOutUtil.updateOrder(false,orderPakout.getId(), 2L, 9527L);
+                if (orderPakout.getSettle() == 1) {
+                    OrderInAndOutUtil.updateOrder(false, orderPakout.getId(), 2L, 9527L);
                 }
                 OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderPakout.getId(), combMat.getMatnr(), combMat.getBatch(),
                         combMat.getBrand(), combMat.getStandby1(), combMat.getStandby2(), combMat.getStandby3(), combMat.getBoxType1(), combMat.getBoxType2(), combMat.getBoxType3());
-                if (Cools.isEmpty(orderDetlPakout)){
+                if (Cools.isEmpty(orderDetlPakout)) {
                     continue;
                 }
-                if (orderDetlPakout.getAnfme() < (orderDetlPakout.getWorkQty()+combMat.getAnfme())){
+                if (orderDetlPakout.getAnfme() < (orderDetlPakout.getWorkQty() + combMat.getAnfme())) {
                     throw new CoolException("鎷ｉ�夋暟閲忓嚭閿�,璁㈠崟鍓╀綑鍑哄簱鏁伴噺灏忎簬宸插嚭搴撴暟閲忎笌灏嗘嫞閫夋暟閲忎箣鍜岋紒锛侊紒");
                 }
                 // 淇敼璁㈠崟鏄庣粏浣滀笟鏁伴噺
                 if (!orderDetlPakoutService.increaseWorkQty(orderDetlPakout.getOrderId(), combMat.getMatnr(), combMat.getBatch(), combMat.getBrand(),
-                        combMat.getStandby1(), combMat.getStandby2(), combMat.getStandby3(), combMat.getBoxType1(), combMat.getBoxType2(), combMat.getBoxType3(),combMat.getAnfme())) {
+                        combMat.getStandby1(), combMat.getStandby2(), combMat.getStandby3(), combMat.getBoxType1(), combMat.getBoxType2(), combMat.getBoxType3(), combMat.getAnfme())) {
                     throw new CoolException("淇敼鍗曟嵁鏄庣粏宸ヤ綔鏁伴噺澶辫触");
                 }
 //                // 淇敼璁㈠崟鏄庣粏瀹屾垚鏁伴噺
@@ -395,7 +395,7 @@
                 wrkMast.setModiUser(userId);
                 wrkMastService.insert(wrkMast);
 
-                Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr",combMat.getMatnr()));
+                Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", combMat.getMatnr()));
                 if (mat == null) {
                     throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鐗╂枡淇℃伅涓嶅瓨鍦細" + combMat.getMatnr());
                 }
@@ -412,7 +412,7 @@
                 wrkDetl.setModiUser(userId);
                 wrkDetl.setZpallet(wrkMast.getBarcode());
                 wrkDetl.setBatch(combMat.getBatch());
-                if(Cools.isEmpty(combMat.getBatch())){
+                if (Cools.isEmpty(combMat.getBatch())) {
                     wrkDetl.setBatch("");
                 }
                 wrkDetl.setBoxType1(combMat.getBoxType1());
@@ -425,8 +425,8 @@
                 wrkDetlService.insert(wrkDetl);
                 System.out.println("姝ｅ父");
 
-            }catch (Exception e) {
-                throw new CoolException("鎿嶄綔鏁版嵁寮傚父锛�"+e.getMessage());
+            } catch (Exception e) {
+                throw new CoolException("鎿嶄綔鏁版嵁寮傚父锛�" + e.getMessage());
             }
         }
         return R.ok("鎿嶄綔鎴愬姛锛�");
@@ -509,7 +509,7 @@
         Wrapper<OrderDetl> wrapper1 = new EntityWrapper<>();
         wrapper1.eq("status", 1);
         wrapper1.in("order_id", orderIds);
-        wrapper1.orderBy("create_time",false);
+        wrapper1.orderBy("create_time", false);
         if (!Cools.isEmpty(matnr)) {
             wrapper1.like("matnr", matnr);
         }
@@ -539,12 +539,12 @@
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void comb(CombParam param, Long userId) {
         if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
             throw new CoolException(BaseRes.PARAM);
         }
-        if(param.getCombMats().size()>1){
+        if (param.getCombMats().size() > 1) {
             throw new CoolException("璇锋彁鍙栦竴涓晢鍝侊紝鎴栬�呭埛鏂伴噸鏂扮粍鎵橈紒");
         }
         // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
@@ -553,16 +553,16 @@
             throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
         }
 
-        if(param.getBarcode().length()!=8){
+        if (param.getBarcode().length() != 8) {
             throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + param.getBarcode());
         }
-        if (param.getCombMats().size()>1){
+        if (param.getCombMats().size() > 1) {
             throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
         }
 
-        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
-        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
-        int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
+        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
+        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
+        int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
         if (countLoc > 0 || countWrk > 0 || countwait > 0) {
             throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
         }
@@ -575,8 +575,8 @@
             // 鐢熸垚鍏ュ簱閫氱煡妗�
             List<DetlDto> detlDtos = new ArrayList<>();
             param.getCombMats().forEach(elem -> {
-                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),
-                        elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3(),  elem.getAnfme());
+                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
+                        elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
                 if (DetlDto.has(detlDtos, detlDto)) {
                     DetlDto one = DetlDto.findDto(detlDtos, detlDto);
                     assert one != null;
@@ -607,7 +607,7 @@
                     throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
                 }
             }
-        // 鍏宠仈缁勬墭
+            // 鍏宠仈缁勬墭
         } else {
 //            Order order = orderService.selectByNo(param.getOrderNo());
             Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, param.getOrderNo());
@@ -620,8 +620,8 @@
 
                 // 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
 //                OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
-                OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),
-                        elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3());
+                OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
+                        elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3());
                 if (elem.getAnfme() > orderDetl.getEnableQty()) {
                     throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
                 }
@@ -629,10 +629,10 @@
 //                if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
 //                    throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
 //                }
-                OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE,order.getId(), elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),
-                        elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3(), elem.getAnfme());
-                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),
-                        elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3(),  elem.getAnfme());
+                OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
+                        elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
+                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
+                        elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
                 if (DetlDto.has(detlDtos, detlDto)) {
                     DetlDto one = DetlDto.findDto(detlDtos, detlDto);
                     assert one != null;
@@ -663,7 +663,7 @@
                 }
             }
 //            orderService.updateSettle(order.getId(), 2L, userId);
-            OrderInAndOutUtil.updateOrder(Boolean.TRUE,order.getId(), 2L, userId);
+            OrderInAndOutUtil.updateOrder(Boolean.TRUE, order.getId(), 2L, userId);
         }
 
     }
@@ -680,15 +680,15 @@
         }
 
         // 鑾峰彇鍟嗗搧鍒楄〃
-        for(CombParam.CombMat combMat : param.getCombMats()){
+        for (CombParam.CombMat combMat : param.getCombMats()) {
             Mat mat = matService.selectByMatnr(combMat.getMatnr());
-            if (Cools.isEmpty(mat)){
+            if (Cools.isEmpty(mat)) {
                 throw new CoolException(combMat.getMatnr() + ":鍟嗗搧妗ｆ涓嶅瓨鍦紒");
             }
-            if (Cools.isEmpty(combMat.getAnfme()) || combMat.getAnfme()==0){
+            if (Cools.isEmpty(combMat.getAnfme()) || combMat.getAnfme() == 0) {
                 throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鏁伴噺鏈夎锛�");
             }
-            if (Cools.isEmpty(combMat.getBatch())){
+            if (Cools.isEmpty(combMat.getBatch())) {
 //                throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鎵瑰彿鏈夎锛�");
             }
             ManLocDetl manLocDetl = new ManLocDetl();
@@ -709,16 +709,16 @@
     @Override
     public void offSale(OffSaleParam offSaleParam) {
         ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr());
-        if (Cools.isEmpty(manLocDetl)){
+        if (Cools.isEmpty(manLocDetl)) {
             throw new CoolException("鏃犳鍟嗗搧锛�");
         }
         double anfme = manLocDetl.getAnfme() - offSaleParam.getAnfme();
         if (anfme < 0) {
             throw new CoolException("鍟嗗搧搴撳瓨涓嶈冻锛�");
-        } else if (anfme == 0){
+        } else if (anfme == 0) {
             manLocDetlMapper.deleteLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr());
         }
-        manLocDetlMapper.updateAnfme0(anfme,manLocDetl.getNodeId());
+        manLocDetlMapper.updateAnfme0(anfme, manLocDetl.getNodeId());
     }
 
     // 鏌ユ壘鍟嗗搧
@@ -777,7 +777,9 @@
 
         // 娣诲姞鏄庣粏
         for (WrkDetl wrkDetl : list) {
-            if (wrkDetl.getAnfme() == 0.0D) { continue; }
+            if (wrkDetl.getAnfme() == 0.0D) {
+                continue;
+            }
             // todo 鐩樼偣璁板綍銆佷繚瀛樿皟鏁磋褰�
             String orderNo = wrkDetl.getOrderNo();
             Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
@@ -793,7 +795,7 @@
         }
 
         // 淇敼鐩樼偣浠诲姟涓绘。鐘舵��
-        wrkMast.setFullPlt(wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()).size() != 0?"Y":"N");
+        wrkMast.setFullPlt(wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()).size() != 0 ? "Y" : "N");
         wrkMast.setModiTime(now);
         wrkMast.setModiUser(userId);
         if (!wrkMastService.updateById(wrkMast)) {
@@ -835,8 +837,8 @@
                 }
                 Mat analyse = MatUtils.analyseMat(elem.getMatnr());
                 // 鏉＄爜銆佺墿鏂欎唬鐮併�佸簭鍒楀彿銆佹暟閲�
-                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(),analyse.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),
-                        elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3(),  elem.getAnfme());
+                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), analyse.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
+                        elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
 
 //                DetlDto detlDto = new DetlDto(elem.getMatnr(), analyse.getMatnr(), analyse.getBarcode(), elem.getAnfme());
 //                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
@@ -873,10 +875,10 @@
                     if (jsonObject.getInteger("code").equals(200)) {
                         success = true;
                     } else if (jsonObject.getInteger("code").equals(500)) {
-                        log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
+                        log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
                         throw new CoolException(jsonObject.getString("msg"));
                     } else {
-                        log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
+                        log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
                         throw new CoolException("涓婃姤mes绯荤粺澶辫触");
                     }
                 } catch (Exception e) {
@@ -894,7 +896,9 @@
                                 response,
                                 success
                         );
-                    } catch (Exception e) { log.error("", e); }
+                    } catch (Exception e) {
+                        log.error("", e);
+                    }
                 }
 
             }
@@ -924,8 +928,8 @@
                 // 淇敼浣滀笟鏁伴噺 ----------------------------------------
                 // 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
 //                OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch());
-                OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3()
-                        ,detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3());
+                OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3()
+                        , detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3());
                 if (detlDto.getAnfme() > orderDetl.getEnableQty()) {
                     throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
                 }
@@ -933,8 +937,8 @@
 //                if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
 //                    throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
 //                }
-                OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE,order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3()
-                        ,detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3(), detlDto.getAnfme());
+                OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE, order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3()
+                        , detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3(), detlDto.getAnfme());
                 // 淇濆瓨鍏ュ簱閫氱煡妗�
                 Mat mat = matService.selectByMatnr(detlDto.getMatnr());
                 if (Cools.isEmpty(mat)) {
@@ -978,7 +982,7 @@
         //鏍规嵁璁㈠崟鍙风敓鎴愬嚭搴撲换鍔″伐浣滄。
         Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, orderNo);
 //        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderNo));
-        if (order.getSettle() != 1 && order.getSettle() != 2){
+        if (order.getSettle() != 1 && order.getSettle() != 2) {
             throw new CoolException("璇ヨ鍗曞凡澶勭悊");
         }
 
@@ -986,13 +990,13 @@
         List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
 
         Date now = new Date();
-        for(OrderDetl orderDetl : orderDetls){
+        for (OrderDetl orderDetl : orderDetls) {
             //鏌ヨ鎵�鏈夊簱浣嶇姸鎬佷负F鐨勫簱浣嶄俊鎭�
-            List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),null,null);
+            List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, null);
             if (locDetls.size() == 0) {
                 throw new CoolException("搴撳瓨涓病鏈夎鐗╂枡");
             }
-            for(LocDetl locDetl : locDetls){
+            for (LocDetl locDetl : locDetls) {
                 //濡傛灉璇ュ簱浣嶅嚭搴撹矾绾挎墍鐢ㄧ殑鍫嗗灈鏈簅ut_enable涓嶄负Y,璺宠繃璇ュ惊鐜�
                 LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                         .eq("loc_no", locDetl.getLocNo()));
@@ -1001,13 +1005,13 @@
                 }
                 BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
                         .eq("crn_no", locMast.getCrnNo()));
-                if (Cools.isEmpty(crn_no) || !crn_no.getOutEnable().equals("Y")){
+                if (Cools.isEmpty(crn_no) || !crn_no.getOutEnable().equals("Y")) {
                     continue;
                 }
 
                 //鍙嚭搴撴暟閲� = 璁㈠崟鏁伴噺 - 浣滀笟涓暟閲�
                 Double outQty = orderDetl.getAnfme() - orderDetl.getWorkQty();
-                if(outQty <= 0){
+                if (outQty <= 0) {
                     break;
                 }
                 // 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
@@ -1022,19 +1026,19 @@
 //                if(!orderService.update(order, new EntityWrapper<Order>().eq("order_no", orderNo))){
 //                    throw new CoolException("鏇存柊璁㈠崟鐘舵�佸け璐�");
 //                }
-                OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),2L,userId);
+                OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 2L, userId);
                 orderDetl.setWorkQty(orderDetl.getWorkQty() + curOutQty);
                 orderDetl.setUpdateBy(userId);
                 orderDetl.setUpdateTime(now);
                 Wrapper wrapper = new EntityWrapper<OrderDetl>().eq("order_no", orderNo)
-                        .eq("matnr",orderDetl.getMatnr());
-                if(!Cools.isEmpty(orderDetl.getBatch())){
+                        .eq("matnr", orderDetl.getMatnr());
+                if (!Cools.isEmpty(orderDetl.getBatch())) {
                     wrapper.eq("batch", orderDetl.getBatch());
                 }
 //                if(!orderDetlService.update(orderDetl, wrapper)){
 //                    throw new CoolException("鏇存柊璁㈠崟鏄庣粏澶辫触");
 //                }
-                OrderInAndOutUtil.updateOrderDetl(order.getPakinPakoutStatus$(),order,orderDetl);
+                OrderInAndOutUtil.updateOrderDetl(order.getPakinPakoutStatus$(), order, orderDetl);
 
             }
 
diff --git a/src/main/java/com/zy/asrs/utils/OrderInAndOutUtil.java b/src/main/java/com/zy/asrs/utils/OrderInAndOutUtil.java
index ee768a1..3e6b2d5 100644
--- a/src/main/java/com/zy/asrs/utils/OrderInAndOutUtil.java
+++ b/src/main/java/com/zy/asrs/utils/OrderInAndOutUtil.java
@@ -132,6 +132,8 @@
                     return casual.getDeclaredMethod(OrderMethodVo.INCREASE_QTY_BY_ORDER_NO.getCode(), String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,Double.class);
                 case INCREASE_WORKING_QTY:
                     return casual.getDeclaredMethod(OrderMethodVo.INCREASE_WORKING_QTY.getCode(), Long.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,Double.class);
+                default:
+                    break;
             }
         } catch (Exception e) {
             throw new CoolException(e.getCause().getMessage());
diff --git a/src/main/java/com/zy/common/config/WebConfig.java b/src/main/java/com/zy/common/config/WebConfig.java
index 11bb6b2..91f0c82 100644
--- a/src/main/java/com/zy/common/config/WebConfig.java
+++ b/src/main/java/com/zy/common/config/WebConfig.java
@@ -1,9 +1,23 @@
 package com.zy.common.config;
 
+import com.zy.common.constant.MesConstant;
+import com.zy.common.utils.Http;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+import org.springframework.web.servlet.AsyncHandlerInterceptor;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * Created by vincent on 2019-06-13
@@ -18,7 +32,51 @@
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(adminInterceptor)
                 .addPathPatterns("/**")
-                ;
+        ;
     }
 
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("*") // 浣跨敤 allowedOriginPatterns 鑰屼笉鏄� allowedOrigins
+                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
+                .allowedHeaders("*")
+                .allowCredentials(true)
+                .maxAge(3600);
+    }
+
+    /**
+     * 鏂瑰紡浜岋細浣跨敤 Filter锛堟洿鍏ㄩ潰锛屼紭鍏堢骇鏇撮珮锛�
+     */
+    @Bean
+    public FilterRegistrationBean<CorsFilter> corsFilter() {
+        CorsConfiguration config = new CorsConfiguration();
+
+        // 鍏佽鎵�鏈夊煙鍚�
+        config.addAllowedOrigin("*");
+
+        // 鍏佽浠讳綍澶�
+        config.addAllowedHeader("*");
+
+        // 鍏佽浠讳綍鏂规硶锛圙ET, POST, PUT, DELETE, OPTIONS绛夛級
+        config.addAllowedMethod("*");
+
+        // 鍏佽鍑瘉锛堝鏋滈渶瑕乧ookie绛夊嚟璇侊紝璁剧疆涓簍rue锛屼絾闇�瑕佹寚瀹氬叿浣撳煙鍚嶏級
+        config.setAllowCredentials(false);
+
+        // 棰勬璇锋眰鐨勬湁鏁堟湡锛屽崟浣嶄负绉�
+        config.setMaxAge(3600L);
+
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", config);
+
+        FilterRegistrationBean<CorsFilter> bean = new FilterRegistrationBean<>(new CorsFilter(source));
+
+        // 璁剧疆浼樺厛绾ф渶楂�
+        bean.setOrder(Ordered.HIGHEST_PRECEDENCE);
+
+        return bean;
+    }
+
+
 }
diff --git a/src/main/java/com/zy/common/constant/MesConstant.java b/src/main/java/com/zy/common/constant/MesConstant.java
index eb34e04..0fc2f46 100644
--- a/src/main/java/com/zy/common/constant/MesConstant.java
+++ b/src/main/java/com/zy/common/constant/MesConstant.java
@@ -13,4 +13,15 @@
 
     public static final String PAKOUT_URL = "wmsFinprd/api/zy/v1/packOut/sendList";
 
+
+    /**
+     * token閫氳繃header浼犻�掔殑鍚嶇О
+     */
+    public static final String TOKEN_HEADER_NAME = "Authorization";
+
+    /**
+     * token閫氳繃鍙傛暟浼犻�掔殑鍚嶇О
+     */
+    public static final String TOKEN_PARAM_NAME = "access_token";
+
 }
diff --git a/src/main/java/com/zy/common/utils/Http.java b/src/main/java/com/zy/common/utils/Http.java
index b0f9672..fc8dc1b 100644
--- a/src/main/java/com/zy/common/utils/Http.java
+++ b/src/main/java/com/zy/common/utils/Http.java
@@ -4,6 +4,7 @@
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.core.common.R;
+import com.zy.common.constant.MesConstant;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.PrintWriter;
@@ -28,4 +29,15 @@
             e.printStackTrace();
         }
     }
+
+
+    public static void cors(HttpServletResponse response){
+        // 璺ㄥ煙璁剧疆
+        response.setHeader("Access-Control-Max-Age", "3600");
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setHeader("Access-Control-Allow-Methods", "*");
+        response.setHeader("Access-Control-Allow-Headers", "*");
+        response.setHeader("Access-Control-Expose-Headers", MesConstant.TOKEN_HEADER_NAME);
+    }
+
 }
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index 01906c1..32e4d76 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -50,32 +50,32 @@
     @Autowired
     private LicenseTimer licenseTimer;
 
-    @RequestMapping("/login.action")
+    @PostMapping("/login.action")
     @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍")
-    public R loginAction(String username, String password){
+    public R loginAction(@RequestBody Map<String, String> param) {
         //楠岃瘉璁稿彲璇佹槸鍚︽湁鏁�
-        if (!licenseTimer.getSystemSupport()){
+        if (!licenseTimer.getSystemSupport()) {
             return R.parse(CodeRes.SYSTEM_20001);
         }
         EntityWrapper<User> userWrapper = new EntityWrapper<>();
-        userWrapper.eq("username", username);
+        userWrapper.eq("username", param.get("username"));
         User user = userService.selectOne(userWrapper);
-        if (Cools.isEmpty(user)){
-            if (username.equals("super") && password.equals(Cools.md5(superPwd))) {
+        if (Cools.isEmpty(user)) {
+            if (param.get("username").equals("super") && param.get("password").equals(Cools.md5(superPwd))) {
                 Map<String, Object> res = new HashMap<>();
-                res.put("username", username);
-                res.put("token", Cools.enToken(System.currentTimeMillis() + username, superPwd));
+                res.put("username", param.get("username"));
+                res.put("token", Cools.enToken(System.currentTimeMillis() + param.get("username"), superPwd));
                 return R.ok(res);
             }
             return R.parse(CodeRes.USER_10001);
         }
-        if (user.getStatus()!=1){
+        if (user.getStatus() != 1) {
             return R.parse(CodeRes.USER_10002);
         }
-        if (!user.getPassword().equals(password)){
+        if (!user.getPassword().equals(param.get("password"))) {
             return R.parse(CodeRes.USER_10003);
         }
-        String token = Cools.enToken(System.currentTimeMillis() + username, user.getPassword());
+        String token = Cools.enToken(System.currentTimeMillis() + param.get("username"), user.getPassword());
         userLoginService.delete(new EntityWrapper<UserLogin>().eq("user_id", user.getId()));
         UserLogin userLogin = new UserLogin();
         userLogin.setUserId(user.getId());
@@ -105,7 +105,7 @@
         int time = 0;
         while (time < 3000) {
             code = RandomValidateCodeUtil.code.get(sd);
-            if (!Cools.isEmpty(code)){
+            if (!Cools.isEmpty(code)) {
                 break;
             } else {
                 Thread.sleep(10);
@@ -118,13 +118,13 @@
 
     @RequestMapping("/user/detail/auth")
     @ManagerAuth
-    public R userDetail(){
+    public R userDetail() {
         return R.ok(userService.selectById(getUserId()));
     }
 
     @RequestMapping("/menu/auth")
     @ManagerAuth
-    public R menu(){
+    public R menu() {
         // 鑾峰彇鎵�鏈変竴绾ц彍鍗�
         List<Resource> oneLevel;
         User user = null;
@@ -143,7 +143,7 @@
             List<RoleResource> roleResources = roleResourceService.selectList(new EntityWrapper<RoleResource>().eq("role_id", user.getRoleId()));
             List<Long> resourceIds = new ArrayList<>();
             roleResources.forEach(roleResource -> resourceIds.add(roleResource.getResourceId()));
-            if (resourceIds.isEmpty()){
+            if (resourceIds.isEmpty()) {
                 return R.ok();
             }
             resourceWrapper = new EntityWrapper<Resource>().in("id", resourceIds).eq("level", 2).eq("status", 1).orderBy("sort");
@@ -161,11 +161,11 @@
                     // 鏄惁鎷ユ湁鏌ョ湅鏉冮檺
                     if (getUserId() != 9527) {
                         Resource view = resourceService.selectOne(new EntityWrapper<Resource>().eq("resource_id", resource.getId()).like("code", "#view"));
-                        if (!Cools.isEmpty(view)){
+                        if (!Cools.isEmpty(view)) {
                             RoleResource param = new RoleResource();
                             param.setResourceId(view.getId());
                             param.setRoleId(user.getRoleId());
-                            if (null == roleResourceService.selectOne(new EntityWrapper<>(param))){
+                            if (null == roleResourceService.selectOne(new EntityWrapper<>(param))) {
                                 continue;
                             }
                         }
@@ -190,11 +190,11 @@
 
     @RequestMapping("/power/list/auth")
     @ManagerAuth
-    public R powerList(){
+    public R powerList() {
         List<Resource> oneLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 1).eq("status", 1).orderBy("sort"));
         List<Map> result = new ArrayList<>();
         // 涓�绾�
-        for (Resource oneLevel : oneLevels){
+        for (Resource oneLevel : oneLevels) {
             List<Map> twoLevelsList = new ArrayList<>();
             Map<String, Object> oneLevelMap = new HashMap<>();
             oneLevelMap.put("title", oneLevel.getName());
@@ -203,7 +203,7 @@
             oneLevelMap.put("children", twoLevelsList);
             List<Resource> twoLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("resource_id", oneLevel.getId()).eq("level", 2).eq("status", 1).orderBy("sort"));
             // 浜岀骇
-            for (Resource twoLevel : twoLevels){
+            for (Resource twoLevel : twoLevels) {
                 Map<String, Object> twoLevelMap = new HashMap<>();
                 twoLevelMap.put("title", twoLevel.getName());
                 twoLevelMap.put("id", twoLevel.getId());
@@ -213,7 +213,7 @@
                 twoLevelMap.put("children", threeLevelsList);
                 // 涓夌骇
                 List<Resource> threeLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("resource_id", twoLevel.getId()).eq("level", 3).eq("status", 1).orderBy("sort"));
-                for (Resource threeLevel : threeLevels){
+                for (Resource threeLevel : threeLevels) {
                     Map<String, Object> threeLevelMap = new HashMap<>();
                     threeLevelMap.put("title", threeLevel.getName());
                     threeLevelMap.put("id", threeLevel.getId());
@@ -252,19 +252,19 @@
         List<Object> result = new ArrayList<>();
         // 鑿滃崟
         List<RoleResource> roleResources = roleResourceService.selectList(new EntityWrapper<RoleResource>().eq("role_id", roleId));
-        for (RoleResource roleResource : roleResources){
+        for (RoleResource roleResource : roleResources) {
             Resource resource = resourceService.selectById(roleResource.getResourceId());
-            if (!Cools.isEmpty(resource)){
-                if (resource.getLevel() == 3){
+            if (!Cools.isEmpty(resource)) {
+                if (resource.getLevel() == 3) {
                     result.add(resource.getId());
                 }
             }
         }
         // 鍔熻兘
         List<RolePermission> rolePermissions = rolePermissionService.selectList(new EntityWrapper<RolePermission>().eq("role_id", roleId));
-        for (RolePermission rolePermission : rolePermissions){
+        for (RolePermission rolePermission : rolePermissions) {
             Permission permission = permissionService.selectById(rolePermission.getPermissionId());
-            if (!Cools.isEmpty(permission)){
+            if (!Cools.isEmpty(permission)) {
                 result.add(permission.getAction());
             }
         }
@@ -274,12 +274,12 @@
     @RequestMapping("/power/auth")
     @ManagerAuth(memo = "鎺堟潈")
     @Transactional
-    public R power(Long roleId, String powers){
+    public R power(Long roleId, String powers) {
         Role role = roleService.selectById(roleId);
         Long leaderId = role.getLeader();
         roleResourceService.delete(new EntityWrapper<RoleResource>().eq("role_id", roleId));
         rolePermissionService.delete(new EntityWrapper<RolePermission>().eq("role_id", roleId));
-        if (!Cools.isEmpty(powers)){
+        if (!Cools.isEmpty(powers)) {
             List<PowerDto> dtos = JSON.parseArray(powers, PowerDto.class);
             for (PowerDto dto : dtos) {
                 Resource resource = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", dto.getTwo()).eq("level", 2));
@@ -297,14 +297,14 @@
                     roleResourceService.insert(roleResource);
                 } else {
                     Permission permission = permissionService.selectOne(new EntityWrapper<Permission>().eq("action", dto.getTwo()));
-                    if (!Cools.isEmpty(permission)){
+                    if (!Cools.isEmpty(permission)) {
                         RolePermission rolePermission = new RolePermission();
                         rolePermission.setRoleId(roleId);
                         rolePermission.setPermissionId(permission.getId());
                         rolePermissionService.insert(rolePermission);
                     }
                 }
-                for (String three : dto.getThree()){
+                for (String three : dto.getThree()) {
                     Resource resource1 = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", three).eq("level", 3));
                     if (!Cools.isEmpty(resource1)) {
                         // 鏍￠獙涓婄骇鏉冮檺
@@ -381,7 +381,7 @@
             return R.error("婵�娲诲け璐�");
         }
         SystemProperties.SYSTEM_ACTIVATION = Boolean.TRUE;
-        return R.ok("婵�娲绘垚鍔燂紝鏈夋晥鏈熻嚦"+DateUtils.convert(exprTime));
+        return R.ok("婵�娲绘垚鍔燂紝鏈夋晥鏈熻嚦" + DateUtils.convert(exprTime));
     }
 
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4069581..890bdc6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -43,7 +43,7 @@
   #  global-config:
   #    field-strategy: 0
   configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     map-underscore-to-camel-case: true
     cache-enabled: true
     call-setters-on-nulls: true
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 90a240f..286afbc 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -103,7 +103,6 @@
 // http璇锋眰
 !function (n) {
     "use strict";
-
     var http = {
         toAjax: function (params) {
             $.ajax(params);
diff --git a/src/main/webapp/static/js/waitPakin/waitPakin.js b/src/main/webapp/static/js/waitPakin/waitPakin.js
index 4027f58..93d9ac5 100644
--- a/src/main/webapp/static/js/waitPakin/waitPakin.js
+++ b/src/main/webapp/static/js/waitPakin/waitPakin.js
@@ -1,28 +1,37 @@
 var pageCurr;
+
 function getCol() {
-    var cols = [ {type: 'checkbox'} ];
+    var cols = [{type: 'checkbox'}];
     cols.push.apply(cols, detlCols);
-    cols.push({field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
-        ,{field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){
-                var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='姝ｅ父|閿佸畾'' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
-                if(row.status === 'Y'){html += " checked ";}
+    cols.push({field: 'locNo', align: 'center', title: '搴撲綅鍙�'}
+        , {
+            field: 'status', align: 'center', title: '鏁版嵁鐘舵��', templet: function (row) {
+                var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='姝ｅ父|閿佸畾'' lay-filter='tableCheckbox' disabled='disabled' table-index='" + row.LAY_TABLE_INDEX + "'";
+                if (row.status === 'Y') {
+                    html += " checked ";
+                }
                 html += ">";
                 return html;
-            }, hide: true}
-        ,{field: 'ioStatus', align: 'center',title: '鍏ュ嚭鐘舵��', templet:function(row){
-                var html = "<input value='ioStatus' type='checkbox' lay-skin='switch' lay-text='鍏ュ簱涓瓅寰呭叆搴�' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
-                if(row.ioStatus === 'Y'){html += " checked ";}
+            }, hide: true
+        }
+        , {
+            field: 'ioStatus', align: 'center', title: '鍏ュ嚭鐘舵��', templet: function (row) {
+                var html = "<input value='ioStatus' type='checkbox' lay-skin='switch' lay-text='鍏ュ簱涓瓅寰呭叆搴�' lay-filter='tableCheckbox' disabled='disabled' table-index='" + row.LAY_TABLE_INDEX + "'";
+                if (row.ioStatus === 'Y') {
+                    html += " checked ";
+                }
                 html += ">";
                 return html;
-            }}
-        ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
-        ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
+            }
+        }
+        , {field: 'modiUser$', align: 'center', title: '淇敼浜哄憳', hide: true}
+        , {field: 'modiTime$', align: 'center', title: '淇敼鏃堕棿', hide: true})
     return cols;
 }
 
 layui.config({
     base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'tableMerge'], function(){
+}).use(['table', 'laydate', 'form', 'tableMerge'], function () {
     var table = layui.table;
     var $ = layui.jquery;
     var layer = layui.layer;
@@ -34,7 +43,7 @@
     tableIns = table.render({
         elem: '#waitPakin',
         headers: {token: localStorage.getItem('token')},
-        url: baseUrl+'/waitPakin/list/auth',
+        url: baseUrl + '/waitPakin/list/auth',
         page: true,
         limit: 16,
         limits: [16, 30, 50, 100, 200, 500],
@@ -57,18 +66,18 @@
         response: {
             statusCode: 200
         },
-        done: function(res, curr, count) {
+        done: function (res, curr, count) {
             // tableMerge.render(this);
             if (res.code === 403) {
-                top.location.href = baseUrl+"/";
+                top.location.href = baseUrl + "/";
             }
-            pageCurr=curr;
+            pageCurr = curr;
             limit();
             form.on('checkbox(tableCheckbox)', function (data) {
-                var _index = $(data.elem).attr('table-index')||0;
-                if(data.elem.checked){
+                var _index = $(data.elem).attr('table-index') || 0;
+                if (data.elem.checked) {
                     res.data[_index][data.value] = 'Y';
-                }else{
+                } else {
                     res.data[_index][data.value] = 'N';
                 }
             });
@@ -78,7 +87,7 @@
     // 鐩戝惉鎺掑簭浜嬩欢
     table.on('sort(locMast)', function (obj) {
         var searchData = {};
-        $.each($('#search-box [name]').serializeArray(), function() {
+        $.each($('#search-box [name]').serializeArray(), function () {
             searchData[this.name] = this.value;
         });
         searchData['orderByField'] = obj.field;
@@ -90,9 +99,9 @@
             },
             done: function (res, curr, count) {
                 if (res.code === 403) {
-                    top.location.href = baseUrl+"/";
+                    top.location.href = baseUrl + "/";
                 }
-                pageCurr=curr;
+                pageCurr = curr;
                 limit();
             }
         });
@@ -101,26 +110,26 @@
     // 鐩戝惉澶村伐鍏锋爮浜嬩欢
     table.on('toolbar(waitPakin)', function (obj) {
         var checkStatus = table.checkStatus(obj.config.id);
-        switch(obj.event) {
+        switch (obj.event) {
             case 'addWrk':
-                if (checkStatus.data.length === 0){
+                if (checkStatus.data.length === 0) {
                     layer.msg('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�', {icon: 2});
                 } else {
-                    layer.confirm('纭畾鐢熸垚宸ヤ綔妗ｄ换鍔″悧', function(){
+                    layer.confirm('纭畾鐢熸垚宸ヤ綔妗ｄ换鍔″悧', function () {
                         $.ajax({
-                            url: baseUrl+"/create/waitPain/wrkMast/start",
+                            url: baseUrl + "/create/waitPain/wrkMast/start",
                             headers: {'token': localStorage.getItem('token')},
                             data: JSON.stringify(checkStatus.data),
-                            contentType:'application/json;charset=UTF-8',
+                            contentType: 'application/json;charset=UTF-8',
                             method: 'POST',
-                            traditional:true,
+                            traditional: true,
                             success: function (res) {
-                                if (res.code === 200){
+                                if (res.code === 200) {
                                     layer.closeAll();
                                     tableReload(false);
                                     layer.msg(res.msg, {icon: 1})
-                                } else if (res.code === 403){
-                                    top.location.href = baseUrl+"/";
+                                } else if (res.code === 403) {
+                                    top.location.href = baseUrl + "/";
                                 } else {
                                     layer.msg(res.msg, {icon: 2})
                                 }
@@ -136,31 +145,32 @@
                     maxmin: true,
                     area: [top.detailWidth, top.detailHeight],
                     content: 'waitPakin_detail.html',
-                    success: function(layero, index){
+                    success: function (layero, index) {
                         layer.getChildFrame('#data-detail-submit-edit', index).hide();
-                    	clearFormVal(layer.getChildFrame('#detail', index));
-                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+                        clearFormVal(layer.getChildFrame('#detail', index));
+                        layer.iframeAuto(index);
+                        layer.style(index, {top: (($(window).height() - layer.getChildFrame('#data-detail', index).height()) / 3) + "px"});
                     }
                 });
                 break;
             case 'deleteData':
                 var data = checkStatus.data;
-                if (data.length === 0){
+                if (data.length === 0) {
                     layer.msg('璇烽�夋嫨鏁版嵁');
                 } else {
-                    layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+                    layer.confirm('纭畾鍒犻櫎' + (data.length === 1 ? '姝�' : data.length) + '鏉℃暟鎹悧', function () {
                         $.ajax({
-                            url: baseUrl+"/waitPakin/delete/auth",
+                            url: baseUrl + "/waitPakin/delete/auth",
                             headers: {'token': localStorage.getItem('token')},
                             data: {param: JSON.stringify(data)},
                             method: 'POST',
-                            traditional:true,
+                            traditional: true,
                             success: function (res) {
-                                if (res.code === 200){
+                                if (res.code === 200) {
                                     layer.closeAll();
                                     tableReload(false);
-                                } else if (res.code === 403){
-                                    top.location.href = baseUrl+"/";
+                                } else if (res.code === 403) {
+                                    top.location.href = baseUrl + "/";
                                 } else {
                                     layer.msg(res.msg)
                                 }
@@ -170,9 +180,9 @@
                 }
                 break;
             case 'exportData':
-                layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
-                    var titles=[];
-                    var fields=[];
+                layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function () {
+                    var titles = [];
+                    var fields = [];
                     obj.config.cols[0].map(function (col) {
                         if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
                             titles.push(col.title);
@@ -180,7 +190,7 @@
                         }
                     });
                     var exportData = {};
-                    $.each($('#search-box [name]').serializeArray(), function() {
+                    $.each($('#search-box [name]').serializeArray(), function () {
                         exportData[this.name] = this.value;
                     });
                     var param = {
@@ -188,18 +198,18 @@
                         'fields': fields
                     };
                     $.ajax({
-                        url: baseUrl+"/waitPakin/export/auth",
+                        url: baseUrl + "/waitPakin/export/auth",
                         headers: {'token': localStorage.getItem('token')},
                         data: JSON.stringify(param),
-                        dataType:'json',
-                        contentType:'application/json;charset=UTF-8',
+                        dataType: 'json',
+                        contentType: 'application/json;charset=UTF-8',
                         method: 'POST',
                         success: function (res) {
                             layer.closeAll();
                             if (res.code === 200) {
-                                table.exportFile(titles,res.data,'xls');
+                                table.exportFile(titles, res.data, 'xls');
                             } else if (res.code === 403) {
-                                top.location.href = baseUrl+"/";
+                                top.location.href = baseUrl + "/";
                             } else {
                                 layer.msg(res.msg)
                             }
@@ -211,7 +221,7 @@
     });
 
     // 鐩戝惉琛屽伐鍏蜂簨浠�
-    table.on('tool(waitPakin)', function(obj){
+    table.on('tool(waitPakin)', function (obj) {
         var data = obj.data;
         switch (obj.event) {
             // 璇︽儏
@@ -223,11 +233,12 @@
                     area: [top.detailWidth, top.detailHeight],
                     shadeClose: true,
                     content: 'waitPakin_detail.html',
-                    success: function(layero, index){
+                    success: function (layero, index) {
                         setFormVal(layer.getChildFrame('#detail', index), data, true);
                         top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
                         layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
-                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+                        layer.iframeAuto(index);
+                        layer.style(index, {top: (($(window).height() - layer.getChildFrame('#data-detail', index).height()) / 3) + "px"});
                         layero.find('iframe')[0].contentWindow.layui.form.render('select');
                         layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
                     }
@@ -241,12 +252,13 @@
                     maxmin: true,
                     area: [top.detailWidth, top.detailHeight],
                     content: 'waitPakin_detail.html',
-                    success: function(layero, index){
+                    success: function (layero, index) {
                         layer.getChildFrame('#data-detail-submit-save', index).hide();
                         setFormVal(layer.getChildFrame('#detail', index), data, false);
                         top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
                         top.convertDisabled(layer.getChildFrame('#id', index), true);
-                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+                        layer.iframeAuto(index);
+                        layer.style(index, {top: (($(window).height() - layer.getChildFrame('#data-detail', index).height()) / 3) + "px"});
                         layero.find('iframe')[0].contentWindow.layui.form.render('select');
                         layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
                     }
@@ -257,35 +269,36 @@
                 if (param === undefined) {
                     layer.msg("鏃犳暟鎹�");
                 } else {
-                   layer.open({
-                       type: 2,
-                       title: '淇敼浜哄憳璇︽儏',
-                       maxmin: true,
-                       area: [top.detailWidth, top.detailHeight],
-                       shadeClose: true,
-                       content: '../user/user_detail.html',
-                       success: function(layero, index){
-                           $.ajax({
-                               url: "baseUrl+/user/"+ param +"/auth",
-                               headers: {'token': localStorage.getItem('token')},
-                               method: 'GET',
-                               success: function (res) {
-                                   if (res.code === 200){
-                                       setFormVal(layer.getChildFrame('#detail', index), res.data, true);
-                                       top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
-                                       layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
-                                       layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
-                                       layero.find('iframe')[0].contentWindow.layui.form.render('select');
-                                       layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
-                                   } else if (res.code === 403){
-                                       top.location.href = baseUrl+"/";
-                                   }else {
-                                       layer.msg(res.msg)
-                                   }
-                               }
-                           })
-                       }
-                   });
+                    layer.open({
+                        type: 2,
+                        title: '淇敼浜哄憳璇︽儏',
+                        maxmin: true,
+                        area: [top.detailWidth, top.detailHeight],
+                        shadeClose: true,
+                        content: '../user/user_detail.html',
+                        success: function (layero, index) {
+                            $.ajax({
+                                url: "baseUrl+/user/" + param + "/auth",
+                                headers: {'token': localStorage.getItem('token')},
+                                method: 'GET',
+                                success: function (res) {
+                                    if (res.code === 200) {
+                                        setFormVal(layer.getChildFrame('#detail', index), res.data, true);
+                                        top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+                                        layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+                                        layer.iframeAuto(index);
+                                        layer.style(index, {top: (($(window).height() - layer.getChildFrame('#data-detail', index).height()) / 3) + "px"});
+                                        layero.find('iframe')[0].contentWindow.layui.form.render('select');
+                                        layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+                                    } else if (res.code === 403) {
+                                        top.location.href = baseUrl + "/";
+                                    } else {
+                                        layer.msg(res.msg)
+                                    }
+                                }
+                            })
+                        }
+                    });
                 }
                 break;
             case 'appeUser':
@@ -293,35 +306,36 @@
                 if (param === undefined) {
                     layer.msg("鏃犳暟鎹�");
                 } else {
-                   layer.open({
-                       type: 2,
-                       title: '鍒涘缓鑰呰鎯�',
-                       maxmin: true,
-                       area: [top.detailWidth, top.detailHeight],
-                       shadeClose: true,
-                       content: '../user/user_detail.html',
-                       success: function(layero, index){
-                           $.ajax({
-                               url: "baseUrl+/user/"+ param +"/auth",
-                               headers: {'token': localStorage.getItem('token')},
-                               method: 'GET',
-                               success: function (res) {
-                                   if (res.code === 200){
-                                       setFormVal(layer.getChildFrame('#detail', index), res.data, true);
-                                       top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
-                                       layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
-                                       layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
-                                       layero.find('iframe')[0].contentWindow.layui.form.render('select');
-                                       layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
-                                   } else if (res.code === 403){
-                                       top.location.href = baseUrl+"/";
-                                   }else {
-                                       layer.msg(res.msg)
-                                   }
-                               }
-                           })
-                       }
-                   });
+                    layer.open({
+                        type: 2,
+                        title: '鍒涘缓鑰呰鎯�',
+                        maxmin: true,
+                        area: [top.detailWidth, top.detailHeight],
+                        shadeClose: true,
+                        content: '../user/user_detail.html',
+                        success: function (layero, index) {
+                            $.ajax({
+                                url: "baseUrl+/user/" + param + "/auth",
+                                headers: {'token': localStorage.getItem('token')},
+                                method: 'GET',
+                                success: function (res) {
+                                    if (res.code === 200) {
+                                        setFormVal(layer.getChildFrame('#detail', index), res.data, true);
+                                        top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+                                        layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+                                        layer.iframeAuto(index);
+                                        layer.style(index, {top: (($(window).height() - layer.getChildFrame('#data-detail', index).height()) / 3) + "px"});
+                                        layero.find('iframe')[0].contentWindow.layui.form.render('select');
+                                        layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+                                    } else if (res.code === 403) {
+                                        top.location.href = baseUrl + "/";
+                                    } else {
+                                        layer.msg(res.msg)
+                                    }
+                                }
+                            })
+                        }
+                    });
                 }
                 break;
 
@@ -330,7 +344,7 @@
 
     // 鏁版嵁淇濆瓨鍔ㄤ綔
     form.on('submit(save)', function () {
-        if (banMsg != null){
+        if (banMsg != null) {
             layer.msg(banMsg);
             return;
         }
@@ -342,9 +356,9 @@
         method("update")
     });
 
-    function method(name){
+    function method(name) {
         var index = layer.load(1, {
-            shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
+            shade: [0.5, '#000'] //0.1閫忔槑搴︾殑鑳屾櫙
         });
         var data = {
 //            id: $('#id').val(),
@@ -363,20 +377,20 @@
 
         };
         $.ajax({
-            url: baseUrl+"/waitPakin/"+name+"/auth",
+            url: baseUrl + "/waitPakin/" + name + "/auth",
             headers: {'token': localStorage.getItem('token')},
             data: top.reObject(data),
             method: 'POST',
             success: function (res) {
-                if (res.code === 200){
+                if (res.code === 200) {
                     parent.layer.closeAll();
                     parent.$(".layui-laypage-btn")[0].click();
                     $("#data-detail :input").each(function () {
                         $(this).val("");
                     });
-                } else if (res.code === 403){
-                    top.location.href = baseUrl+"/";
-                }else {
+                } else if (res.code === 403) {
+                    top.location.href = baseUrl + "/";
+                } else {
                     layer.msg(res.msg)
                 }
                 layer.close(index);
@@ -418,20 +432,20 @@
     });
     layDate.render({
         elem: '.layui-laydate-range'
-        ,type: 'datetime'
-        ,range: true
+        , type: 'datetime'
+        , range: true
     });
 
 });
 
 // 鍏抽棴鍔ㄤ綔
-$(document).on('click','#data-detail-close', function () {
+$(document).on('click', '#data-detail-close', function () {
     parent.layer.closeAll();
 });
 
 function tableReload(child) {
     var searchData = {};
-    $.each($('#search-box [name]').serializeArray(), function() {
+    $.each($('#search-box [name]').serializeArray(), function () {
         searchData[this.name] = this.value;
     });
     (child ? parent.tableIns : tableIns).reload({
@@ -441,14 +455,14 @@
         },
         done: function (res, curr, count) {
             if (res.code === 403) {
-                top.location.href = baseUrl+"/";
+                top.location.href = baseUrl + "/";
             }
-            pageCurr=curr;
+            pageCurr = curr;
             if (res.data.length === 0 && count !== 0) {
                 tableIns.reload({
                     where: searchData,
                     page: {
-                        curr: pageCurr-1
+                        curr: pageCurr - 1
                     }
                 });
                 pageCurr -= 1;
@@ -461,10 +475,10 @@
 function setFormVal(el, data, showImg) {
     for (var val in data) {
         var find = el.find(":input[id='" + val + "']");
-        if (find[0]!=null){
-            if (find[0].type === 'checkbox'){
-                if (data[val]==='Y'){
-                    find.attr("checked","checked");
+        if (find[0] != null) {
+            if (find[0].type === 'checkbox') {
+                if (data[val] === 'Y') {
+                    find.attr("checked", "checked");
                     find.val('Y');
                 } else {
                     find.remove("checked");
@@ -474,9 +488,9 @@
             }
         }
         find.val(data[val]);
-        if (showImg){
+        if (showImg) {
             var next = find.next();
-            if (next.get(0)){
+            if (next.get(0)) {
                 if (next.get(0).localName === "img") {
                     find.hide();
                     next.attr("src", data[val]);
@@ -496,13 +510,13 @@
 
 function detailScreen(index) {
     var detail = layer.getChildFrame('#data-detail', index);
-    var height = detail.height()+60;
-    if (height > ($(window).height()*0.9)) {
-        height = ($(window).height()*0.8);
+    var height = detail.height() + 60;
+    if (height > ($(window).height() * 0.9)) {
+        height = ($(window).height() * 0.8);
     }
     layer.style(index, {
 //        top: (($(window).height()-height)/3)+"px",
-        height: height+'px'
+        height: height + 'px'
     });
 }
 
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index b761198..23f1ef0 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
+<head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>涓壃 鈹� login of zoneyung wms</title>
@@ -10,190 +10,193 @@
     <meta name="theme-color" content="#111111">
     <meta name="msapplication-TileImage" content="/sketch-threejs/img/common/ms_tileimage.png">
     <meta name="msapplication-TileColor" content="#111111">
-    <link rel="icon" type="image/x-icon" href="../static/image/favicon.ico" />
+    <link rel="icon" type="image/x-icon" href="../static/image/favicon.ico"/>
     <link rel="stylesheet" href="../static/css/font/font-awesome-4.7.0/css/font-awesome.css">
     <link rel="stylesheet" href="../static/css/main.min.css">
     <link rel="stylesheet" href="../static/css/login.css">
     <style>
-      #sidebar{
-        /*瀹氫綅*/
-        position: absolute;
-        top: 50%;
-        right: 1%;
-        transform: translateY(-50%);
-        width: 20%;
-        height: 95%;
-        /*鐗规晥*/
-        background: rgba(255,255,255,0.6);
-        border-radius: 5px;
-        color: #ffffff;
-        z-index: 99;
-        box-shadow: 3px 3px 6px 3px rgba(0, 0, 0, .3);
-      }
+        #sidebar {
+            /*瀹氫綅*/
+            position: absolute;
+            top: 50%;
+            right: 1%;
+            transform: translateY(-50%);
+            width: 20%;
+            height: 95%;
+            /*鐗规晥*/
+            background: rgba(255, 255, 255, 0.6);
+            border-radius: 5px;
+            color: #ffffff;
+            z-index: 99;
+            box-shadow: 3px 3px 6px 3px rgba(0, 0, 0, .3);
+        }
 
-      .login-contain {
-        position: relative;
-        width: 100%;
-        height: 100%;
-      }
-      .login-box {
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-        width: 100%;
-        text-align: center;
-      }
+        .login-contain {
+            position: relative;
+            width: 100%;
+            height: 100%;
+        }
+
+        .login-box {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+            width: 100%;
+            text-align: center;
+        }
 
     </style>
-  </head>
-  <body>
-    <div class="l-page l-page--white" data-id="instancing">
-      <div style="position: fixed;
+</head>
+<body>
+<div class="l-page l-page--white" data-id="instancing">
+    <div style="position: fixed;
                     z-index: 100;
                     top: 22px;
                     left: 20px;">
         <img src="../static/image/logo_light_colour.png" alt="" style="width: 20%">
-      </div>
-      <div class="p-sketch-outline">
+    </div>
+    <div class="p-sketch-outline">
         <h2 class="p-sketch-outline__title">Automatic Storage and Retrieval System</h2>
         <p class="p-sketch-outline__date">posted: 2018.01.01 / update: 2022.09.21
         </p>
         <p class="p-sketch-outline__description">wms made with various simple objects.</p>
-      </div>
-      <canvas class="p-canvas-webgl" id="canvas-webgl"></canvas>
     </div>
-    <!-- 渚ц竟鏍� -->
-    <div id="sidebar">
-      <div class="login-contain">
+    <canvas class="p-canvas-webgl" id="canvas-webgl"></canvas>
+</div>
+<!-- 渚ц竟鏍� -->
+<div id="sidebar">
+    <div class="login-contain">
         <div class="login-box">
-          <img src="../static/image/zy_logo_dark_color.png" alt="" style="width: 80%">
-<!--          <span class="login100-form-title p-t-20 p-b-45">涓壃绔嬪簱</span>-->
-<!--          <span class="login100-form-title p-t-20 p-b-45" style="margin: 15px 0;color: #868686;font-size: 24px">WMS</span>-->
-          <div class="wrap-input100 validate-input m-b-10" data-validate="璇疯緭鍏ョ敤鎴峰悕">
-            <input id="username" class="input100" type="text" name="username" placeholder="username" autocomplete="off">
-            <span class="focus-input100"></span>
-            <span class="symbol-input100">
+            <img src="../static/image/zy_logo_dark_color.png" alt="" style="width: 80%">
+            <!--          <span class="login100-form-title p-t-20 p-b-45">涓壃绔嬪簱</span>-->
+            <!--          <span class="login100-form-title p-t-20 p-b-45" style="margin: 15px 0;color: #868686;font-size: 24px">WMS</span>-->
+            <div class="wrap-input100 validate-input m-b-10" data-validate="璇疯緭鍏ョ敤鎴峰悕">
+                <input id="username" class="input100" type="text" name="username" placeholder="username"
+                       autocomplete="off">
+                <span class="focus-input100"></span>
+                <span class="symbol-input100">
               <i class="fa fa-user"></i>
             </span>
-          </div>
-          <div class="wrap-input100 validate-input m-b-10" data-validate="璇疯緭鍏ュ瘑鐮�">
-            <input id="password" class="input100" type="password" name="pass" placeholder="password">
-            <span class="focus-input100"></span>
-            <span class="symbol-input100">
+            </div>
+            <div class="wrap-input100 validate-input m-b-10" data-validate="璇疯緭鍏ュ瘑鐮�">
+                <input id="password" class="input100" type="password" name="pass" placeholder="password">
+                <span class="focus-input100"></span>
+                <span class="symbol-input100">
               <i class="fa fa-lock"></i>
             </span>
-          </div>
-          <div class="container-login100-form-btn p-t-10">
-            <button class="login100-form-btn login-btn">Login</button>
-          </div>
-          <div class="container-login100-form-btn p-t-10" style="display: none;margin-top: 50px;" id="updateLicense">
-            <form enctype="multipart/form-data" style="display: none;">
-              <input id="license" type="file" name="file" >
-            </form>
-            <button class="login100-form-btn" id="submitLicense">鏇存柊璁稿彲璇�</button>
-          </div>
+            </div>
+            <div class="container-login100-form-btn p-t-10">
+                <button class="login100-form-btn login-btn">Login</button>
+            </div>
+            <div class="container-login100-form-btn p-t-10" style="display: none;margin-top: 50px;" id="updateLicense">
+                <form enctype="multipart/form-data" style="display: none;">
+                    <input id="license" type="file" name="file">
+                </form>
+                <button class="login100-form-btn" id="submitLicense">鏇存柊璁稿彲璇�</button>
+            </div>
         </div>
-      </div>
     </div>
+</div>
 
-    <script type="text/javascript" src="../static/js/tools/main.min.js"></script>
-    <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
-    <script type="text/javascript" src="../static/js/tools/md5.js"></script>
-    <script type="text/javascript" src="../static/layer/layer.js"></script>
-    <script type="text/javascript" src="../static/js/common.js"></script>
-    <script>
-      // remember pwd
-      $(function () {
+<script type="text/javascript" src="../static/js/tools/main.min.js"></script>
+<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../static/js/tools/md5.js"></script>
+<script type="text/javascript" src="../static/layer/layer.js"></script>
+<script type="text/javascript" src="../static/js/common.js"></script>
+<script>
+    // remember pwd
+    $(function () {
         var oldUserName = localStorage.getItem('oldUserName');
         var oldPass = localStorage.getItem('oldPass');
-        if(oldUserName){
-          $('#username').val(oldUserName);
+        if (oldUserName) {
+            $('#username').val(oldUserName);
         }
-        if(oldPass){
-          $('#password').val(oldPass);
+        if (oldPass) {
+            $('#password').val(oldPass);
         }
-      })
+    })
 
-      window.onload = function(){document.getElementById("username").focus();}
+    window.onload = function () {
+        document.getElementById("username").focus();
+    }
 
-      $(document).on('click','.login-btn', function () {
+    $(document).on('click', '.login-btn', function () {
         let username = $("#username").val();
         if (username === "") {
-          layer.tips('璇疯緭鍏ョ櫥褰曡处鍙�', '#username', {tips: [4, '#ff0000']});
-          return;
+            layer.tips('璇疯緭鍏ョ櫥褰曡处鍙�', '#username', {tips: [4, '#ff0000']});
+            return;
         }
         let password = $("#password").val();
         if (password === "") {
-          layer.tips('璇疯緭鍏ュ瘑鐮�', '#password', {tips: [4, '#ff0000']});
-          return;
+            layer.tips('璇疯緭鍏ュ瘑鐮�', '#password', {tips: [4, '#ff0000']});
+            return;
         }
+        let params = {username: username, password: hex_md5(password)}
         $.ajax({
-          url: baseUrl+"/login.action",
-          data: {
-            username: username,
-            password: hex_md5(password)
-          },
-          method: 'POST',
-          success: function (res) {
-            if (res.code === 200){
-              localStorage.setItem("token", res.data.token);
-              localStorage.setItem("username", res.data.username);
-              window.location.href = "index.html";
-            } else if (res.code === 10001) {
-              layer.tips(res.msg, '#username', {tips: [4, '#ff0000']});
-            } else if (res.code === 10002) {
-              layer.tips(res.msg, '#username', {tips: [4, '#ff0000']});
-            } else if (res.code === 10003) {
-              layer.tips(res.msg, '#password', {tips: [4, '#ff0000']});
-            } else if (res.code == 20001) {
-              layer.tips(res.msg, '.login-btn', {tips: [3, '#ff0000']});
-              $("#updateLicense").show()
-            } else {
-              layer.tips(res.msg, '.login-btn', {tips: [3, '#ff0000']});
+            url: baseUrl + "/login.action",
+            headers: {'Content-Type': 'application/json'},
+            data: JSON.stringify(params),
+            method: 'POST',
+            success: function (res) {
+                if (res.code === 200) {
+                    localStorage.setItem("token", res.data.token);
+                    localStorage.setItem("username", res.data.username);
+                    window.location.href = "index.html";
+                } else if (res.code === 10001) {
+                    layer.tips(res.msg, '#username', {tips: [4, '#ff0000']});
+                } else if (res.code === 10002) {
+                    layer.tips(res.msg, '#username', {tips: [4, '#ff0000']});
+                } else if (res.code === 10003) {
+                    layer.tips(res.msg, '#password', {tips: [4, '#ff0000']});
+                } else if (res.code == 20001) {
+                    layer.tips(res.msg, '.login-btn', {tips: [3, '#ff0000']});
+                    $("#updateLicense").show()
+                } else {
+                    layer.tips(res.msg, '.login-btn', {tips: [3, '#ff0000']});
+                }
             }
-          }
         });
-      });
+    });
 
-      $('body').keydown(function () {
+    $('body').keydown(function () {
         if (event.keyCode === 13) {
-          $(".login-btn").click();
+            $(".login-btn").click();
         }
-      });
+    });
 
 
-      //鏇存柊璁稿彲璇�
-      $("#submitLicense").on("click",() => {
+    //鏇存柊璁稿彲璇�
+    $("#submitLicense").on("click", () => {
         $("#license").click()
-      })
+    })
 
-      //涓婁紶骞舵洿鏂拌鍙瘉
-      $("#license").on("change",(evt) => {
+    //涓婁紶骞舵洿鏂拌鍙瘉
+    $("#license").on("change", (evt) => {
         var files = evt.target.files;
         let formData = new FormData();
         formData.append("file", files[0])
         $.ajax({
-          url: baseUrl+"/license/updateLicense",
-          headers: {'token': localStorage.getItem('token')},
-          data: formData,
-          method: 'POST',
-          cache: false,
-          processData: false,
-          contentType: false,
-          success: function (res) {
-            if (res.code == 200) {
-              layer.msg('鏇存柊鎴愬姛', {time: 1000}, () => {
-                parent.location.reload()
-              });
-            }else{
-              layer.msg(res.msg,{time:2000},() => {
-                parent.location.reload()
-              })
+            url: baseUrl + "/license/updateLicense",
+            headers: {'token': localStorage.getItem('token')},
+            data: formData,
+            method: 'POST',
+            cache: false,
+            processData: false,
+            contentType: false,
+            success: function (res) {
+                if (res.code == 200) {
+                    layer.msg('鏇存柊鎴愬姛', {time: 1000}, () => {
+                        parent.location.reload()
+                    });
+                } else {
+                    layer.msg(res.msg, {time: 2000}, () => {
+                        parent.location.reload()
+                    })
+                }
             }
-          }
         })
-      })
-    </script>
-  </body>
+    })
+</script>
+</body>
 </html>

--
Gitblit v1.9.1