From 31db311cbc564a85ed843913c32017c77705e148 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期一, 09 十月 2023 10:43:59 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/skwcs' into tzskwcs --- src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java | 3 ++- src/main/java/com/zy/asrs/domain/param/RobotReportActionStatusParam.java | 1 + src/main/resources/application.yml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/domain/param/RobotReportActionStatusParam.java b/src/main/java/com/zy/asrs/domain/param/RobotReportActionStatusParam.java index b9c3ade..021e292 100644 --- a/src/main/java/com/zy/asrs/domain/param/RobotReportActionStatusParam.java +++ b/src/main/java/com/zy/asrs/domain/param/RobotReportActionStatusParam.java @@ -23,6 +23,7 @@ //缁撴灉璁伅 private String message; + //绔欑偣 private Integer from_ws; } diff --git a/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java b/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java index b9ed6ba..5747ee5 100644 --- a/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java +++ b/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); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index fc204ed..b45d4ac 100644 --- a/src/main/resources/application.yml +++ b/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 -- Gitblit v1.9.1