#

1

2025-05-03 8cedbe419f6e561b4e8069bbaa8013ce4443fd09

#

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

@@ -294,6 +294,7 @@
                    vo.setDeviceStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc());   //  模式状态
                }
            }
            vo.setLaneNo(crnProtocol.getLaneNo());  //
            vo.setXspeed(crnProtocol.getXSpeed());  //  走行速度（m/min)
            vo.setYspeed(crnProtocol.getYSpeed());  //  升降速度（m/min)
            vo.setZspeed(crnProtocol.getZSpeed());  //  叉牙速度（m/min)

 src/main/java/com/zy/asrs/domain/vo/CrnListVo.java

@@ -9,6 +9,7 @@

    // 堆垛机号
    private Integer crnNo;
    private Integer laneNo;

    // 模式
    private String statusType = "-";

 src/main/resources/application-prod.yml

@@ -45,7 +45,6 @@
    # 出库口1
    outSta[0]:
      staNo: 102
      led: ${wcs-slave.led[0].id}
#      led: ${wcs-slave.led[0].id}
  # RGV穿梭车1
  rgv[0]:
@@ -128,7 +127,7 @@
    staNo: 281
    devpPlcId: 1
  crn[0]: #堆垛机1
    ip: 192.168.4.250
    ip: 10.10.123.30
    id: 1
    slot: 0
    demo: false
@@ -168,7 +167,7 @@
      lev: 1
      devpPlcId: ${wcs-slave.devp[0].id}
  crn[2]: #堆垛机1
    ip: 192.168.4.250
    ip: 10.10.10.30
    id: 3
    slot: 0
    demo: false

 src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8083
  port: 9090
  servlet:
    context-path: /@pom.build.finalName@

@@ -12,7 +12,7 @@
#    username: sa
#    password: sa@123
    driver-class-name: dm.jdbc.driver.DmDriver
    url: jdbc:dm://192.168.4.191:5236/SOURCE
    url: jdbc:dm://127.0.0.1:5236/SOURCE
    username: SYSDBA
    password: Zy@12345
  mvc:
@@ -65,13 +65,13 @@
  #url: 10.32.53.195:8080
  # WMS系统ip
  #  url: 10.210.157.109:8090
  url: 10.210.157.26:8090
  url: 10.210.157.26:9027
  # 入库任务申请接口
  #inboundTaskApplyPath: api/InterFace/inboundTaskApply
  inboundTaskApplyPath: sugood/inboundTaskApply
  #  inboundTaskApplyPath: open/asrs/inboundTaskApply
  # 任务状态反馈接口
  taskStatusFeedbackPath: sugood/taskStatusReport
  taskStatusFeedbackPath: external/wcs/wmsHeartBeat
  # 货位状态更新接口
  locationUpdatePath: api/InterFace/get_InterFace_TestStorage
  # 移库申请接口

 src/main/webapp/views/deviceOperate/crnOperate.html

@@ -18,6 +18,8 @@
                max-height="350" style="width: 100%">
                <el-table-column property="crnNo" label="堆垛机">
                </el-table-column>
                <el-table-column property="laneNo" label="巷道号">
                </el-table-column>
                <el-table-column property="workNo" label="工作号">
                </el-table-column>
                <el-table-column property="statusType" label="模式">