#

Administrator

2024-07-25 6579f0b743e4d8262fc58fc25f7215aebf2246d1

#

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

@@ -1409,6 +1409,7 @@
            crnCommand.setDestinationPosX(locMast.getRow1().shortValue());     // 目标库位排
            crnCommand.setDestinationPosY(locMast.getBay1().shortValue());     // 目标库位列
            crnCommand.setDestinationPosZ(locMast.getLev1().shortValue());     // 目标库位层
            crnCommand.setSourceStaNo(crnStn.getPlatNo().shortValue());     // 源库位排
            if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
                log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
            } else {
@@ -1704,6 +1705,7 @@
                crnCommand.setDestinationPosX(crnStn.getRow().shortValue());     // 目标库位排
                crnCommand.setDestinationPosY(crnStn.getBay().shortValue());     // 目标库位列
                crnCommand.setDestinationPosZ(crnStn.getLev().shortValue());     // 目标库位层
                crnCommand.setDestinationStaNo(crnStn.getPlatNo().shortValue());
                if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
                    log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
                } else {

 src/main/java/com/zy/core/model/CrnSlave.java

@@ -37,6 +37,9 @@
        // 堆垛机站点编号
        private Integer staNo;

        // 堆垛机站点编号
        private Integer platNo;

        // 排
        private Integer row;


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

@@ -242,7 +242,7 @@
        }
//        convertRow(command);
        command.setCrnNo(slave.getId());
        short[] array = new short[10];
        short[] array = new short[12];
        array[0] = command.getAckFinish();
        array[1] = command.getTaskNo();
        array[2] = command.getTaskMode();
@@ -252,9 +252,9 @@
        array[6] = command.getDestinationPosX();
        array[7] = command.getDestinationPosY();
        array[8] = command.getDestinationPosZ();
//        array[9] = command.getSourceStaNo();
//        array[10] = command.getDestinationStaNo();
        array[9] = command.getCommand();
        array[9] = command.getSourceStaNo();
        array[10] = command.getDestinationStaNo();
        array[11] = command.getCommand();
        OperateResult result = siemensNet.Write("DB100.0", array);

        if (command.getAckFinish() == 0) {
@@ -273,12 +273,12 @@
                    command.getTaskModeType().toString(),    // 模式
                    command.getSourcePosX().intValue(),    // 源排
                    command.getSourcePosY().intValue(),    // 源列
                    command.getSourcePosZ().intValue(),    // 源层
                    null,    // 源站
                    command.getSourceStaNo().intValue(),    // 源层
                    command.getDestinationPosZ().intValue(),    // 源站
                    command.getDestinationPosX().intValue(),    // 目标排
                    command.getDestinationPosY().intValue(),    // 目标列
                    command.getDestinationPosZ().intValue(),    // 目标层
                    null,    // 目标站
                    command.getDestinationStaNo().intValue(),    // 目标站
                    null,    // 响应结果
                    null,    // 修改时间
                    null    // 修改人员

 src/main/resources/application.yml

@@ -240,7 +240,7 @@
  # 堆垛机6
  crn[5]:
    id: 6
    ip: 192.168.18.53
    ip: 192.168.14.190
    port: 102
    rack: 0
    slot: 0
@@ -251,6 +251,7 @@
    crnInStn[0]:
#      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 2077
      platNo: 1
      row: 23
      bay: 1
      lev: 1
@@ -258,6 +259,7 @@
    crnInStn[1]:
#      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 3011
      platNo: 3
      row: 23
      bay: 1
      lev: 2
@@ -265,6 +267,7 @@
    crnOutStn[0]:
#      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 2076
      platNo: 2
      row: 22
      bay: 1
      lev: 1
@@ -272,6 +275,7 @@
    crnOutStn[1]:
#      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 3012
      platNo: 4
      row: 22
      bay: 1
      lev: 2

 src/main/webapp/static/js/common.js

@@ -1,4 +1,4 @@
var baseUrl = "/jtwcs";
var baseUrl = "/ghjtwcs";

// 赋值
function setVal(el, val) {