#

18516761980

2020-09-12 326142c3254fcd2256c86e7db9e491666b868f6f

#

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

@@ -128,7 +128,7 @@
            /**
             * 堆垛机状态判断
             */
            if (crnProtocol.getAlarm() > 0) {
            if (crnProtocol.getAlarm1() > 0) {
                vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
            } else {
                if (crnProtocol.getTaskNo()>0) {

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

@@ -122,7 +122,7 @@
            vo.setXLocation(crnProtocol.getWalkPos() == 1?"是":"否");      // 走行定位
            vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"否":"是");      // 升降定位
            vo.setStop(crnProtocol.getCrnError1().controlStop||crnProtocol.getCrnError1().mainStop||crnProtocol.getCrnError1().remoteStop?"是":"否");       //  急停
            vo.setWarnCode(String.valueOf(crnProtocol.getAlarm()));  //  异常码
            vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()));  //  异常码
        }
        return R.ok().add(list);
    }

 src/main/java/com/zy/core/ServerBootstrap.java

@@ -33,8 +33,9 @@

    @PostConstruct
    @Async
    public void init(){
    public void init() throws InterruptedException {
        log.info("核心控制层开始初始化...............................................");
        Thread.sleep(2000);
        // 初始化消息队列
        initMq();
        // 初始化下位机线程

 src/main/java/com/zy/core/thread/CrnThread.java

@@ -114,7 +114,7 @@
     * 读取状态
     */
    private void readStatus(){
        OperateResultExOne<byte[]> result = siemensNet.Read("DB8.18", (short) 56);
        OperateResultExOne<byte[]> result = siemensNet.Read("DB8.18", (short) 62);
        if (result.IsSuccess) {
            if (null == crnProtocol) {
                crnProtocol = new CrnProtocol();

 src/main/resources/application.yml

@@ -42,8 +42,8 @@
  # 堆垛机1
  crn[0]:
    id: 1
    ip: 192.168.10.39
    port: 5015
    ip: 192.168.6.9
    port: 102
    rack: 0
    slot: 0
    # 偏移量，当堆垛机站点列号=1时，偏移量=2
@@ -51,47 +51,37 @@
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 4
      staNo: 5
      row: 2
      bay: 1
      bay: 0
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 2
      staNo: 6
      row: 1
      bay: 1
      bay: 0
      lev: 1
  # 输送线
  devp[0]:
    id: 1
    ip: 192.168.10.65
    port: 6000
    ip: 192.168.6.120
    port: 102
    rack: 0
    slot: 1
    # 入库口1
    inSta[0]:
      staNo: 3
      barcode: ${wcs-slave.barcode[0].id}
    # 入库口2
    inSta[1]:
      staNo: 7
      staNo: 1
      barcode: ${wcs-slave.barcode[0].id}
    # 空板入库口1
    emptyInSta[0]:
      staNo: 3
    # 空板入库口2
    emptyInSta[1]:
      staNo: 7
      staNo: 1
    # 出库口1
    outSta[0]:
      staNo: 1
    # 出库口2
    outSta[1]:
      staNo: 5
      staNo: 2
    # 拣料入库口
    pickSta[0]:
      staNo: 2
      staNo: 3
  # 条码扫描仪
  barcode[0]:
    id: 1

 src/main/webapp/static/css/console.css

@@ -183,8 +183,9 @@
    top: 122px;
    left: 100px;
    width: 100px;
    height: 40px;
    line-height: 40px
    height: 20px;
    line-height: 20px;
    position: absolute;
}

/* ------------------ 货架总成 ------------------ */
@@ -343,7 +344,7 @@
/* 入库口 */
.cargo-put {
    transform: rotateY(180deg);
    top: 285px;
    top: 265px;
    left: 313px;
    position: absolute;
    width: 50px;
@@ -371,7 +372,7 @@
}
/* 扫码器1 */
#code-decoder-1 {
    top: 320px;
    top: 300px;
    left: 200px;
}
/* 扫码器数据1 */

 src/main/webapp/views/console.html

@@ -95,11 +95,11 @@

    <!-- 第一列（宽度 100px） -->
    <div class="site-row site-row-1">
        <div id="site-7" class="site" style="height: 40px;line-height: 40px">7</div>
        <div id="site-4" class="site" style="height: 40px;line-height: 40px">4</div>
        <div id="site-3" class="site" style="height: 40px;line-height: 40px;">3</div>
        <div id="site-2" class="site" style="height: 40px;line-height: 40px">2</div>
        <div id="site-1" class="site" style="height: 40px;line-height: 40px">1</div>
        <div id="site-7" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">7</div>
        <div id="site-4" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">4</div>
        <div id="site-3" class="site" style="height: 20px;line-height: 20px;margin-bottom: 40px">3</div>
        <div id="site-2" class="site" style="height: 20px;line-height: 20px;margin-bottom: 0px">2</div>
        <div id="site-1" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">1</div>
    </div>

    <!-- 货架 + 堆垛机 + 入库站点 + 出库站点 -->
@@ -459,7 +459,8 @@
                } else if (res.code === 403){
                    parent.location.href = baseUrl+"/login";
                }  else {
                    alert(res.msg);
                    console.log(res.msg);
                    
                }
            }
        });
@@ -486,7 +487,7 @@
                } else if (res.code === 403){
                    parent.location.href = baseUrl+"/login";
                }  else {
                    alert(res.msg);
                    console.log(res.msg);
                }
            }
        });
@@ -513,7 +514,7 @@
                } else if (res.code === 403){
                    parent.location.href = baseUrl+"/login";
                }  else {
                    alert(res.msg);
                    console.log(res.msg);
                }
            }
        });
@@ -537,7 +538,7 @@
                } else if (res.code === 403){
                    parent.location.href = baseUrl+"/login";
                }  else {
                    alert(res.msg);
                    console.log(res.msg);
                }
            }
        });
@@ -558,7 +559,7 @@
                } else if (res.code === 403){
                    parent.location.href = baseUrl+"/login";
                }  else {
                    alert(res.msg);
                    console.log(res.msg);
                }
            }
        });
@@ -657,7 +658,7 @@
                    targetTop += 160;
                    break;
                case 2:
                    targetTop += 120;
                    targetTop += 140;
                    break;
                case 3:
                    targetTop += 80;

 src/main/webapp/views/crn.html

@@ -96,7 +96,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>
        <!-- 源站/源库位 选择 -->