From 231e55d38511146988fac0d1b09432d8742d5656 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 05 十二月 2024 10:04:26 +0800
Subject: [PATCH] 初始化程序

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |  235 ++++++------
 src/main/webapp/views/console.html                          |  266 +++++++-------
 src/main/webapp/static/js/console.map.js                    |  183 ---------
 pom.xml                                                     |    2 
 src/main/java/com/zy/core/model/command/LedCommand.java     |    3 
 src/main/java/com/zy/common/model/MatDto.java               |   39 ++
 src/main/java/com/zy/core/model/protocol/StaProtocol.java   |   26 +
 src/main/java/com/zy/core/model/DevpSlave.java              |    4 
 src/main/webapp/views/crn.html                              |    7 
 src/main/java/com/zy/core/MainProcess.java                  |   10 
 src/main/webapp/static/js/common.js                         |    2 
 src/main/java/com/zy/core/thread/SiemensDevpThread.java     |  189 +++++----
 src/main/resources/application.yml                          |   67 +--
 13 files changed, 468 insertions(+), 565 deletions(-)

diff --git a/pom.xml b/pom.xml
index 24bb10b..6ed55df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
     </dependencies>
 
     <build>
-        <finalName>fnwcs</finalName>
+        <finalName>tlfwcs</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 2a98c96..3e19bc8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -25,6 +25,7 @@
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.SlaveConnection;
 import com.zy.core.enums.*;
+import com.zy.core.enums.DevpType.DevpWorkType;
 import com.zy.core.model.CrnSlave;
 import com.zy.core.model.DevpSlave;
 import com.zy.core.model.LedSlave;
@@ -112,35 +113,74 @@
             for (DevpSlave.Sta inSta : devp.getInSta()) {
                 // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
                 BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
-                if (barcodeThread == null) {
-                    continue;
-                }
-                String barcode = barcodeThread.getBarcode();
-//                barcode="ILY0127 0001";
-                if(!Cools.isEmpty(barcode)) {
-                    log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
-                    if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
-                        continue;
-                    }
-                } else {
-                    continue;
-                }
-
                 // 鑾峰彇鍏ュ簱绔欎俊鎭�
-                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+                DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                 StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
                 if (staProtocol == null) {
                     continue;
                 } else {
                     staProtocol = staProtocol.clone();
                 }
-                //staProtocol.setPakMk(true);
-//                // 鍏ュ嚭搴撴ā寮忓垽鏂�
-//                if ( inSta.getStaNo()==180 && devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }
-                // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
+                Short workNo = staProtocol.getWorkNo();
+                // 灏哄妫�娴嬪紓甯�
+                boolean back = false;
+                String errMsg = "寮傚父锛�";
+                if (staProtocol.isFrontErr()) {
+                    errMsg = errMsg+"鍓嶈秴闄愶紱";
+                    back = true;
+                }
+                if (staProtocol.isBackErr()) {
+                    errMsg = errMsg+"鍚庤秴闄�";
+                    back = true;
+                }
+                if (staProtocol.isHighErr()) {
+                    errMsg = errMsg+"楂樿秴闄�";
+                    back = true;
+                }
+                if (staProtocol.isLeftErr()) {
+                    errMsg = errMsg+"宸﹁秴闄�";
+                    back = true;
+                }
+                if (staProtocol.isRightErr()) {
+                    errMsg = errMsg+"鍙宠秴闄�";
+                    back = true;
+                }
+                if (staProtocol.isWeightErr()) {
+                    errMsg = errMsg+"瓒呴噸";
+                    back = true;
+                }
+                if (staProtocol.isBarcodeErr()) {
+                    errMsg = errMsg+"鎵爜澶辫触";
+                    back = true;
+                }
+                // 閫�鍥�
+                if (back) {
+                    // led 寮傚父鏄剧ず
+                    LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
+                    if (ledThread != null) {
+                        MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
+                    }
+                    continue;
+                }
+                String barcode = barcodeThread.getBarcode();
+                if (!Cools.isEmpty(barcode)&&!barcode.equals("00000000")) {
+                    log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
+                    if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
+                        continue;
+                    }
+                } else {
+                    // led 寮傚父鏄剧ず
+//                    LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
+//                    if (ledThread != null) {
+//                        String errorMsg = "鎵爜澶辫触锛岃閲嶈瘯";
+//                        MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
+//                    }
+                    continue;
+                }
+
                 if (staProtocol.isAutoing() && staProtocol.isLoading()
                         && staProtocol.isInEnable()
-                        && !staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() == 9999)
+                        && !staProtocol.isEmptyMk() && (staProtocol.getWorkNo() >= 9992 && staProtocol.getWorkNo() <= 9999)
                         && staProtocol.isPakMk()){// && !Cools.isEmpty(barcode)) {
 
 //                    if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode)) {
@@ -157,33 +197,19 @@
 //                    }
 
                     // 鍒ゆ柇閲嶅宸ヤ綔妗�
-                    WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode.substring(0,6));
+                    WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
                     if (wrkMast != null) {
                         News.error("宸ヤ綔妗ｄ腑宸插瓨鍦ㄨ绔欑姸鎬佷负锛� 2.璁惧涓婅蛋 锛夌殑鏁版嵁,宸ヤ綔鍙�={}", wrkMast.getWrkNo());
                         continue;
                     }
-//                    // 鑾峰彇鍏ュ簱閫氱煡妗�
-//                    List<WaitPakin> waitPakins = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
-//                    if (waitPakins.isEmpty()) {
-//                        log.error("鏃犳鍏ュ簱鏉＄爜鏁版嵁銆傛潯鐮佸彿={}", barcode);
-//                        continue;
-//                    }
+                    // 鑾峰彇鍏ュ簱閫氱煡妗�
+                    List<WaitPakin> waitPakins = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
+                    if (waitPakins.isEmpty()) {
+                        log.error("鏃犳鍏ュ簱鏉＄爜鏁版嵁銆傛潯鐮佸彿={}", barcode);
+                        continue;
+                    }
 
                     try {
-                        String pack =null;//pack鐮�
-                        if(barcode.length()>6){
-                            pack=barcode.substring(6);
-                            if(pack.equals("00000000000000000000")){
-                                News.error("娌℃湁鑾峰緱Pack鐮�",pack);
-                                continue;
-                            }
-                        }
-                        //String pack="MJY0136 0400";
-                        barcode=barcode.substring(0,6);//鎵樼洏鐮�
-                        if(barcode.equals("000000")){
-                            News.error("娌℃湁鑾峰緱鏉＄爜",barcode);
-                            continue;
-                        }
                         LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
                         locTypeDto.setLocType1((short)1);
                         SearchLocParam param = new SearchLocParam();
@@ -191,7 +217,7 @@
                         param.setIoType(1);
                         param.setSourceStaNo(inSta.getStaNo());
                         param.setLocType1(locTypeDto.getLocType1());
-                        param.setPackNo(pack);
+//                        param.setPackNo(pack);
                         String response = new HttpHandler.Builder()
                                 .setUri(wmsUrl)
                                 .setPath("/rpc/pakin/loc/v1")
@@ -213,79 +239,20 @@
                         } else if (jsonObject.getInteger("code").equals(700) && (!barcodeThread.getBarcode().equals("NG"))){
                             StartupDto dto = jsonObject.getObject("data", StartupDto.class);
                             barcodeThread.setBarcode("");
-                            staProtocol.setWorkNo((short)9999);
-                            staProtocol.setStaNo((short)201);
+                            staProtocol.setWorkNo((short)9991);
+                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
                             devpThread.setPakMk(staProtocol.getSiteId(), true);
                             boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                             News.error("url锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
                         }else {
                             StartupDto dto = jsonObject.getObject("data", StartupDto.class);
                             barcodeThread.setBarcode("");
-                            staProtocol.setWorkNo((short)9999);
-                            staProtocol.setStaNo((short)201);
+                            staProtocol.setWorkNo((short)9991);
+                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
                             devpThread.setPakMk(staProtocol.getSiteId(), true);
                             boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                             News.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
                         }
-
-
-//                        // 妫�绱㈠簱浣�
-//                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
-//                        List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
-//                        StartupDto startupDto = commonService.getLocNo(1, 1, inSta.getStaNo(), matNos, locTypeDto, 0);
-//                        // 宸ヤ綔鍙�
-//                        int workNo = startupDto.getWorkNo();
-//                        // 鎻掑叆宸ヤ綔鏄庣粏妗�
-//                        wrkDetlService.createWorkDetail(workNo, waitPakins, barcode);
-//
-//                        // 鎻掑叆宸ヤ綔涓绘。
-//                        wrkMast = new WrkMast();
-//                        wrkMast.setWrkNo(workNo);
-//                        wrkMast.setIoTime(new Date());
-//                        wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細2.璁惧涓婅蛋
-//                        wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
-//                        wrkMast.setIoPri(10D); // 浼樺厛绾э細10
-//                        wrkMast.setCrnNo(startupDto.getCrnNo());
-//                        wrkMast.setSourceStaNo(startupDto.getSourceStaNo());
-//                        wrkMast.setStaNo(startupDto.getStaNo());
-//                        wrkMast.setLocNo(startupDto.getLocNo());
-//                        wrkMast.setBarcode(barcode); // 鎵樼洏鐮�
-//                        wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
-//                        wrkMast.setPicking("N"); // 鎷ｆ枡
-//                        wrkMast.setExitMk("N"); // 閫�鍑�
-//                        wrkMast.setEmptyMk("N"); // 绌烘澘
-//                        wrkMast.setLinkMis("N");
-//                        // 鎿嶄綔浜哄憳鏁版嵁
-//                        wrkMast.setAppeTime(new Date());
-//                        wrkMast.setModiTime(new Date());
-//                        Integer insert = wrkMastMapper.insert(wrkMast);
-//                        if (insert == 0) {
-//                            throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
-//                        }
-//                        // 鏇存柊鐩爣搴撲綅鐘舵��
-//                        LocMast locMast = locMastService.selectById(startupDto.getLocNo());
-//                        locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
-//                        locMast.setModiTime(new Date());
-//                        if (!locMastService.updateById(locMast)){
-//                            throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
-//                        }
-//                        // 灏嗗叆搴撻�氱煡妗ｄ慨鏀逛负宸插惎鍔�
-//                        if (wrkMastMapper.updateWaitPakInStep1(barcode) == 0) {
-//                            throw new CoolException("淇敼鍏ュ簱閫氱煡妗ｇ姸鎬佷负宸插惎鍔ㄥけ璐�");
-//                        }
-//
-//                        // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
-//
-//                        // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
-//                        barcodeThread.setBarcode("");
-//                        staProtocol.setWorkNo((short) workNo);
-//                        staProtocol.setStaNo(startupDto.getStaNo().shortValue());
-//                        devpThread.setPakMk(staProtocol.getSiteId(), false);
-//                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-//                        if (!result) {
-//                            throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
-//                        }
-
                     } catch (Exception e) {
                         News.error("鎵爜鍏ュ簱鎶ラ敊锛岄敊璇俊鎭�",e);
                         e.printStackTrace();
@@ -1116,7 +1083,7 @@
      * 搴撲綅绉昏浆
      */
     public void locToLoc(CrnSlave slave, CrnProtocol crnProtocol){
-        log.info("寮�濮嬬Щ搴撲换鍔＄▼搴�");
+//        log.info("寮�濮嬬Щ搴撲换鍔＄▼搴�");
         //鑾峰彇鎵�鏈夌Щ搴撲换鍔�
         List<WrkMast> wrkMasts=wrkMastMapper.selectLocMoves(slave.getId());
         // 鑾峰彇宸ヤ綔妗ｄ俊鎭�
@@ -1507,7 +1474,7 @@
      * 鍑哄簱  ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
      */
     @Async
-    public void ledExecute() {
+    public synchronized void ledExecute() {
         for (LedSlave led : slaveProperties.getLed()) {
             // 鑾峰彇杈撻�佺嚎plc绾跨▼
             DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, led.getDevpPlcId());
@@ -1518,20 +1485,27 @@
             for (Integer staNo : led.getStaArr()) {
                 // 鑾峰彇鍙夎溅绔欑偣
                 StaProtocol staProtocol = devpThread.getStation().get(staNo);
-                if (null == staProtocol || null == staProtocol.getWorkNo() || 0 == staProtocol.getWorkNo() || !staProtocol.isLoading()) {
+                if (null == staProtocol || null == staProtocol.getWorkNo() || 0 == staProtocol.getWorkNo()) {
                     continue;
                 } else {
                     staProtocol = staProtocol.clone();
                 }
                 // 鑾峰彇宸ヤ綔妗ｆ暟鎹�
                 WrkMast wrkMast = wrkMastMapper.selectById(staProtocol.getWorkNo());
-                if (null == wrkMast || wrkMast.getWrkSts() < 14 || wrkMast.getIoType() < 100) { continue; }
+                if (null == wrkMast) { continue; }
                 wrkMasts.add(wrkMast);
                 // 缁勮鍛戒护
                 LedCommand ledCommand = new LedCommand();
                 ledCommand.setWorkNo(wrkMast.getWrkNo());
+                ledCommand.setIoType(wrkMast.getIoType());
                 // 鍑哄簱妯″紡
                 switch (wrkMast.getIoType()) {
+                    case 1:
+                        ledCommand.setTitle("鍏ㄦ澘鍏ュ簱");
+                        break;
+                    case 10:
+                        ledCommand.setTitle("绌烘澘鍏ュ簱");
+                        break;
                     case 101:
                         ledCommand.setTitle("鍏ㄦ澘鍑哄簱");
                         break;
@@ -1549,16 +1523,39 @@
                         ledCommand.setEmptyMk(true);
                         break;
                     default:
-                        log.error("浠诲姟鍏ュ嚭搴撶被鍨嬮敊璇紒锛侊紒[宸ヤ綔鍙凤細{}] [鍏ュ嚭搴撶被鍨嬶細{}]", wrkMast.getWrkNo(), wrkMast.getIoType());
+                        News.error("浠诲姟鍏ュ嚭搴撶被鍨嬮敊璇紒锛侊紒[宸ヤ綔鍙凤細{}] [鍏ュ嚭搴撶被鍨嬶細{}]", wrkMast.getWrkNo(), wrkMast.getIoType());
                         break;
                 }
                 ledCommand.setSourceLocNo(wrkMast.getSourceLocNo());
                 ledCommand.setStaNo(wrkMast.getStaNo());
-                if (wrkMast.getIoType() != 110) {
+                ledCommand.setBarcode(wrkMast.getBarcode());
+                if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
                     List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
-                    wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme())));
+
+                    wrkDetls.forEach(wrkDetl -> {
+                        Double total = 0.0;
+                        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+                        LocDetl locDetl = locDetlService.selectOne(wrapper.eq("zpallet", wrkDetl.getZpallet()).eq("matnr", wrkDetl.getMatnr()));
+                        if (Cools.isEmpty(locDetl)) {
+                            total = wrkDetl.getAnfme();
+                        } else {
+                            total = locDetl.getAnfme();
+                        }
+                        if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
+                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
+                        }
+                        if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
+                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
+                        }
+                        if (wrkMast.getIoType() == 107 || wrkMast.getIoType() == 104) {
+                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
+                        }
+                    });
                 }
                 commands.add(ledCommand);
+            }
+            if(Cools.isEmpty(wrkMasts)){
+                continue;
             }
             Set<Integer> workNos = wrkMasts.stream().map(WrkMast::getWrkNo).collect(Collectors.toSet());
             // 鑾峰彇LED绾跨▼
@@ -1570,10 +1567,8 @@
             // 鍛戒护涓嬪彂 -------------------------------------------------------------------------------
             if (!commands.isEmpty()) {
                 if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(1, commands))) {
-                    log.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
+                    News.error("{}鍙稬ED鏄剧ず鍐呭鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
                     continue;
-                } else {
-                    ledThread.setLedMk(false);
                 }
             }
 
@@ -1649,12 +1644,12 @@
             // 鑾峰彇led绾跨▼
             LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
             // led鏄剧ず榛樿鍐呭
-            if (reset && !ledThread.isLedMk()) {
-                ledThread.setLedMk(true);
+            if (reset) {
+                if (ledThread == null) {
+                    continue;
+                }
                 if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(2, new ArrayList<>()))) {
-                    log.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
-                } else {
-
+                    News.error("{}鍙稬ED鏄剧ず榛樿鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
                 }
             }
         }
diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index e5b625b..99a2f28 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -9,20 +9,55 @@
 public class MatDto {
 
     // 鐗╂枡缂栧彿
-    private String matNo;
+    private String matnr;
 
     // 鐗╂枡鍚嶇О
     private String maknx;
 
+    private String batch;
+
+    private String specs;
+
+    // 瀹㈡埛淇℃伅
+    private String manu;
+
+    // 澶囨敞
+    private String memo;
+
     // 鐗╂枡鏁伴噺
     private Double count;
 
+    private Double total;
+
     public MatDto() {
+    }
+    public MatDto(String matnr, String maknx, String batch, String specs, String manu, String memo, Double count, Double total) {
+        this.matnr = matnr;
+        this.maknx = maknx;
+        this.batch = batch;
+        this.specs = specs;
+        this.manu = manu;
+        this.memo = memo;
+        this.count = count;
+        this.total = total;
     }
 
     public MatDto(String matNo, String maknx, Double count) {
-        this.matNo = matNo;
+        this.matnr = matNo;
         this.maknx = maknx;
         this.count = count;
     }
+    public MatDto(String matNo, String maknx, Double count,String specs) {
+        this.specs = specs;
+        this.matnr = matNo;
+        this.maknx = maknx;
+        this.count = count;
+    }
+    public MatDto(String matNo, String maknx, Double count,Double total,String specs) {
+        this.specs = specs;
+        this.matnr = matNo;
+        this.maknx = maknx;
+        this.count = count;
+        this.total = total;
+    }
 }
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 6aa5829..88f2a6d 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -61,18 +61,18 @@
                     // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
                     mainService.storeEmptyPlt();
                     // 鍑哄簱  ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
-//                    mainService.ledExecute();
+                    mainService.ledExecute();
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
-//                    mainService.ledReset();
+                    mainService.ledReset();
 //                    mainService.outOfDevp();
 
                     //鍚姩銆佸畬鎴愩�佹殏鍋滄祴璇曠郴缁熸祴璇�
-                    mainService.packTest1();
+//                    mainService.packTest1();
 //                    //鐏锛岀粰鍫嗗灈鏈哄彂閫佺伀璀﹁鎶�
-                    mainService.fierCrn();
+//                    mainService.fierCrn();
 
                     //103绔欑偣鏈夌墿涓嬪彂pack鐮�
-                    mainService.packDevp();
+//                    mainService.packDevp();
 
                 } catch (Exception e) {
                     e.printStackTrace();
diff --git a/src/main/java/com/zy/core/model/DevpSlave.java b/src/main/java/com/zy/core/model/DevpSlave.java
index ad33be5..e327301 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -34,6 +34,10 @@
 
         private Integer barcode;
 
+        private Integer backSta;
+
+        private Integer led;
+
     }
 
 }
diff --git a/src/main/java/com/zy/core/model/command/LedCommand.java b/src/main/java/com/zy/core/model/command/LedCommand.java
index 536a9c0..00c334e 100644
--- a/src/main/java/com/zy/core/model/command/LedCommand.java
+++ b/src/main/java/com/zy/core/model/command/LedCommand.java
@@ -29,4 +29,7 @@
 
     private boolean emptyMk = false;
 
+    private Integer ioType;
+    private String barcode;
+
 }
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index e42e540..39b4d1b 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -52,6 +52,32 @@
     // 鍏ュ簱鏆傚瓨鏁�
     private Short inQty;
 
+    // 澶栧舰妫�娴� ------------------------------------------------------------------------
+
+    // 鍓嶈秴闄�
+    private boolean frontErr;
+
+    // 鍚庤秴闄�
+    private boolean backErr;
+
+    // 楂樿秴闄�
+    private boolean highErr;
+
+    // 宸﹁秴闄�
+    private boolean leftErr;
+
+    // 鍙宠秴闄�
+    private boolean rightErr;
+
+    // 瓒呴噸
+    private boolean weightErr;
+
+    // 鎵爜澶辫触
+    private boolean barcodeErr;
+
+    //鍑哄叆搴撴ā寮�
+    private Short outInModel;
+
     public BasDevp toSqlModel(){
         BasDevp basDevp = new BasDevp();
         basDevp.setDevNo(siteId);
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index e3ca63f..317f6dc 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -42,16 +42,22 @@
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 1;
     public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
-        add(101);add(102);add(103);add(104);
-        add(201);add(202);add(203);add(204);add(205);add(206);
-        add(207);add(208);add(209);add(210);add(211);add(212);
-        add(213);add(105);add(1000);
+        add(101);
+        add(102);
+        add(103);
+        add(104);
+        add(201);
+        add(202);
+        add(203);
+        add(204);
+        add(205);
+        add(206);
     }};
 
     /**
      * 鏉＄爜鏁伴噺
      */
-    private int barcodeSize = 2;
+    private int barcodeSize = 1;
     public IoModeType ioMode = IoModeType.NONE;
 
     public int[][] startSignal = new int[48][3];
@@ -78,68 +84,68 @@
                         break;
                     // 鍐欐暟鎹� ID+鐩爣绔�
                     case 2:
-                        write((StaProtocol)task.getData());
+                        write((StaProtocol) task.getData());
                         break;
                     // 鍐欐暟鎹� 103绔欑偣鍐欏叆PACK鐮�
-                    case 4:
-                        write103((String)task.getData());
-                        break;
+//                    case 4:
+//                        write103((String)task.getData());
+//                        break;
                     // 鐏淇″彿
-                    case 5:
-                        StaProtocol staProtocol2 = (StaProtocol)task.getData();
-                        siemensS7Net.Write("DB108.0" + staProtocol2.getSiteId(), staProtocol2.getStaNo()==1);
-                        break;
+//                    case 5:
+//                        StaProtocol staProtocol2 = (StaProtocol)task.getData();
+//                        siemensS7Net.Write("DB108.0" + staProtocol2.getSiteId(), staProtocol2.getStaNo()==1);
+//                        break;
                     //娴嬭瘯搴撳嚭搴擄紝搴撲綅鐘舵�佹敼涓�8
-                    case 6:
-                        String data = task.getData()+"";
-                        Byte coun=8;
-                        siemensS7Net.Write("DB38.0" + data, coun);
-                        break;
+//                    case 6:
+//                        String data = task.getData()+"";
+//                        Byte coun=8;
+//                        siemensS7Net.Write("DB38.0" + data, coun);
+//                        break;
                     //澶嶄綅娴嬭瘯淇″彿
-                    case 3:
-                        StaProtocol staProtocol = (StaProtocol) task.getData();
-                        siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
-                        break;
+//                    case 3:
+//                        StaProtocol staProtocol = (StaProtocol) task.getData();
+//                        siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
+//                        break;
                     default:
                         break;
-    }
-    // 蹇冭烦
+                }
+                // 蹇冭烦
 //                heartbeat();
                 Thread.sleep(400);
-} catch (Exception e) {
-        e.printStackTrace();
-        }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
 
         }
-        }
+    }
 
-@Override
-public boolean connect() {
+    @Override
+    public boolean connect() {
         boolean result = false;
         siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
         siemensS7Net.setRack(slave.getRack().byteValue());
         siemensS7Net.setSlot(slave.getSlot().byteValue());
         OperateResult connect = siemensS7Net.ConnectServer();
-        if(connect.IsSuccess){
-        result = true;
-        OutputQueue.DEVP.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
-        log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+        if (connect.IsSuccess) {
+            result = true;
+            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣緭閫佺嚎plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+            log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
         } else {
-        OutputQueue.DEVP.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}]  [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
-        log.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣緭閫佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}]  [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+            log.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
         }
         siemensS7Net.ConnectClose();
         return result;
-        }
+    }
 
-/**
- * 璇诲彇鐘舵�� ====> 鏁村潡plc
- */
-private void read() throws InterruptedException {
+    /**
+     * 璇诲彇鐘舵�� ====> 鏁村潡plc
+     */
+    private void read() throws InterruptedException {
 //        // 鏇存柊鍏ュ嚭搴撴ā寮�
 //        updateIoMode();
         int staNoSize = staNos.size();
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*4));
+        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize * 4));
         if (result.IsSuccess) {
             for (int i = 0; i < staNoSize; i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -149,9 +155,9 @@
                     staProtocol.setSiteId(siteId);
                     station.put(siteId, staProtocol);
                 }
-                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4));     // 宸ヤ綔鍙�
+                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4));     // 宸ヤ綔鍙�
 
-                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2));   // 鐩爣绔�
+                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 2));   // 鐩爣绔�
             }
         }
 //        Thread.sleep(200);
@@ -169,11 +175,11 @@
 //            }
 //        }
         Thread.sleep(200);
-        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));
+        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNoSize * 2));
         if (result1.IsSuccess) {
             for (int i = 0; i < staNoSize; i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1);
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i * 2, 1);
                 StaProtocol staProtocol = station.get(siteId);
                 staProtocol.setAutoing(status[0]);  // 鑷姩
                 staProtocol.setLoading(status[1]);  // 鏈夌墿
@@ -191,24 +197,24 @@
         }
 
         Thread.sleep(200);
-        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.190",(short)(26));
-        OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB100.216",(short)(6));
+        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.190", (short) 8);
+//        OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB100.216",(short)(6));
         if (result2.IsSuccess) {
-                String barcode =siemensS7Net.getByteTransform().TransString(result2.Content,0,26, "UTF-8");
+            String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, 0, 8, "UTF-8");
 //                String barcode=new String(result2.Content,i*12,12);
-                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 1);
-                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
-                    barcodeThread.setBarcode(barcode);
-                }
-        }
-        if (result5.IsSuccess) {
-            String barcode =siemensS7Net.getByteTransform().TransString(result5.Content,0,6, "UTF-8");
-//                String barcode=new String(result2.Content,i*12,12);
-            BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode,  2);
-            if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+            BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 1);
+            if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                 barcodeThread.setBarcode(barcode);
             }
         }
+//        if (result5.IsSuccess) {
+//            String barcode =siemensS7Net.getByteTransform().TransString(result5.Content,0,6, "UTF-8");
+////                String barcode=new String(result2.Content,i*12,12);
+//            BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode,  2);
+//            if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+//                barcodeThread.setBarcode(barcode);
+//            }
+//        }
 
         Thread.sleep(200);
         //娴嬭瘯鏌滅姸鎬佽幏鍙�
@@ -217,21 +223,34 @@
         OperateResultExOne<byte[]> result6 = siemensS7Net.Read("DB102.0", (short) 96);
         //娑堥槻鎶ヨ
         OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB108.0", (short) 48);
-        if(result3.IsSuccess) {
-            for(int i=0; i<48; i++){
+        if (result3.IsSuccess) {
+            for (int i = 0; i < 48; i++) {
                 startSignal[i][0] = siemensS7Net.getByteTransform().TransByte(result3.Content, i);//娴嬭瘯鏌滅姸鎬�
-                startSignal[i][1] = siemensS7Net.getByteTransform().TransBool(result4.Content, i)?1:0;//娑堥槻鐘舵��
-                startSignal[i][2] = siemensS7Net.getByteTransform().TransInt16(result6.Content, i*2);//鍚姩鎸夐挳鐘舵��
+                startSignal[i][1] = siemensS7Net.getByteTransform().TransBool(result4.Content, i) ? 1 : 0;//娑堥槻鐘舵��
+                startSignal[i][2] = siemensS7Net.getByteTransform().TransInt16(result6.Content, i * 2);//鍚姩鎸夐挳鐘舵��
             }
         }
 //        OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
 //        if (result2.IsSuccess) {
 //            this.ioMode = IoModeType.get(result2.Content);
 //        }
+        OperateResultExOne<byte[]> result202 = siemensS7Net.Read("DB101.806", (short) 8);
+        if (result202.IsSuccess) {
+            //鍑哄叆搴撴ā寮�
+            boolean[] status = siemensS7Net.getByteTransform().TransBool(result202.Content, 0, 1);
+            StaProtocol staProtocol = station.get(202);
+            staProtocol.setFrontErr(status[0]);
+            staProtocol.setBackErr(status[1]);
+            staProtocol.setHighErr(status[2]);
+            staProtocol.setLeftErr(status[3]);
+            staProtocol.setRightErr(status[4]);
+            staProtocol.setWeightErr(status[5]);
+            staProtocol.setBarcodeErr(status[6]);
+        }
 
         if (result.IsSuccess && result1.IsSuccess) {
 
-            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
 
             // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
             try {
@@ -260,8 +279,8 @@
     /**
      * 鍐欏叆 pack鐮� =====> 鍗曠珯鐐瑰啓鍏�
      */
-    private void write103(String packNo){
-        try{
+    private void write103(String packNo) {
+        try {
 
             OperateResult write = siemensS7Net.Write("DB109.0", packNo);
             if (!write.IsSuccess) {
@@ -269,9 +288,9 @@
                 log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(packNo));
             } else {
                 OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(packNo)));
-                log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}",  slave.getId(), JSON.toJSON(packNo));
+                log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(packNo));
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error("103绔欑偣鍐欏叆鏁版嵁澶辫触锛岃緭閫佺嚎绾跨▼write103");
         }
     }
@@ -293,27 +312,27 @@
         int idCount = 0;
         boolean idFlag = false;
         OperateResult write;
-        while(idCount < 5){
+        while (idCount < 5) {
 
-            write = siemensS7Net.Write("DB100." + index*4, array);    // 鍐�
-            if(write.IsSuccess){
+            write = siemensS7Net.Write("DB100." + index * 4, array);    // 鍐�
+            if (write.IsSuccess) {
                 Thread.sleep(200);
-                OperateResultExOne<byte[]> readId = siemensS7Net.Read("DB100." + index*4, (short) (staNoSize*2));
-                  if(readId.IsSuccess){
-                    if(staProtocol.getWorkNo()!=0&&staProtocol.getWorkNo()!=9999){
-                        if(!staProtocol.isInEnable()&&(staProtocol.getSiteId()==201||staProtocol.getSiteId()==206)){
+                OperateResultExOne<byte[]> readId = siemensS7Net.Read("DB100." + index * 4, (short) (staNoSize * 2));
+                if (readId.IsSuccess) {
+                    if (staProtocol.getWorkNo() != 0 && staProtocol.getWorkNo() != 9999) {
+                        if (!staProtocol.isInEnable() && (staProtocol.getSiteId() == 201 || staProtocol.getSiteId() == 206)) {
                             break;
                         }
                     }
                     short workNo = siemensS7Net.getByteTransform().TransInt16(readId.Content, 0);
-                    if(staProtocol.getWorkNo().equals(workNo)){
+                    if (staProtocol.getWorkNo().equals(workNo)) {
                         //宸ヤ綔鍙峰啓鍏ユ垚鍔�
                         idFlag = true;
                         break;
                     } else {//杩斿洖缁撴灉鏄垚鍔熶簡锛屼絾鏄湡瀹炲�间笉鐩稿悓
                         idCount++;
                         OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎宸ヤ綔鍙峰悗杩斿洖鎴愬姛锛屼絾鏄鍙栧伐浣滃彿鍊间笉涓�鑷淬�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
-                                slave.getId(), JSON.toJSON(staProtocol),idCount));
+                                slave.getId(), JSON.toJSON(staProtocol), idCount));
                         log.error("鍐欏叆杈撻�佺嚎宸ヤ綔鍙峰悗杩斿洖鎴愬姛锛屼絾鏄鍙栧伐浣滃彿鍊间笉涓�鑷淬�傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), idCount);
                     }
                 } else {
@@ -325,15 +344,15 @@
             } else {
                 idCount++;
                 OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎宸ヤ綔鍙峰け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
-                        slave.getId(), JSON.toJSON(staProtocol),idCount));
+                        slave.getId(), JSON.toJSON(staProtocol), idCount));
                 log.error("鍐欏叆杈撻�佺嚎宸ヤ綔鍙峰け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), idCount);
             }
             Thread.sleep(200);
         }
         //鍐橧D灏濊瘯浜�5娆¤繕鏄け璐ヤ簡
-        if(!idFlag){
+        if (!idFlag) {
             staProtocol = station.get(staProtocol.getSiteId());
-            if (staProtocol.getWorkNo() == 9999 && staProtocol.getStaNo() ==0) {
+            if (staProtocol.getWorkNo() == 9999 && staProtocol.getStaNo() == 0) {
                 staProtocol.setPakMk(true);
             }
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎宸ヤ綔鍙峰皾璇�5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
@@ -350,7 +369,7 @@
 //        OperateResult write1 = siemensS7Net.Write("DB101." + index*2, staProtocol.getStaNo());    // 鐩爣绔�
 
         OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂鎴愬姛 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
-        log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂鎴愬姛锛� {}",  slave.getId(), JSON.toJSON(staProtocol));
+        log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂鎴愬姛锛� {}", slave.getId(), JSON.toJSON(staProtocol));
     }
 
     // 鏇存柊鍏ュ嚭搴撴ā寮�
@@ -366,7 +385,7 @@
     /**
      * 蹇冭烦
      */
-    private void heartbeat(){
+    private void heartbeat() {
         if (heartBeatVal == 1) {
             heartBeatVal = 2;
         } else {
@@ -397,14 +416,14 @@
     public static void main(String[] args) {
         System.out.println(staNos.indexOf(129));
         System.out.println(staNos.size());
-        for (int i = 0; i<staNos.size(); i++) {
+        for (int i = 0; i < staNos.size(); i++) {
 //            System.out.println(i*2);
 //            System.out.println(i*2 + 200);
 //            System.out.println(i);
         }
         int index = staNos.indexOf(128);
-        System.out.println(index*2);
-        System.out.println(index*2 + 200);
+        System.out.println(index * 2);
+        System.out.println(index * 2 + 200);
     }
 
 //    public static void main(String[] args) throws Exception {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 042e374..53644be 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,8 +8,8 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://10.12.55.200:1433;databasename=zjfnasrs
-    #url: jdbc:sqlserver://127.0.0.1:1433;databasename=zjfnasrs
+#    url: jdbc:sqlserver://10.12.55.200:1433;databasename=zjfnasrs
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jxtlfasrs
     username: sa
     password: sa@123
   mvc:
@@ -76,30 +76,6 @@
       row: 2
       bay: 0
       lev: 1
-  # 鍫嗗灈鏈�2
-  crn[1]:
-    id: 2
-    ip: 10.12.55.60
-    port: 8888
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 209
-      row: 3
-      bay: 0
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 210
-      row: 4
-      bay: 0
-      lev: 1
 
   # 杈撻�佺嚎
   devp[0]:
@@ -110,12 +86,10 @@
     slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 201
+      staNo: 101
       barcode: ${wcs-slave.barcode[0].id}
-    # 鍏ュ簱鍙�2
-    inSta[1]:
-      staNo: 206
-      barcode: ${wcs-slave.barcode[1].id}
+      backSta: 100
+      led: ${wcs-slave.led[0].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
       staNo: 201
@@ -139,18 +113,25 @@
     id: 1
     ip: 172.28.15.235
     port: 51236
-  # 鏉＄爜鎵弿浠�2
-  barcode[1]:
-    id: 2
-    ip: 172.28.15.235
-    port: 51236
-#   # LED1
-#  led[0]:
-#    id: 1
-#    ip: 10.10.10.60
-#    port: 5005
-#    devpPlcId: ${wcs-slave.devp[0].id}
-#    staArr: 110
+#  # 鏉＄爜鎵弿浠�2
+#  barcode[1]:
+#    id: 2
+#    ip: 172.28.15.235
+#    port: 51236
+   # LED1
+  led[0]:
+    id: 1
+    ip: 10.10.10.60
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 101
+    # LED2
+  led[1]:
+    id: 1
+    ip: 10.10.10.60
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 110
 #
 #  #socket
 #  socket[0]:
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 4335c57..8b41261 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/fnwcs";
+var baseUrl = "/tlfwcs";
 
 // 璧嬪��
 function setVal(el, val) {
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 2551c54..2c53f2e 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -8,46 +8,37 @@
     "floors": 1,
     "racks": [{
         "type": "rack",
-        "id": "rack4",
-        "top": 260,
-        "left": 196,
-        "width": 765,
-        "height": 23,
-        "minBayNo": 1,
-        "maxBayNo": 24
-    }, {
-        "type": "rack",
         "id": "rack1",
-        "top": 95,
+        "top": 260,
         "left": 167,
         "width": 794,
         "height": 23,
         "minBayNo": 1,
-        "maxBayNo": 25
+        "maxBayNo": 14
     }, {
         "type": "rack",
         "id": "rack2",
-        "top": 152,
-        "left": 167,
-        "width": 794,
-        "height": 23,
-        "minBayNo": 1,
-        "maxBayNo": 25
-    }, {
-        "type": "rack",
-        "id": "rack3",
         "top": 200,
         "left": 167,
         "width": 794,
         "height": 23,
         "minBayNo": 1,
-        "maxBayNo": 25
-    }],
+        "maxBayNo": 14
+    },{
+        "type": "rack",
+        "id": "rack3",
+        "top": 177,
+        "left": 167,
+        "width": 794,
+        "height": 23,
+        "minBayNo": 1,
+        "maxBayNo": 14
+    },],
     "rackDescs": [{
         "type": "rackDescs",
         "id": "lb_desc1",
-        "text": "#4",
-        "top": 93,
+        "text": "#3",
+        "top": 177,
         "left": 129,
         "width": 30,
         "height": 23
@@ -58,14 +49,6 @@
         "top": 259,
         "left": 129,
         "width": 33,
-        "height": 23
-    }, {
-        "type": "rackDescs",
-        "id": "lb_desc16",
-        "text": "#涓�妤兼満姊拌噦浣嶇疆==銆�",
-        "top": 40,
-        "left": 750,
-        "width": 270,
         "height": 23
     }],
     "crns": [{
@@ -78,28 +61,12 @@
         "height": 22
     }, {
         "type": "track",
-        "id": "lb_track4",
-        "text": "",
-        "top": 136,
-        "left": 180,
-        "width": 830,
-        "height": 2
-    }, {
-        "type": "track",
         "id": "lb_track5",
         "text": "",
         "top": 243,
         "left": 180,
         "width": 830,
         "height": 2
-    }, {
-        "type": "crane",
-        "id": "crn-2",
-        "text": "2",
-        "top": 127,
-        "left": 441,
-        "width": 93,
-        "height": 22
     }],
     "areas": [{
         "type": "Control_floor",
@@ -118,70 +85,6 @@
             "width": 1412,
             "height": 505,
             "stns": [{
-                "type": "stn",
-                "id": "site-212",
-                "text": "212",
-                "top": 119,
-                "left": 1122,
-                "width": 65,
-                "height": 23
-            }, {
-                "type": "stn",
-                "id": "site-105",
-                "text": "105",
-                "top": 47,
-                "left": 1188,
-                "width": 65,
-                "height": 23
-            }, {
-                "type": "stn",
-                "id": "site-0",
-                "text": "鍗囬檷",
-                "top": 70,
-                "left": 1203,
-                "width": 35,
-                "height": 49,
-            }, {
-                "type": "stn",
-                "id": "site-101",
-                "text": "101",
-                "top": 119,
-                "left": 1188,
-                "width": 65,
-                "height": 23
-            }, {
-                "type": "stn",
-                "id": "site-211",
-                "text": "211",
-                "top": 95,
-                "left": 1122,
-                "width": 60,
-                "height": 23
-            }, {
-                "type": "stn",
-                "id": "site-207",
-                "text": "207",
-                "top": 119,
-                "left": 1041,
-                "width": 80,
-                "height": 32
-            }, {
-                "type": "stn",
-                "id": "site-205",
-                "text": "205",
-                "top": 176,
-                "left": 1041,
-                "width": 80,
-                "height": 23
-            }, {
-                "type": "stn",
-                "id": "site-206",
-                "text": "206",
-                "top": 152,
-                "left": 1041,
-                "width": 80,
-                "height": 23
-            }, {
                 "type": "stn",
                 "id": "site-202",
                 "text": "202",
@@ -212,62 +115,6 @@
                 "top": 200,
                 "left": 1041,
                 "width": 80,
-                "height": 23
-            }, {
-                "type": "stn",
-                "id": "site-209",
-                "text": "209",
-                "top": 152,
-                "left": 960,
-                "width": 80,
-                "height": 23
-            }, {
-                "type": "stn",
-                "id": "site-210",
-                "text": "210",
-                "top": 95,
-                "left": 960,
-                "width": 80,
-                "height": 23
-            }, {
-                "type": "stn",
-                "id": "site-208",
-                "text": "208",
-                "top": 95,
-                "left": 1041,
-                "width": 80,
-                "height": 23
-            }, {
-                "type": "stn",
-                "id": "site-213",
-                "text": "213",
-                "top": 119,
-                "left": 1254,
-                "width": 65,
-                "height": 23
-            }, {
-                "type": "stn",
-                "id": "site-104",
-                "text": "104",
-                "top": 23,
-                "left": 1122,
-                "width": 65,
-                "height": 23
-            }, {
-                "type": "stn",
-                "id": "site-102",
-                "text": "102",
-                "top": 47,
-                "left": 1122,
-                "width": 65,
-                "height": 23
-            }, {
-                "type": "stn",
-                "id": "site-103",
-                "text": "103",
-                "top": 47,
-                "left": 1056,
-                "width": 65,
                 "height": 23
             }]
         }]
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index da7aa18..e0078c9 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -27,147 +27,147 @@
     <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
     <div class="main-part">
     </div>
-    <div class="" >
-        <div id="loc-0100105" class="loc" style="top:400px; left:200px; width:70px; height: 22px;line-height: 22px;">1-1-5</div>
-        <div id="loc-0100205" class="loc" style="top:400px; left:272px; width:70px; height: 22px;line-height: 22px;">1-2-5</div>
-        <div id="loc-0100305" class="loc" style="top:400px; left:344px; width:70px; height: 22px;line-height: 22px;">1-3-5</div>
-        <div id="loc-0100405" class="loc" style="top:400px; left:416px; width:70px; height: 22px;line-height: 22px;">1-4-5</div>
-        <div id="loc-0100505" class="loc" style="top:400px; left:488px; width:70px; height: 22px;line-height: 22px;">1-5-5</div>
-        <div id="loc-0100605" class="loc" style="top:400px; left:560px; width:70px; height: 22px;line-height: 22px;">1-6-5</div>
-        <div id="loc-0100705" class="loc" style="top:400px; left:632px; width:70px; height: 22px;line-height: 22px;">1-7-5</div>
-        <div id="loc-0100805" class="loc" style="top:400px; left:704px; width:70px; height: 22px;line-height: 22px;">1-8-5</div>
-        <div id="loc-0100905" class="loc" style="top:400px; left:776px; width:70px; height: 22px;line-height: 22px;">1-9-5</div>
-        <div id="loc-0101005" class="loc" style="top:400px; left:848px; width:70px; height: 22px;line-height: 22px;">1-10-5</div>
-        <div id="loc-0101105" class="loc" style="top:400px; left:920px; width:70px; height: 22px;line-height: 22px;">1-11-5</div>
-        <div id="loc-0101205" class="loc" style="top:400px; left:992px; width:70px; height: 22px;line-height: 22px;">1-12-5</div>
-        <div id="loc-0101305" class="loc" style="top:400px; left:1064px; width:70px; height: 22px;line-height: 22px;">1-13-5</div>
-        <div id="loc-0101405" class="loc" style="top:400px; left:1136px; width:70px; height: 22px;line-height: 22px;">1-14-5</div>
-        <div id="loc-0101505" class="loc" style="top:400px; left:1208px; width:70px; height: 22px;line-height: 22px;">1-15-5</div>
-        <div id="loc-0101605" class="loc" style="top:400px; left:1280px; width:70px; height: 22px;line-height: 22px;">1-16-5</div>
-        <div id="loc-0101705" class="loc" style="top:400px; left:1352px; width:70px; height: 22px;line-height: 22px;">1-17-5</div>
-        <div id="loc-0101805" class="loc" style="top:400px; left:1424px; width:70px; height: 22px;line-height: 22px;">1-18-5</div>
-        <div id="loc-0101905" class="loc" style="top:400px; left:1496px; width:70px; height: 22px;line-height: 22px;">1-19-5</div>
-        <div id="loc-0102005" class="loc" style="top:400px; left:1568px; width:70px; height: 22px;line-height: 22px;">1-20-5</div>
-        <div id="loc-0102105" class="loc" style="top:400px; left:1640px; width:70px; height: 22px;line-height: 22px;">1-21-5</div>
-        <div id="loc-0102205" class="loc" style="top:400px; left:1712px; width:70px; height: 22px;line-height: 22px;">1-22-5</div>
-        <div id="loc-0102305" class="loc" style="top:400px; left:1784px; width:70px; height: 22px;line-height: 22px;">1-23-5</div>
-        <div id="loc-0102405" class="loc" style="top:400px; left:1856px; width:70px; height: 22px;line-height: 22px;">1-24-5</div>
-    </div>
+<!--    <div class="" >-->
+<!--        <div id="loc-0100105" class="loc" style="top:400px; left:200px; width:70px; height: 22px;line-height: 22px;">1-1-5</div>-->
+<!--        <div id="loc-0100205" class="loc" style="top:400px; left:272px; width:70px; height: 22px;line-height: 22px;">1-2-5</div>-->
+<!--        <div id="loc-0100305" class="loc" style="top:400px; left:344px; width:70px; height: 22px;line-height: 22px;">1-3-5</div>-->
+<!--        <div id="loc-0100405" class="loc" style="top:400px; left:416px; width:70px; height: 22px;line-height: 22px;">1-4-5</div>-->
+<!--        <div id="loc-0100505" class="loc" style="top:400px; left:488px; width:70px; height: 22px;line-height: 22px;">1-5-5</div>-->
+<!--        <div id="loc-0100605" class="loc" style="top:400px; left:560px; width:70px; height: 22px;line-height: 22px;">1-6-5</div>-->
+<!--        <div id="loc-0100705" class="loc" style="top:400px; left:632px; width:70px; height: 22px;line-height: 22px;">1-7-5</div>-->
+<!--        <div id="loc-0100805" class="loc" style="top:400px; left:704px; width:70px; height: 22px;line-height: 22px;">1-8-5</div>-->
+<!--        <div id="loc-0100905" class="loc" style="top:400px; left:776px; width:70px; height: 22px;line-height: 22px;">1-9-5</div>-->
+<!--        <div id="loc-0101005" class="loc" style="top:400px; left:848px; width:70px; height: 22px;line-height: 22px;">1-10-5</div>-->
+<!--        <div id="loc-0101105" class="loc" style="top:400px; left:920px; width:70px; height: 22px;line-height: 22px;">1-11-5</div>-->
+<!--        <div id="loc-0101205" class="loc" style="top:400px; left:992px; width:70px; height: 22px;line-height: 22px;">1-12-5</div>-->
+<!--        <div id="loc-0101305" class="loc" style="top:400px; left:1064px; width:70px; height: 22px;line-height: 22px;">1-13-5</div>-->
+<!--        <div id="loc-0101405" class="loc" style="top:400px; left:1136px; width:70px; height: 22px;line-height: 22px;">1-14-5</div>-->
+<!--        <div id="loc-0101505" class="loc" style="top:400px; left:1208px; width:70px; height: 22px;line-height: 22px;">1-15-5</div>-->
+<!--        <div id="loc-0101605" class="loc" style="top:400px; left:1280px; width:70px; height: 22px;line-height: 22px;">1-16-5</div>-->
+<!--        <div id="loc-0101705" class="loc" style="top:400px; left:1352px; width:70px; height: 22px;line-height: 22px;">1-17-5</div>-->
+<!--        <div id="loc-0101805" class="loc" style="top:400px; left:1424px; width:70px; height: 22px;line-height: 22px;">1-18-5</div>-->
+<!--        <div id="loc-0101905" class="loc" style="top:400px; left:1496px; width:70px; height: 22px;line-height: 22px;">1-19-5</div>-->
+<!--        <div id="loc-0102005" class="loc" style="top:400px; left:1568px; width:70px; height: 22px;line-height: 22px;">1-20-5</div>-->
+<!--        <div id="loc-0102105" class="loc" style="top:400px; left:1640px; width:70px; height: 22px;line-height: 22px;">1-21-5</div>-->
+<!--        <div id="loc-0102205" class="loc" style="top:400px; left:1712px; width:70px; height: 22px;line-height: 22px;">1-22-5</div>-->
+<!--        <div id="loc-0102305" class="loc" style="top:400px; left:1784px; width:70px; height: 22px;line-height: 22px;">1-23-5</div>-->
+<!--        <div id="loc-0102405" class="loc" style="top:400px; left:1856px; width:70px; height: 22px;line-height: 22px;">1-24-5</div>-->
+<!--    </div>-->
 
+<!--    <div class="">-->
+<!--        <div id="loc-0100104" class="loc" style="top:424px; left:200px; width:70px; height: 22px;line-height: 22px;">1-1-4</div>-->
+<!--        <div id="loc-0100204" class="loc" style="top:424px; left:272px; width:70px; height: 22px;line-height: 22px;">1-2-4</div>-->
+<!--        <div id="loc-0100304" class="loc" style="top:424px; left:344px; width:70px; height: 22px;line-height: 22px;">1-3-4</div>-->
+<!--        <div id="loc-0100404" class="loc" style="top:424px; left:416px; width:70px; height: 22px;line-height: 22px;">1-4-4</div>-->
+<!--        <div id="loc-0100504" class="loc" style="top:424px; left:488px; width:70px; height: 22px;line-height: 22px;">1-5-4</div>-->
+<!--        <div id="loc-0100604" class="loc" style="top:424px; left:560px; width:70px; height: 22px;line-height: 22px;">1-6-4</div>-->
+<!--        <div id="loc-0100704" class="loc" style="top:424px; left:632px; width:70px; height: 22px;line-height: 22px;">1-7-4</div>-->
+<!--        <div id="loc-0100804" class="loc" style="top:424px; left:704px; width:70px; height: 22px;line-height: 22px;">1-8-4</div>-->
+<!--        <div id="loc-0100904" class="loc" style="top:424px; left:776px; width:70px; height: 22px;line-height: 22px;">1-9-4</div>-->
+<!--        <div id="loc-0101004" class="loc" style="top:424px; left:848px; width:70px; height: 22px;line-height: 22px;">1-10-4</div>-->
+<!--        <div id="loc-0101104" class="loc" style="top:424px; left:920px; width:70px; height: 22px;line-height: 22px;">1-11-4</div>-->
+<!--        <div id="loc-0101204" class="loc" style="top:424px; left:992px; width:70px; height: 22px;line-height: 22px;">1-12-4</div>-->
+<!--        <div id="loc-0101304" class="loc" style="top:424px; left:1064px; width:70px; height: 22px;line-height: 22px;">1-13-4</div>-->
+<!--        <div id="loc-0101404" class="loc" style="top:424px; left:1136px; width:70px; height: 22px;line-height: 22px;">1-14-4</div>-->
+<!--        <div id="loc-0101504" class="loc" style="top:424px; left:1208px; width:70px; height: 22px;line-height: 22px;">1-15-4</div>-->
+<!--        <div id="loc-0101604" class="loc" style="top:424px; left:1280px; width:70px; height: 22px;line-height: 22px;">1-16-4</div>-->
+<!--        <div id="loc-0101704" class="loc" style="top:424px; left:1352px; width:70px; height: 22px;line-height: 22px;">1-17-4</div>-->
+<!--        <div id="loc-0101804" class="loc" style="top:424px; left:1424px; width:70px; height: 22px;line-height: 22px;">1-18-4</div>-->
+<!--        <div id="loc-0101904" class="loc" style="top:424px; left:1496px; width:70px; height: 22px;line-height: 22px;">1-19-4</div>-->
+<!--        <div id="loc-0102004" class="loc" style="top:424px; left:1568px; width:70px; height: 22px;line-height: 22px;">1-20-4</div>-->
+<!--        <div id="loc-0102104" class="loc" style="top:424px; left:1640px; width:70px; height: 22px;line-height: 22px;">1-21-4</div>-->
+<!--        <div id="loc-0102204" class="loc" style="top:424px; left:1712px; width:70px; height: 22px;line-height: 22px;">1-22-4</div>-->
+<!--        <div id="loc-0102304" class="loc" style="top:424px; left:1784px; width:70px; height: 22px;line-height: 22px;">1-23-4</div>-->
+<!--        <div id="loc-0102404" class="loc" style="top:424px; left:1856px; width:70px; height: 22px;line-height: 22px;">1-24-4</div>-->
+<!--    </div>-->
+<!--    <div class="">-->
+<!--        <div id="loc-0100103" class="loc" style="top:448px; left:200px; width:70px; height: 22px;line-height: 22px;">1-1-3</div>-->
+<!--        <div id="loc-0100203" class="loc" style="top:448px; left:272px; width:70px; height: 22px;line-height: 22px;">1-2-3</div>-->
+<!--        <div id="loc-0100303" class="loc" style="top:448px; left:344px; width:70px; height: 22px;line-height: 22px;">1-3-3</div>-->
+<!--        <div id="loc-0100403" class="loc" style="top:448px; left:416px; width:70px; height: 22px;line-height: 22px;">1-4-3</div>-->
+<!--        <div id="loc-0100503" class="loc" style="top:448px; left:488px; width:70px; height: 22px;line-height: 22px;">1-5-3</div>-->
+<!--        <div id="loc-0100603" class="loc" style="top:448px; left:560px; width:70px; height: 22px;line-height: 22px;">1-6-3</div>-->
+<!--        <div id="loc-0100703" class="loc" style="top:448px; left:632px; width:70px; height: 22px;line-height: 22px;">1-7-3</div>-->
+<!--        <div id="loc-0100803" class="loc" style="top:448px; left:704px; width:70px; height: 22px;line-height: 22px;">1-8-3</div>-->
+<!--        <div id="loc-0100903" class="loc" style="top:448px; left:776px; width:70px; height: 22px;line-height: 22px;">1-9-3</div>-->
+<!--        <div id="loc-0101003" class="loc" style="top:448px; left:848px; width:70px; height: 22px;line-height: 22px;">1-10-3</div>-->
+<!--        <div id="loc-0101103" class="loc" style="top:448px; left:920px; width:70px; height: 22px;line-height: 22px;">1-11-3</div>-->
+<!--        <div id="loc-0101203" class="loc" style="top:448px; left:992px; width:70px; height: 22px;line-height: 22px;">1-12-3</div>-->
+<!--        <div id="loc-0101303" class="loc" style="top:448px; left:1064px; width:70px; height: 22px;line-height: 22px;">1-13-3</div>-->
+<!--        <div id="loc-0101403" class="loc" style="top:448px; left:1136px; width:70px; height: 22px;line-height: 22px;">1-14-3</div>-->
+<!--        <div id="loc-0101503" class="loc" style="top:448px; left:1208px; width:70px; height: 22px;line-height: 22px;">1-15-3</div>-->
+<!--        <div id="loc-0101603" class="loc" style="top:448px; left:1280px; width:70px; height: 22px;line-height: 22px;">1-16-3</div>-->
+<!--        <div id="loc-0101703" class="loc" style="top:448px; left:1352px; width:70px; height: 22px;line-height: 22px;">1-17-3</div>-->
+<!--        <div id="loc-0101803" class="loc" style="top:448px; left:1424px; width:70px; height: 22px;line-height: 22px;">1-18-3</div>-->
+<!--        <div id="loc-0101903" class="loc" style="top:448px; left:1496px; width:70px; height: 22px;line-height: 22px;">1-19-3</div>-->
+<!--        <div id="loc-0102003" class="loc" style="top:448px; left:1568px; width:70px; height: 22px;line-height: 22px;">1-20-3</div>-->
+<!--        <div id="loc-0102103" class="loc" style="top:448px; left:1640px; width:70px; height: 22px;line-height: 22px;">1-21-3</div>-->
+<!--        <div id="loc-0102203" class="loc" style="top:448px; left:1712px; width:70px; height: 22px;line-height: 22px;">1-22-3</div>-->
+<!--        <div id="loc-0102303" class="loc" style="top:448px; left:1784px; width:70px; height: 22px;line-height: 22px;">1-23-3</div>-->
+<!--        <div id="loc-0102403" class="loc" style="top:448px; left:1856px; width:70px; height: 22px;line-height: 22px;">1-24-3</div>-->
+<!--    </div>-->
     <div class="">
-        <div id="loc-0100104" class="loc" style="top:424px; left:200px; width:70px; height: 22px;line-height: 22px;">1-1-4</div>
-        <div id="loc-0100204" class="loc" style="top:424px; left:272px; width:70px; height: 22px;line-height: 22px;">1-2-4</div>
-        <div id="loc-0100304" class="loc" style="top:424px; left:344px; width:70px; height: 22px;line-height: 22px;">1-3-4</div>
-        <div id="loc-0100404" class="loc" style="top:424px; left:416px; width:70px; height: 22px;line-height: 22px;">1-4-4</div>
-        <div id="loc-0100504" class="loc" style="top:424px; left:488px; width:70px; height: 22px;line-height: 22px;">1-5-4</div>
-        <div id="loc-0100604" class="loc" style="top:424px; left:560px; width:70px; height: 22px;line-height: 22px;">1-6-4</div>
-        <div id="loc-0100704" class="loc" style="top:424px; left:632px; width:70px; height: 22px;line-height: 22px;">1-7-4</div>
-        <div id="loc-0100804" class="loc" style="top:424px; left:704px; width:70px; height: 22px;line-height: 22px;">1-8-4</div>
-        <div id="loc-0100904" class="loc" style="top:424px; left:776px; width:70px; height: 22px;line-height: 22px;">1-9-4</div>
-        <div id="loc-0101004" class="loc" style="top:424px; left:848px; width:70px; height: 22px;line-height: 22px;">1-10-4</div>
-        <div id="loc-0101104" class="loc" style="top:424px; left:920px; width:70px; height: 22px;line-height: 22px;">1-11-4</div>
-        <div id="loc-0101204" class="loc" style="top:424px; left:992px; width:70px; height: 22px;line-height: 22px;">1-12-4</div>
-        <div id="loc-0101304" class="loc" style="top:424px; left:1064px; width:70px; height: 22px;line-height: 22px;">1-13-4</div>
-        <div id="loc-0101404" class="loc" style="top:424px; left:1136px; width:70px; height: 22px;line-height: 22px;">1-14-4</div>
-        <div id="loc-0101504" class="loc" style="top:424px; left:1208px; width:70px; height: 22px;line-height: 22px;">1-15-4</div>
-        <div id="loc-0101604" class="loc" style="top:424px; left:1280px; width:70px; height: 22px;line-height: 22px;">1-16-4</div>
-        <div id="loc-0101704" class="loc" style="top:424px; left:1352px; width:70px; height: 22px;line-height: 22px;">1-17-4</div>
-        <div id="loc-0101804" class="loc" style="top:424px; left:1424px; width:70px; height: 22px;line-height: 22px;">1-18-4</div>
-        <div id="loc-0101904" class="loc" style="top:424px; left:1496px; width:70px; height: 22px;line-height: 22px;">1-19-4</div>
-        <div id="loc-0102004" class="loc" style="top:424px; left:1568px; width:70px; height: 22px;line-height: 22px;">1-20-4</div>
-        <div id="loc-0102104" class="loc" style="top:424px; left:1640px; width:70px; height: 22px;line-height: 22px;">1-21-4</div>
-        <div id="loc-0102204" class="loc" style="top:424px; left:1712px; width:70px; height: 22px;line-height: 22px;">1-22-4</div>
-        <div id="loc-0102304" class="loc" style="top:424px; left:1784px; width:70px; height: 22px;line-height: 22px;">1-23-4</div>
-        <div id="loc-0102404" class="loc" style="top:424px; left:1856px; width:70px; height: 22px;line-height: 22px;">1-24-4</div>
+        <div id="loc-0100102" class="loc" style="top:372px; left:200px; width:70px; height: 22px;line-height: 22px;">1-1-2</div>
+        <div id="loc-0100202" class="loc" style="top:372px; left:272px; width:70px; height: 22px;line-height: 22px;">1-2-2</div>
+        <div id="loc-0100302" class="loc" style="top:372px; left:344px; width:70px; height: 22px;line-height: 22px;">1-3-2</div>
+        <div id="loc-0100402" class="loc" style="top:372px; left:416px; width:70px; height: 22px;line-height: 22px;">1-4-2</div>
+        <div id="loc-0100502" class="loc" style="top:372px; left:488px; width:70px; height: 22px;line-height: 22px;">1-5-2</div>
+        <div id="loc-0100602" class="loc" style="top:372px; left:560px; width:70px; height: 22px;line-height: 22px;">1-6-2</div>
+        <div id="loc-0100702" class="loc" style="top:372px; left:632px; width:70px; height: 22px;line-height: 22px;">1-7-2</div>
+        <div id="loc-0100802" class="loc" style="top:372px; left:704px; width:70px; height: 22px;line-height: 22px;">1-8-2</div>
+        <div id="loc-0100902" class="loc" style="top:372px; left:776px; width:70px; height: 22px;line-height: 22px;">1-9-2</div>
+        <div id="loc-0101002" class="loc" style="top:372px; left:848px; width:70px; height: 22px;line-height: 22px;">1-10-2</div>
+        <div id="loc-0101102" class="loc" style="top:372px; left:920px; width:70px; height: 22px;line-height: 22px;">1-11-2</div>
+        <div id="loc-0101202" class="loc" style="top:372px; left:992px; width:70px; height: 22px;line-height: 22px;">1-12-2</div>
+        <div id="loc-0101302" class="loc" style="top:372px; left:1064px; width:70px; height: 22px;line-height: 22px;">1-13-2</div>
+        <div id="loc-0101402" class="loc" style="top:372px; left:1136px; width:70px; height: 22px;line-height: 22px;">1-14-2</div>
+<!--        <div id="loc-0101502" class="loc" style="top:472px; left:1208px; width:70px; height: 22px;line-height: 22px;">1-15-2</div>-->
+<!--        <div id="loc-0101602" class="loc" style="top:472px; left:1280px; width:70px; height: 22px;line-height: 22px;">1-16-2</div>-->
+<!--        <div id="loc-0101702" class="loc" style="top:472px; left:1352px; width:70px; height: 22px;line-height: 22px;">1-17-2</div>-->
+<!--        <div id="loc-0101802" class="loc" style="top:472px; left:1424px; width:70px; height: 22px;line-height: 22px;">1-18-2</div>-->
+<!--        <div id="loc-0101902" class="loc" style="top:472px; left:1496px; width:70px; height: 22px;line-height: 22px;">1-19-2</div>-->
+<!--        <div id="loc-0102002" class="loc" style="top:472px; left:1568px; width:70px; height: 22px;line-height: 22px;">1-20-2</div>-->
+<!--        <div id="loc-0102102" class="loc" style="top:472px; left:1640px; width:70px; height: 22px;line-height: 22px;">1-21-2</div>-->
+<!--        <div id="loc-0102202" class="loc" style="top:472px; left:1712px; width:70px; height: 22px;line-height: 22px;">1-22-2</div>-->
+<!--        <div id="loc-0102302" class="loc" style="top:472px; left:1784px; width:70px; height: 22px;line-height: 22px;">1-23-2</div>-->
+<!--        <div id="loc-0102402" class="loc" style="top:472px; left:1856px; width:70px; height: 22px;line-height: 22px;">1-24-2</div>-->
     </div>
     <div class="">
-        <div id="loc-0100103" class="loc" style="top:448px; left:200px; width:70px; height: 22px;line-height: 22px;">1-1-3</div>
-        <div id="loc-0100203" class="loc" style="top:448px; left:272px; width:70px; height: 22px;line-height: 22px;">1-2-3</div>
-        <div id="loc-0100303" class="loc" style="top:448px; left:344px; width:70px; height: 22px;line-height: 22px;">1-3-3</div>
-        <div id="loc-0100403" class="loc" style="top:448px; left:416px; width:70px; height: 22px;line-height: 22px;">1-4-3</div>
-        <div id="loc-0100503" class="loc" style="top:448px; left:488px; width:70px; height: 22px;line-height: 22px;">1-5-3</div>
-        <div id="loc-0100603" class="loc" style="top:448px; left:560px; width:70px; height: 22px;line-height: 22px;">1-6-3</div>
-        <div id="loc-0100703" class="loc" style="top:448px; left:632px; width:70px; height: 22px;line-height: 22px;">1-7-3</div>
-        <div id="loc-0100803" class="loc" style="top:448px; left:704px; width:70px; height: 22px;line-height: 22px;">1-8-3</div>
-        <div id="loc-0100903" class="loc" style="top:448px; left:776px; width:70px; height: 22px;line-height: 22px;">1-9-3</div>
-        <div id="loc-0101003" class="loc" style="top:448px; left:848px; width:70px; height: 22px;line-height: 22px;">1-10-3</div>
-        <div id="loc-0101103" class="loc" style="top:448px; left:920px; width:70px; height: 22px;line-height: 22px;">1-11-3</div>
-        <div id="loc-0101203" class="loc" style="top:448px; left:992px; width:70px; height: 22px;line-height: 22px;">1-12-3</div>
-        <div id="loc-0101303" class="loc" style="top:448px; left:1064px; width:70px; height: 22px;line-height: 22px;">1-13-3</div>
-        <div id="loc-0101403" class="loc" style="top:448px; left:1136px; width:70px; height: 22px;line-height: 22px;">1-14-3</div>
-        <div id="loc-0101503" class="loc" style="top:448px; left:1208px; width:70px; height: 22px;line-height: 22px;">1-15-3</div>
-        <div id="loc-0101603" class="loc" style="top:448px; left:1280px; width:70px; height: 22px;line-height: 22px;">1-16-3</div>
-        <div id="loc-0101703" class="loc" style="top:448px; left:1352px; width:70px; height: 22px;line-height: 22px;">1-17-3</div>
-        <div id="loc-0101803" class="loc" style="top:448px; left:1424px; width:70px; height: 22px;line-height: 22px;">1-18-3</div>
-        <div id="loc-0101903" class="loc" style="top:448px; left:1496px; width:70px; height: 22px;line-height: 22px;">1-19-3</div>
-        <div id="loc-0102003" class="loc" style="top:448px; left:1568px; width:70px; height: 22px;line-height: 22px;">1-20-3</div>
-        <div id="loc-0102103" class="loc" style="top:448px; left:1640px; width:70px; height: 22px;line-height: 22px;">1-21-3</div>
-        <div id="loc-0102203" class="loc" style="top:448px; left:1712px; width:70px; height: 22px;line-height: 22px;">1-22-3</div>
-        <div id="loc-0102303" class="loc" style="top:448px; left:1784px; width:70px; height: 22px;line-height: 22px;">1-23-3</div>
-        <div id="loc-0102403" class="loc" style="top:448px; left:1856px; width:70px; height: 22px;line-height: 22px;">1-24-3</div>
-    </div>
-    <div class="">
-        <div id="loc-0100102" class="loc" style="top:472px; left:200px; width:70px; height: 22px;line-height: 22px;">1-1-2</div>
-        <div id="loc-0100202" class="loc" style="top:472px; left:272px; width:70px; height: 22px;line-height: 22px;">1-2-2</div>
-        <div id="loc-0100302" class="loc" style="top:472px; left:344px; width:70px; height: 22px;line-height: 22px;">1-3-2</div>
-        <div id="loc-0100402" class="loc" style="top:472px; left:416px; width:70px; height: 22px;line-height: 22px;">1-4-2</div>
-        <div id="loc-0100502" class="loc" style="top:472px; left:488px; width:70px; height: 22px;line-height: 22px;">1-5-2</div>
-        <div id="loc-0100602" class="loc" style="top:472px; left:560px; width:70px; height: 22px;line-height: 22px;">1-6-2</div>
-        <div id="loc-0100702" class="loc" style="top:472px; left:632px; width:70px; height: 22px;line-height: 22px;">1-7-2</div>
-        <div id="loc-0100802" class="loc" style="top:472px; left:704px; width:70px; height: 22px;line-height: 22px;">1-8-2</div>
-        <div id="loc-0100902" class="loc" style="top:472px; left:776px; width:70px; height: 22px;line-height: 22px;">1-9-2</div>
-        <div id="loc-0101002" class="loc" style="top:472px; left:848px; width:70px; height: 22px;line-height: 22px;">1-10-2</div>
-        <div id="loc-0101102" class="loc" style="top:472px; left:920px; width:70px; height: 22px;line-height: 22px;">1-11-2</div>
-        <div id="loc-0101202" class="loc" style="top:472px; left:992px; width:70px; height: 22px;line-height: 22px;">1-12-2</div>
-        <div id="loc-0101302" class="loc" style="top:472px; left:1064px; width:70px; height: 22px;line-height: 22px;">1-13-2</div>
-        <div id="loc-0101402" class="loc" style="top:472px; left:1136px; width:70px; height: 22px;line-height: 22px;">1-14-2</div>
-        <div id="loc-0101502" class="loc" style="top:472px; left:1208px; width:70px; height: 22px;line-height: 22px;">1-15-2</div>
-        <div id="loc-0101602" class="loc" style="top:472px; left:1280px; width:70px; height: 22px;line-height: 22px;">1-16-2</div>
-        <div id="loc-0101702" class="loc" style="top:472px; left:1352px; width:70px; height: 22px;line-height: 22px;">1-17-2</div>
-        <div id="loc-0101802" class="loc" style="top:472px; left:1424px; width:70px; height: 22px;line-height: 22px;">1-18-2</div>
-        <div id="loc-0101902" class="loc" style="top:472px; left:1496px; width:70px; height: 22px;line-height: 22px;">1-19-2</div>
-        <div id="loc-0102002" class="loc" style="top:472px; left:1568px; width:70px; height: 22px;line-height: 22px;">1-20-2</div>
-        <div id="loc-0102102" class="loc" style="top:472px; left:1640px; width:70px; height: 22px;line-height: 22px;">1-21-2</div>
-        <div id="loc-0102202" class="loc" style="top:472px; left:1712px; width:70px; height: 22px;line-height: 22px;">1-22-2</div>
-        <div id="loc-0102302" class="loc" style="top:472px; left:1784px; width:70px; height: 22px;line-height: 22px;">1-23-2</div>
-        <div id="loc-0102402" class="loc" style="top:472px; left:1856px; width:70px; height: 22px;line-height: 22px;">1-24-2</div>
-    </div>
-    <div class="">
-        <div id="loc-0100101" class="loc" style="top:496px; left:200px; width:70px; height: 22px;line-height: 22px;">1-1-1</div>
-        <div id="loc-0100201" class="loc" style="top:496px; left:272px; width:70px; height: 22px;line-height: 22px;">1-2-1</div>
-        <div id="loc-0100301" class="loc" style="top:496px; left:344px; width:70px; height: 22px;line-height: 22px;">1-3-1</div>
-        <div id="loc-0100401" class="loc" style="top:496px; left:416px; width:70px; height: 22px;line-height: 22px;">1-4-1</div>
-        <div id="loc-0100501" class="loc" style="top:496px; left:488px; width:70px; height: 22px;line-height: 22px;">1-5-1</div>
-        <div id="loc-0100601" class="loc" style="top:496px; left:560px; width:70px; height: 22px;line-height: 22px;">1-6-1</div>
-        <div id="loc-0100701" class="loc" style="top:496px; left:632px; width:70px; height: 22px;line-height: 22px;">1-7-1</div>
-        <div id="loc-0100801" class="loc" style="top:496px; left:704px; width:70px; height: 22px;line-height: 22px;">1-8-1</div>
-        <div id="loc-0100901" class="loc" style="top:496px; left:776px; width:70px; height: 22px;line-height: 22px;">1-9-1</div>
-        <div id="loc-0101001" class="loc" style="top:496px; left:848px; width:70px; height: 22px;line-height: 22px;">1-10-1</div>
-        <div id="loc-0101101" class="loc" style="top:496px; left:920px; width:70px; height: 22px;line-height: 22px;">1-11-1</div>
-        <div id="loc-0101201" class="loc" style="top:496px; left:992px; width:70px; height: 22px;line-height: 22px;">1-12-1</div>
-        <div id="loc-0101301" class="loc" style="top:496px; left:1064px; width:70px; height: 22px;line-height: 22px;">1-13-1</div>
-        <div id="loc-0101401" class="loc" style="top:496px; left:1136px; width:70px; height: 22px;line-height: 22px;">1-14-1</div>
-        <div id="loc-0101501" class="loc" style="top:496px; left:1208px; width:70px; height: 22px;line-height: 22px;">1-15-1</div>
-        <div id="loc-0101601" class="loc" style="top:496px; left:1280px; width:70px; height: 22px;line-height: 22px;">1-16-1</div>
-        <div id="loc-0101701" class="loc" style="top:496px; left:1352px; width:70px; height: 22px;line-height: 22px;">1-17-1</div>
-        <div id="loc-0101801" class="loc" style="top:496px; left:1424px; width:70px; height: 22px;line-height: 22px;">1-18-1</div>
-        <div id="loc-0101901" class="loc" style="top:496px; left:1496px; width:70px; height: 22px;line-height: 22px;">1-19-1</div>
-        <div id="loc-0102001" class="loc" style="top:496px; left:1568px; width:70px; height: 22px;line-height: 22px;">1-20-1</div>
-        <div id="loc-0102101" class="loc" style="top:496px; left:1640px; width:70px; height: 22px;line-height: 22px;">1-21-1</div>
-        <div id="loc-0102201" class="loc" style="top:496px; left:1712px; width:70px; height: 22px;line-height: 22px;">1-22-1</div>
-        <div id="loc-0102301" class="loc" style="top:496px; left:1784px; width:70px; height: 22px;line-height: 22px;">1-23-1</div>
-        <div id="loc-0102401" class="loc" style="top:496px; left:1856px; width:70px; height: 22px;line-height: 22px;">1-24-1</div>
+        <div id="loc-0100101" class="loc" style="top:396px; left:200px; width:70px; height: 22px;line-height: 22px;">1-1-1</div>
+        <div id="loc-0100201" class="loc" style="top:396px; left:272px; width:70px; height: 22px;line-height: 22px;">1-2-1</div>
+        <div id="loc-0100301" class="loc" style="top:396px; left:344px; width:70px; height: 22px;line-height: 22px;">1-3-1</div>
+        <div id="loc-0100401" class="loc" style="top:396px; left:416px; width:70px; height: 22px;line-height: 22px;">1-4-1</div>
+        <div id="loc-0100501" class="loc" style="top:396px; left:488px; width:70px; height: 22px;line-height: 22px;">1-5-1</div>
+        <div id="loc-0100601" class="loc" style="top:396px; left:560px; width:70px; height: 22px;line-height: 22px;">1-6-1</div>
+        <div id="loc-0100701" class="loc" style="top:396px; left:632px; width:70px; height: 22px;line-height: 22px;">1-7-1</div>
+        <div id="loc-0100801" class="loc" style="top:396px; left:704px; width:70px; height: 22px;line-height: 22px;">1-8-1</div>
+        <div id="loc-0100901" class="loc" style="top:396px; left:776px; width:70px; height: 22px;line-height: 22px;">1-9-1</div>
+        <div id="loc-0101001" class="loc" style="top:396px; left:848px; width:70px; height: 22px;line-height: 22px;">1-10-1</div>
+        <div id="loc-0101101" class="loc" style="top:396px; left:920px; width:70px; height: 22px;line-height: 22px;">1-11-1</div>
+        <div id="loc-0101201" class="loc" style="top:396px; left:992px; width:70px; height: 22px;line-height: 22px;">1-12-1</div>
+        <div id="loc-0101301" class="loc" style="top:396px; left:1064px; width:70px; height: 22px;line-height: 22px;">1-13-1</div>
+        <div id="loc-0101401" class="loc" style="top:396px; left:1136px; width:70px; height: 22px;line-height: 22px;">1-14-1</div>
+<!--        <div id="loc-0101501" class="loc" style="top:496px; left:1208px; width:70px; height: 22px;line-height: 22px;">1-15-1</div>-->
+<!--        <div id="loc-0101601" class="loc" style="top:496px; left:1280px; width:70px; height: 22px;line-height: 22px;">1-16-1</div>-->
+<!--        <div id="loc-0101701" class="loc" style="top:496px; left:1352px; width:70px; height: 22px;line-height: 22px;">1-17-1</div>-->
+<!--        <div id="loc-0101801" class="loc" style="top:496px; left:1424px; width:70px; height: 22px;line-height: 22px;">1-18-1</div>-->
+<!--        <div id="loc-0101901" class="loc" style="top:496px; left:1496px; width:70px; height: 22px;line-height: 22px;">1-19-1</div>-->
+<!--        <div id="loc-0102001" class="loc" style="top:496px; left:1568px; width:70px; height: 22px;line-height: 22px;">1-20-1</div>-->
+<!--        <div id="loc-0102101" class="loc" style="top:496px; left:1640px; width:70px; height: 22px;line-height: 22px;">1-21-1</div>-->
+<!--        <div id="loc-0102201" class="loc" style="top:496px; left:1712px; width:70px; height: 22px;line-height: 22px;">1-22-1</div>-->
+<!--        <div id="loc-0102301" class="loc" style="top:496px; left:1784px; width:70px; height: 22px;line-height: 22px;">1-23-1</div>-->
+<!--        <div id="loc-0102401" class="loc" style="top:496px; left:1856px; width:70px; height: 22px;line-height: 22px;">1-24-1</div>-->
 
-        <div class="rackDescs" id="lb_desc11" style="top:530px; left:1450px; width:150px;height: 23px;line-height: 23px">1鎺掕揣鏋朵晶瑙嗗浘</div>
+        <div class="rackDescs" id="lb_desc11" style="top:430px; left:850px; width:150px;height: 23px;line-height: 23px">1鎺掕揣鏋朵晶瑙嗗浘</div>
     </div>
 
     <div class="button item-group">
-        <span class="site machine-auto-flag" style="color:#FFFFFF; top:550px; left:300px">绌哄簱浣�</span>
-        <span class="site machine-stock-move-flag" style="color:#FFFFFF; top:550px; left:364px">鍦ㄥ簱寰呮祴</span>
-        <span class="site machine-site-move-flag" style="color:#FFFFFF; top:550px; left:442px">鍦ㄥ簱娴嬭瘯涓�</span>
-        <span class="site machine-take-flag" style="color:#FFFFFF; top:550px; left:534px">娴嬭瘯鎴愬姛OK</span>
-        <span class="site machine-put-flag" style="color:#FFFFFF; top:550px; left:626px">娴嬭瘯澶辫触NG</span>
-        <span class="site machine-error-flag" style="color:#FFFFFF; top:550px; left:716px">寮傚父鎶ヨ</span>
+        <span class="site machine-auto-flag" style="color:#FFFFFF; top:450px; left:300px">绌哄簱浣�</span>
+        <span class="site machine-stock-move-flag" style="color:#FFFFFF; top:450px; left:364px">鍦ㄥ簱寰呮祴</span>
+        <span class="site machine-site-move-flag" style="color:#FFFFFF; top:450px; left:442px">鍦ㄥ簱娴嬭瘯涓�</span>
+        <span class="site machine-take-flag" style="color:#FFFFFF; top:450px; left:534px">娴嬭瘯鎴愬姛OK</span>
+        <span class="site machine-put-flag" style="color:#FFFFFF; top:450px; left:626px">娴嬭瘯澶辫触NG</span>
+        <span class="site machine-error-flag" style="color:#FFFFFF; top:450px; left:716px">寮傚父鎶ヨ</span>
     </div>
 
     <div id="body">
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 2fb9543..8c2ed64 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -59,12 +59,6 @@
                     <!--            <span>&nbsp;</span>-->
                     <input id="crn1" disabled="disabled">
                 </div>
-                <div class="crn-command-item">
-                    <label>2#</label>
-                    <button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
-                    <!--            <span>&nbsp;</span>-->
-                    <input id="crn2" disabled="disabled">
-                </div>
             </div>
             <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
             <div class="crn-state">
@@ -131,7 +125,6 @@
                     <span class="select-title">鍫嗗灈鏈哄彿</span>
                     <div class="select-container">
                         <label><input type="radio" name="crnSelect" value="1" checked>&nbsp;1鍙峰爢鍨涙満</label>
-                        <label><input type="radio" name="crnSelect" value="2">&nbsp;2鍙峰爢鍨涙満</label>
                     </div>
                 </div>
                 <!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->

--
Gitblit v1.9.1