mt-ck/mt-qj-wms-hd
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: mt-ck:f0992ed9ce4742c8613cf9925a2ef9717dfd442b
Branches Tags
mt-ck:master
mt-ck:mt-qj-wms
mt-ck:mt-qj-wcs
...
compare: mt-ck:6eb2839b7a979d6c0696bf2f8a665e655d0e31e2
Branches Tags
mt-ck:master
mt-ck:mt-qj-wms
mt-ck:mt-qj-wcs

3 Commits
f0992ed9ce ... 6eb2839b7a

Author SHA1 Message Date
lgh
6eb2839b7a bug修改 2022-07-16 13:31:20 +08:00
lgh
8047bab61c Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd 
 Conflicts:
	6.program/wms-empty/src/main/java/com/mt/wms/empty/task/RunTaskUtils.java
 2022-07-15 16:11:30 +08:00
lgh
26e5b24c32 bug修改 2022-07-15 16:10:35 +08:00
2 changed files with 6 additions and 6 deletions
Show Stats Expand all files Collapse all files

8
6.program/wms-empty/src/main/java/com/mt/wms/empty/task/RunTaskUtils.java
View File

@ -79,16 +79,16 @@ public class RunTaskUtils {
Map<String, Object> yeya = new HashMap(); Map<String, Object> yeya = new HashMap();
//type=1为 入 //type=1为 入
yeya.put("type", 1); yeya.put("type", 1);
if ("YYT003".equals(startPoint.getNote())){ if ("YYT003".equals(currTask.getStartPosition())){
yeya.put("number", 3); yeya.put("number", 3);
} }
if ("YYT004".equals(startPoint.getNote())){ if ("YYT004".equals(currTask.getStartPosition())){
yeya.put("number", 4); yeya.put("number", 4);
} }
if ("YYT002".equals(startPoint.getNote())){ if ("YYT002".equals(currTask.getStartPosition())){
yeya.put("number", 2); yeya.put("number", 2);
} }
if ("YYT001".equals(startPoint.getNote())){ if ("YYT001".equals(currTask.getStartPosition())){
yeya.put("number", 1); yeya.put("number", 1);
} }
String yeyaJudgeStatus = JSON.toJSONString(yeya); String yeyaJudgeStatus = JSON.toJSONString(yeya);

4
6.program/wms-passport/src/main/java/com/mt/wms/passport/feign/fallback/PlatformUpmsServiceFallback.java
View File

@ -89,11 +89,11 @@ public class PlatformUpmsServiceFallback implements PlatformUpmsService {
*/ */
@Override @Override
public R<LoginUser> login(String mobile, String password) { public R<LoginUser> login(String mobile, String password) {
if (isDebug()) { /* if (isDebug()) {
log.warn("平台通用权限管理服务不可用，使用测试用户数据"); log.warn("平台通用权限管理服务不可用，使用测试用户数据");
return R.ok(LoginUser.builder().userId(1L).mobile("13588441519").userName("jiff") return R.ok(LoginUser.builder().userId(1L).mobile("13588441519").userName("jiff")
.orgId(1L).userType(LoginUser.USER_TYPE_PLATFORM).build()); .orgId(1L).userType(LoginUser.USER_TYPE_PLATFORM).build());
} }*/
return upmsService.login(mobile, password); return upmsService.login(mobile, password);
} }