diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/RunTaskUtils.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/RunTaskUtils.java index c8aaff3..7732fce 100644 --- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/RunTaskUtils.java +++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/RunTaskUtils.java @@ -79,16 +79,16 @@ public class RunTaskUtils { Map yeya = new HashMap(); //type=1为 入 yeya.put("type", 1); - if ("YYT003".equals(startPoint.getNote())){ + if ("YYT003".equals(currTask.getStartPosition())){ yeya.put("number", 3); } - if ("YYT004".equals(startPoint.getNote())){ + if ("YYT004".equals(currTask.getStartPosition())){ yeya.put("number", 4); } - if ("YYT002".equals(startPoint.getNote())){ + if ("YYT002".equals(currTask.getStartPosition())){ yeya.put("number", 2); } - if ("YYT001".equals(startPoint.getNote())){ + if ("YYT001".equals(currTask.getStartPosition())){ yeya.put("number", 1); } String yeyaJudgeStatus = JSON.toJSONString(yeya); diff --git a/6.program/wms-passport/src/main/java/com/mt/wms/passport/feign/fallback/PlatformUpmsServiceFallback.java b/6.program/wms-passport/src/main/java/com/mt/wms/passport/feign/fallback/PlatformUpmsServiceFallback.java index 572f35b..3549339 100644 --- a/6.program/wms-passport/src/main/java/com/mt/wms/passport/feign/fallback/PlatformUpmsServiceFallback.java +++ b/6.program/wms-passport/src/main/java/com/mt/wms/passport/feign/fallback/PlatformUpmsServiceFallback.java @@ -89,11 +89,11 @@ public class PlatformUpmsServiceFallback implements PlatformUpmsService { */ @Override public R login(String mobile, String password) { - if (isDebug()) { +/* if (isDebug()) { log.warn("平台通用权限管理服务不可用,使用测试用户数据"); return R.ok(LoginUser.builder().userId(1L).mobile("13588441519").userName("jiff") .orgId(1L).userType(LoginUser.USER_TYPE_PLATFORM).build()); - } + }*/ return upmsService.login(mobile, password); }