src/main/java/com/zy/asrs/controller/ConsoleController.java

@@ -33,8 +33,8 @@
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.MelsecCrnThread;
import com.zy.core.thread.ScaleThread;
import com.zy.core.thread.SiemensCrnThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -248,7 +248,7 @@
        CrnDetailVo vo = new CrnDetailVo();
        for (CrnSlave crnSlave : slaveProperties.getCrn()) {
            if (crnSlave.getId().equals(crnNo)) {
                MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
                SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
                CrnProtocol crnProtocol = crnThread.getCrnProtocol();
                vo.setCrnNo(crnNo);
                vo.setWorkNo(crnProtocol.getTaskNo());

 src/main/java/com/zy/asrs/controller/SiteController.java

@@ -169,6 +169,7 @@
    public R siteDetlUpdate(@RequestParam Integer siteId,
                            @RequestParam Short workNo,
                            @RequestParam Short staNo,
                            @RequestParam Short palletSize,
                            @RequestParam String pakMk){
        for (DevpSlave devp : slaveProperties.getDevp()) {
            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
@@ -187,11 +188,13 @@
                    if (staNo != null) {
                        staProtocol.setStaNo(staNo);
                    }
                    if (palletSize != null) {
                        staProtocol.setPalletSize(palletSize);
                    }
                    if (pakMk != null) {
                        staProtocol.setPakMk(pakMk.equals("Y"));
                    }

                    staProtocol.setPalletSize((short) 1);
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    if (result) {
                        return R.ok();

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -364,26 +364,30 @@
                    staProtocol = staProtocol.clone();
                }

                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk()) {
                if (staProtocol.isAutoing()
                        && staProtocol.isLoading()
                        && staProtocol.isInEnable()
                        && staProtocol.getWorkNo() > 0
                        && staProtocol.isPakMk()) {
                    News.warnNoLog(""+mark+" - 0"+" - 开始执行");

                    // 获取条码扫描仪信息
                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
                    if (barcodeThread == null) {
                        continue;
                    }
                    String barcode = barcodeThread.getBarcode();
                    if(!Cools.isEmpty(barcode)) {
                        News.info(""+mark+" - 1"+" - {}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
                        if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
                            continue;
                        }
                    } else {
                        continue;
                    }
//                    // 获取条码扫描仪信息
//                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
//                    if (barcodeThread == null) {
//                        continue;
//                    }
//                    String barcode = barcodeThread.getBarcode();
//                    if(!Cools.isEmpty(barcode)) {
//                        News.info(""+mark+" - 1"+" - {}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
//                        if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
//                            continue;
//                        }
//                    } else {
//                        continue;
//                    }

                    WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode);
//                    WrkMast wrkMast = wrkMastMapper.selectPakInStep3(staProtocol.getWorkNo().intValue());
//                    WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode);
                    WrkMast wrkMast = wrkMastMapper.selectPakInStep3(staProtocol.getWorkNo().intValue());
                    if (wrkMast == null) {
                        // 无拣料数据
                        continue;
@@ -409,11 +413,11 @@
                            .eq("crn_no", wrkMast.getCrnNo()); // 堆垛机号
                    StaDesc staDesc = staDescService.selectOne(wrapper);
                    if (Cools.isEmpty(staDesc)) {
                        News.error(""+mark+" - 2"+" - 入库路径不存在！type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo());
                        staProtocol.setWorkNo((short) 9989);
                        staProtocol.setStaNo((short) (pickSta.getStaNo().shortValue()-(short)1));
                        devpThread.setPakMk(staProtocol.getSiteId(), false);
                        MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
//                        News.error(""+mark+" - 2"+" - 入库路径不存在！type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo());
//                        staProtocol.setWorkNo((short) 9989);
//                        staProtocol.setStaNo((short) (pickSta.getStaNo().shortValue()-(short)1));
//                        devpThread.setPakMk(staProtocol.getSiteId(), false);
//                        MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                        //LED
                        LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
                        // led 异常显示
@@ -1650,20 +1654,20 @@
//                ledCommand.setSourceStaNo(wrkMast.getSourceStaNo());
                if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
                    List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
                    try{
                        if (wrkMast.getIoType()>100){
                            for (WrkDetl wrkDetl : wrkDetls){
                                LocDetl locDetl = locDetlService.selectMatnrSpecs(wrkDetl.getMatnr(), wrkDetl.getSpecs(), wrkMast.getSourceLocNo());
                                wrkDetl.setWeight(locDetl.getAnfme());
                            }
                        }else {
                            for (WrkDetl wrkDetl : wrkDetls){
                                wrkDetl.setWeight(wrkDetl.getAnfme());
                            }
                        }
                    }catch (Exception e){
                        log.error("工作档案明细输入电视机失败1：异常信息==》"+e);
                    }
//                    try{
//                        if (wrkMast.getIoType()>100){
//                            for (WrkDetl wrkDetl : wrkDetls){
//                                LocDetl locDetl = locDetlService.selectMatnrSpecs(wrkDetl.getMatnr(), wrkDetl.getSpecs(), wrkMast.getSourceLocNo());
//                                wrkDetl.setWeight(locDetl.getAnfme());
//                            }
//                        }else {
//                            for (WrkDetl wrkDetl : wrkDetls){
//                                wrkDetl.setWeight(wrkDetl.getAnfme());
//                            }
//                        }
//                    }catch (Exception e){
//                        log.error("工作档案明细输入电视机失败1：异常信息==》"+e);
//                    }
                    wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(),wrkDetl.getWeight(),wrkDetl.getSpecs(),wrkDetl.getSku())));
                }
                commands.add(ledCommand);

 src/main/resources/application.yml

@@ -237,9 +237,15 @@
      led: ${wcs-slave.led[0].id}
    # 拣料入库口1
    pickSta[0]:
      staNo: 102
      staNo: 1058
      barcode: ${wcs-slave.barcode[0].id}
      backSta: 101
      backSta: 1058
      led: ${wcs-slave.led[0].id}
    # 拣料入库口2
    pickSta[1]:
      staNo: 1064
      barcode: ${wcs-slave.barcode[0].id}
      backSta: 1064
      led: ${wcs-slave.led[0].id}
    # 出库口1
    outSta[0]:

 src/main/webapp/static/js/console.map.js

@@ -1 +1 @@
mapInfo = {"mapName":"YTFLWCS","rackCount":16,"crnCount":4,"stbCount":16,"hpPosition":0,"minBayNo":2,"floors":1,"racks":[{"type":"rack","id":"rack23","top":735,"left":563,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack26","top":828,"left":565,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack25","top":805,"left":565,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack24","top":757,"left":563,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack19","top":621,"left":563,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack22","top":713,"left":563,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack21","top":691,"left":563,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack20","top":643,"left":563,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack4","top":160,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":61},{"type":"rack","id":"rack5","top":182,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":61},{"type":"rack","id":"rack111","top":70,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":61},{"type":"rack","id":"rack15","top":504,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack18","top":597,"left":563,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack17","top":573,"left":563,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack16","top":525,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack11","top":389,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack14","top":481,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack13","top":460,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack12","top":412,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack7","top":277,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack10","top":368,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack9","top":345,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack8","top":299,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack2","top":114,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":61},{"type":"rack","id":"rack3","top":136,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":61},{"type":"rack","id":"rack6","top":239,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31}],"crns":[{"type":"crane","id":"crn-5","text":"5","top":667,"left":653,"width":93,"height":22},{"type":"crane","id":"crn-6","text":"6","top":781,"left":653,"width":93,"height":22},{"type":"crane","id":"crn-1","text":"1","top":213,"left":651,"width":93,"height":22},{"type":"track","id":"lb_track1","text":"","top":560,"left":482,"width":971,"height":2},{"type":"crane","id":"crn-2","text":"2","top":321,"left":662,"width":93,"height":22},{"type":"track","id":"lb_track3","text":"","top":444,"left":482,"width":972,"height":2},{"type":"crane","id":"crn-3","text":"3","top":436,"left":651,"width":93,"height":22},{"type":"track","id":"lb_track5","text":"","top":331,"left":483,"width":974,"height":2},{"type":"track","id":"lb_track4","text":"","top":221,"left":485,"width":975,"height":2},{"type":"crane","id":"crn-4","text":"4","top":549,"left":651,"width":93,"height":22}],"areas":[{"type":"Control_floor","id":"tabControl_floor1","text":"楼层","top":68,"left":80,"width":1423,"height":863,"floors":[{"type":"floor","id":"page_floor1","text":"1F","top":4,"left":22,"width":1397,"height":855,"stns":[{"type":"stn","id":"site-10900","text":"1090","top":439,"left":207,"width":37,"height":20},{"type":"stn","id":"site-1091","text":"1091","top":437,"left":105,"width":37,"height":20},{"type":"stn","id":"site-1007","text":"1007","top":320,"left":184,"width":37,"height":20},{"type":"stn","id":"site-1002","text":"1002","top":269,"left":184,"width":37,"height":20},{"type":"stn","id":"site-1006","text":"1006","top":295,"left":184,"width":37,"height":20},{"type":"stn","id":"site-1004","text":"1004","top":295,"left":143,"width":37,"height":20},{"type":"stn","id":"site-1003","text":"1003","top":295,"left":102,"width":37,"height":20},{"type":"stn","id":"site-1090","text":"1090","top":857,"left":331,"width":58,"height":20},{"type":"stn","id":"site-1075","text":"1075","top":918,"left":255,"width":71,"height":20},{"type":"stn","id":"site-1076","text":"1076","top":897,"left":255,"width":71,"height":20},{"type":"stn","id":"site-1077","text":"1077","top":876,"left":255,"width":71,"height":20},{"type":"stn","id":"site-1078","text":"1078","top":855,"left":255,"width":71,"height":20},{"type":"stn","id":"site-1079","text":"1079","top":785,"left":255,"width":71,"height":64},{"type":"stn","id":"site-1047","text":"1047","top":762,"left":255,"width":71,"height":20},{"type":"stn","id":"site-1080","text":"1080","top":691,"left":255,"width":71,"height":66},{"type":"stn","id":"site-1081","text":"1081","top":622,"left":255,"width":71,"height":66},{"type":"stn","id":"site-1082","text":"1082","top":552,"left":255,"width":71,"height":66},{"type":"stn","id":"site-1034","text":"1034","top":527,"left":255,"width":71,"height":20},{"type":"stn","id":"site-1083","text":"1083","top":429,"left":255,"width":71,"height":77},{"type":"stn","id":"site-1084","text":"1084","top":347,"left":255,"width":71,"height":77},{"type":"stn","id":"site-1085","text":"1085","top":266,"left":255,"width":71,"height":77},{"type":"stn","id":"site-1018","text":"1018","top":241,"left":255,"width":71,"height":20},{"type":"stn","id":"site-1086","text":"1086","top":209,"left":255,"width":71,"height":20},{"type":"stn","id":"site-1087","text":"1087","top":166,"left":255,"width":71,"height":37},{"type":"stn","id":"site-1088","text":"1088","top":141,"left":255,"width":71,"height":20},{"type":"stn","id":"site-1074","text":"1074","top":878,"left":1021,"width":59,"height":20},{"type":"stn","id":"site-1073","text":"1073","top":857,"left":1021,"width":59,"height":20},{"type":"stn","id":"site-1071","text":"1071","top":878,"left":891,"width":59,"height":20},{"type":"stn","id":"site-1072","text":"1072","top":857,"left":956,"width":59,"height":20},{"type":"stn","id":"site-1070","text":"1070","top":857,"left":891,"width":59,"height":20},{"type":"stn","id":"site-1069","text":"1069","top":857,"left":827,"width":59,"height":20},{"type":"stn","id":"site-1068","text":"1068","top":878,"left":762,"width":59,"height":20},{"type":"stn","id":"site-1067","text":"1067","top":857,"left":762,"width":59,"height":20},{"type":"stn","id":"site-1066","text":"1066","top":857,"left":697,"width":59,"height":20},{"type":"stn","id":"site-1065","text":"1065","top":899,"left":571,"width":59,"height":20},{"type":"stn","id":"site-1063","text":"1063","top":899,"left":633,"width":59,"height":20},{"type":"stn","id":"site-1062","text":"1062","top":878,"left":633,"width":59,"height":20},{"type":"stn","id":"site-1061","text":"1061","top":857,"left":633,"width":59,"height":20},{"type":"stn","id":"site-1058","text":"1058","top":921,"left":509,"width":59,"height":20},{"type":"stn","id":"site-1057","text":"1057","top":899,"left":509,"width":59,"height":20},{"type":"stn","id":"site-1056","text":"1056","top":878,"left":509,"width":59,"height":20},{"type":"stn","id":"site-1060","text":"1060","top":857,"left":570,"width":59,"height":20},{"type":"stn","id":"site-1055","text":"1055","top":857,"left":509,"width":59,"height":20},{"type":"stn","id":"site-1054","text":"1054","top":857,"left":448,"width":59,"height":20},{"type":"stn","id":"site-1053","text":"1053","top":857,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1050","text":"1050","top":831,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1052","text":"1052","top":806,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1051","text":"1051","top":806,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1046","text":"1046","top":782,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1049","text":"1049","top":758,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1048","text":"1048","top":758,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1043","text":"1043","top":726,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1045","text":"1045","top":693,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1044","text":"1044","top":693,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1040","text":"1040","top":669,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1042","text":"1042","top":645,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1041","text":"1041","top":645,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1037","text":"1037","top":607,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1039","text":"1039","top":575,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1038","text":"1038","top":575,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1033","text":"1033","top":551,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1036","text":"1036","top":527,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1035","text":"1035","top":527,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1030","text":"1030","top":493,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1032","text":"1032","top":461,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1031","text":"1031","top":461,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1027","text":"1027","top":437,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1029","text":"1029","top":413,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1028","text":"1028","top":413,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1024","text":"1024","top":383,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1026","text":"1026","top":347,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1025","text":"1025","top":347,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1021","text":"1021","top":323,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1023","text":"1023","top":300,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1022","text":"1022","top":300,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1017","text":"1017","top":266,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1020","text":"1020","top":241,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1019","text":"1019","top":241,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1014","text":"1014","top":209,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1016","text":"1016","top":183,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1015","text":"1015","top":183,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1011","text":"1011","top":161,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1012","text":"1012","top":137,"left":394,"width":59,"height":20},{"type":"stn","id":"site-1008","text":"1008","top":115,"left":187,"width":63,"height":20},{"type":"stn","id":"site-1009","text":"1009","top":115,"left":255,"width":71,"height":20},{"type":"stn","id":"site-1089","text":"1089","top":115,"left":331,"width":58,"height":20},{"type":"stn","id":"site-1010","text":"1010","top":115,"left":395,"width":59,"height":20},{"type":"stn","id":"site-1013","text":"1013","top":137,"left":461,"width":100,"height":20}]}]}]}
mapInfo = {"mapName":"YTFLWCS","rackCount":16,"crnCount":4,"stbCount":16,"hpPosition":0,"minBayNo":2,"floors":1,"racks":[{"type":"rack","id":"rack23","top":735,"left":563,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack26","top":828,"left":565,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack25","top":805,"left":565,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack24","top":757,"left":563,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack19","top":621,"left":563,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack22","top":713,"left":563,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack21","top":691,"left":563,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack20","top":643,"left":563,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack4","top":160,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":61},{"type":"rack","id":"rack5","top":182,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":61},{"type":"rack","id":"rack111","top":70,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":61},{"type":"rack","id":"rack15","top":504,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack18","top":597,"left":563,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack17","top":573,"left":563,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack16","top":525,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack11","top":389,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack14","top":481,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack13","top":460,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack12","top":412,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack7","top":277,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack10","top":368,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack9","top":345,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack8","top":299,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31},{"type":"rack","id":"rack2","top":114,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":61},{"type":"rack","id":"rack3","top":136,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":61},{"type":"rack","id":"rack6","top":239,"left":562,"width":846,"height":20,"minBayNo":2,"maxBayNo":31}],"crns":[{"type":"crane","id":"crn-5","text":"5","top":667,"left":653,"width":93,"height":22},{"type":"crane","id":"crn-6","text":"6","top":781,"left":653,"width":93,"height":22},{"type":"crane","id":"crn-1","text":"1","top":213,"left":651,"width":93,"height":22},{"type":"track","id":"lb_track1","text":"","top":560,"left":482,"width":971,"height":2},{"type":"crane","id":"crn-2","text":"2","top":321,"left":662,"width":93,"height":22},{"type":"track","id":"lb_track3","text":"","top":444,"left":482,"width":972,"height":2},{"type":"crane","id":"crn-3","text":"3","top":436,"left":651,"width":93,"height":22},{"type":"track","id":"lb_track5","text":"","top":331,"left":483,"width":974,"height":2},{"type":"track","id":"lb_track4","text":"","top":221,"left":485,"width":975,"height":2},{"type":"crane","id":"crn-4","text":"4","top":549,"left":651,"width":93,"height":22}],"areas":[{"type":"Control_floor","id":"tabControl_floor1","text":"楼层","top":68,"left":80,"width":1433,"height":885,"floors":[{"type":"floor","id":"page_floor1","text":"1F","top":4,"left":22,"width":1407,"height":877,"stns":[{"type":"stn","id":"site-1064","text":"1064","top":919,"left":633,"width":59,"height":20},{"type":"stn","id":"site-10900","text":"1090","top":439,"left":207,"width":37,"height":20},{"type":"stn","id":"site-1091","text":"1091","top":437,"left":105,"width":37,"height":20},{"type":"stn","id":"site-1007","text":"1007","top":320,"left":184,"width":37,"height":20},{"type":"stn","id":"site-1002","text":"1002","top":269,"left":184,"width":37,"height":20},{"type":"stn","id":"site-1006","text":"1006","top":295,"left":184,"width":37,"height":20},{"type":"stn","id":"site-1004","text":"1004","top":295,"left":143,"width":37,"height":20},{"type":"stn","id":"site-1003","text":"1003","top":295,"left":102,"width":37,"height":20},{"type":"stn","id":"site-1090","text":"1090","top":857,"left":331,"width":58,"height":20},{"type":"stn","id":"site-1075","text":"1075","top":918,"left":255,"width":71,"height":20},{"type":"stn","id":"site-1076","text":"1076","top":897,"left":255,"width":71,"height":20},{"type":"stn","id":"site-1077","text":"1077","top":876,"left":255,"width":71,"height":20},{"type":"stn","id":"site-1078","text":"1078","top":855,"left":255,"width":71,"height":20},{"type":"stn","id":"site-1079","text":"1079","top":785,"left":255,"width":71,"height":64},{"type":"stn","id":"site-1047","text":"1047","top":762,"left":255,"width":71,"height":20},{"type":"stn","id":"site-1080","text":"1080","top":691,"left":255,"width":71,"height":66},{"type":"stn","id":"site-1081","text":"1081","top":622,"left":255,"width":71,"height":66},{"type":"stn","id":"site-1082","text":"1082","top":552,"left":255,"width":71,"height":66},{"type":"stn","id":"site-1034","text":"1034","top":527,"left":255,"width":71,"height":20},{"type":"stn","id":"site-1083","text":"1083","top":429,"left":255,"width":71,"height":77},{"type":"stn","id":"site-1084","text":"1084","top":347,"left":255,"width":71,"height":77},{"type":"stn","id":"site-1085","text":"1085","top":266,"left":255,"width":71,"height":77},{"type":"stn","id":"site-1018","text":"1018","top":241,"left":255,"width":71,"height":20},{"type":"stn","id":"site-1086","text":"1086","top":209,"left":255,"width":71,"height":20},{"type":"stn","id":"site-1087","text":"1087","top":166,"left":255,"width":71,"height":37},{"type":"stn","id":"site-1088","text":"1088","top":141,"left":255,"width":71,"height":20},{"type":"stn","id":"site-1074","text":"1074","top":878,"left":1021,"width":59,"height":20},{"type":"stn","id":"site-1073","text":"1073","top":857,"left":1021,"width":59,"height":20},{"type":"stn","id":"site-1071","text":"1071","top":878,"left":891,"width":59,"height":20},{"type":"stn","id":"site-1072","text":"1072","top":857,"left":956,"width":59,"height":20},{"type":"stn","id":"site-1070","text":"1070","top":857,"left":891,"width":59,"height":20},{"type":"stn","id":"site-1069","text":"1069","top":857,"left":827,"width":59,"height":20},{"type":"stn","id":"site-1068","text":"1068","top":878,"left":762,"width":59,"height":20},{"type":"stn","id":"site-1067","text":"1067","top":857,"left":762,"width":59,"height":20},{"type":"stn","id":"site-1066","text":"1066","top":857,"left":697,"width":59,"height":20},{"type":"stn","id":"site-1065","text":"1065","top":899,"left":571,"width":59,"height":20},{"type":"stn","id":"site-1063","text":"1063","top":899,"left":633,"width":59,"height":20},{"type":"stn","id":"site-1062","text":"1062","top":878,"left":633,"width":59,"height":20},{"type":"stn","id":"site-1061","text":"1061","top":857,"left":633,"width":59,"height":20},{"type":"stn","id":"site-1058","text":"1058","top":921,"left":509,"width":59,"height":20},{"type":"stn","id":"site-1057","text":"1057","top":899,"left":509,"width":59,"height":20},{"type":"stn","id":"site-1056","text":"1056","top":878,"left":509,"width":59,"height":20},{"type":"stn","id":"site-1060","text":"1060","top":857,"left":570,"width":59,"height":20},{"type":"stn","id":"site-1055","text":"1055","top":857,"left":509,"width":59,"height":20},{"type":"stn","id":"site-1054","text":"1054","top":857,"left":448,"width":59,"height":20},{"type":"stn","id":"site-1053","text":"1053","top":857,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1050","text":"1050","top":831,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1052","text":"1052","top":806,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1051","text":"1051","top":806,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1046","text":"1046","top":782,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1049","text":"1049","top":758,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1048","text":"1048","top":758,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1043","text":"1043","top":726,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1045","text":"1045","top":693,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1044","text":"1044","top":693,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1040","text":"1040","top":669,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1042","text":"1042","top":645,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1041","text":"1041","top":645,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1037","text":"1037","top":607,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1039","text":"1039","top":575,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1038","text":"1038","top":575,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1033","text":"1033","top":551,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1036","text":"1036","top":527,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1035","text":"1035","top":527,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1030","text":"1030","top":493,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1032","text":"1032","top":461,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1031","text":"1031","top":461,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1027","text":"1027","top":437,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1029","text":"1029","top":413,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1028","text":"1028","top":413,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1024","text":"1024","top":383,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1026","text":"1026","top":347,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1025","text":"1025","top":347,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1021","text":"1021","top":323,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1023","text":"1023","top":300,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1022","text":"1022","top":300,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1017","text":"1017","top":266,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1020","text":"1020","top":241,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1019","text":"1019","top":241,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1014","text":"1014","top":209,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1016","text":"1016","top":183,"left":461,"width":100,"height":20},{"type":"stn","id":"site-1015","text":"1015","top":183,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1011","text":"1011","top":161,"left":393,"width":59,"height":20},{"type":"stn","id":"site-1012","text":"1012","top":137,"left":394,"width":59,"height":20},{"type":"stn","id":"site-1008","text":"1008","top":115,"left":187,"width":63,"height":20},{"type":"stn","id":"site-1009","text":"1009","top":115,"left":255,"width":71,"height":20},{"type":"stn","id":"site-1089","text":"1089","top":115,"left":331,"width":58,"height":20},{"type":"stn","id":"site-1010","text":"1010","top":115,"left":395,"width":59,"height":20},{"type":"stn","id":"site-1013","text":"1013","top":137,"left":461,"width":100,"height":20}]}]}]}

 src/main/webapp/views/pipeline.html

@@ -148,6 +148,12 @@
                    </div>
                </div>
                <div class="form-item">
                    <label class="form-label">托盘尺寸:</label>
                    <div class="form-input">
                        <input id="palletSize" name="palletSize" type="number" class="layui-input" lay-verify="number" autocomplete="off">
                    </div>
                </div>
                <div class="form-item">
                    <label class="form-label">入库标记:</label>
                    <div class="form-input">
                        <input id="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off">
@@ -432,10 +438,11 @@
    });

    $(document).on('click ','#save', function () {
        http.post(baseUrl+ "/site//detl/update", {
        http.post(baseUrl+ "/site/detl/update", {
            siteId: $('#siteId').val(),
            workNo: $('#workNo').val(),
            staNo:  $('#staNo').val(),
            palletSize:  $('#palletSize').val(),
            pakMk: $('#pakMk').val()
        }, function (res) {
            layer.msg("修改成功",{icon: 1,});
@@ -445,6 +452,7 @@
        $('#siteId').val("");
        $('#workNo').val("");
        $('#staNo').val("");
        $('#palletSize').val("");
        $('#pakMk').val("");
        layer.close(layerDetl);
    })