#
Administrator
2024-07-25 e628feceb32d3a42b85d2f25864700af82527d3d
#
3个文件已修改
26 ■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensCrnThread.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1696,10 +1696,9 @@
                crnCommand.setSourcePosX(sourceSta.getRow1().shortValue());     // 源库位排
                crnCommand.setSourcePosY(sourceSta.getBay1().shortValue());     // 源库位列
                crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue());     // 源库位层
                crnCommand.setDestinationPosX(crnStn.getRow().shortValue());     // 目标库位排
                crnCommand.setDestinationPosY(crnStn.getBay().shortValue());     // 目标库位列
                crnCommand.setDestinationPosZ(crnStn.getLev().shortValue());     // 目标库位层
                crnCommand.setDestinationStaNo(crnStn.getPlatNo().shortValue());
//                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));
src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -257,10 +257,13 @@
        array[11] = command.getCommand();
        OperateResult result = siemensNet.Write("DB100.0", array);
        if (command.getAckFinish() == 0) {
        if(!result.IsSuccess){
            return false;
        }
        if (command.getAckFinish().intValue() == 0) {
            short commandFinish = 1;
            Thread.sleep(100L);
            result = siemensNet.Write("DB100.18", commandFinish);
            result = siemensNet.Write("DB100.22", commandFinish);
        }
        try {
src/main/resources/application.yml
@@ -250,7 +250,7 @@
    # 堆垛机入库站点
    crnInStn[0]:
#      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 2077
      staNo: 3011
      platNo: 1
      row: 23
      bay: 1
@@ -258,15 +258,15 @@
    # 堆垛机入库站点
    crnInStn[1]:
#      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 3011
      platNo: 3
      staNo: 2076
      platNo: 4
      row: 23
      bay: 1
      lev: 2
    # 堆垛机出库站点
    crnOutStn[0]:
#      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 2076
      staNo: 3012
      platNo: 2
      row: 22
      bay: 1
@@ -274,8 +274,8 @@
    # 堆垛机出库站点
    crnOutStn[1]:
#      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 3012
      platNo: 4
      staNo: 2077
      platNo: 3
      row: 22
      bay: 1
      lev: 2