Merge remote-tracking branch 'origin/skwcs' into tzskwcs

Junjie

2023-10-09 31db311cbc564a85ed843913c32017c77705e148

Merge remote-tracking branch 'origin/skwcs' into tzskwcs

 src/main/java/com/zy/asrs/domain/param/RobotReportActionStatusParam.java

@@ -23,6 +23,7 @@
    //结果讯息
    private String message;

    //站点
    private Integer from_ws;

}

 src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java

@@ -137,7 +137,8 @@
            WrkMast wrkMast1 = wrkMastMapper.selectByWorkNo(wrkNo);

            if (wrkMast1 != null) {
                int lev = Utils.getLev(wrkMast1.getLocNo());//目标楼层
                String locNO=wrkMast1.getIoType()<100?wrkMast1.getLocNo():wrkMast1.getSourceLocNo();
                int lev = Utils.getLev(locNO);//目标楼层

                //检测目标楼层车数量是否小于允许的最大数量
                boolean checkDispatchMaxNum = checkDispatchMaxNum(lev);

 src/main/resources/application.yml

@@ -38,7 +38,7 @@
  enable: false

wms:
  url: localhost:8081/tzskwms
  url: 10.10.10.40:8080/tzskwms

robot:
  url: http://10.10.10.41:7002