xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xjm:dev
Branches Tags
xjm:dev
xjm:master
..
compare: xjm:master
Branches Tags
xjm:dev
xjm:master

No commits in common. "dev" and "master" have entirely different histories.
dev ... master

2 changed files with 1 additions and 5 deletions
Show Stats Expand all files Collapse all files

2
ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/InController.java
View File

@ -251,7 +251,7 @@ public class InController extends Controller implements Runnable {
} }
// 巴河进料需要减两吨 // 巴河进料需要减两吨
if ((CliCacheData.SUP.getId() == 4 || CliCacheData.SUP.getId() == 5) && weight > 35){ if (CliCacheData.SUP.getId() == 4 && weight > 35){
weight -= 2; weight -= 2;
} }

4
ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java
View File

@ -251,10 +251,6 @@ public class SysuserSyncService extends BaseService {
return Result.failed(false, "登陆失败"); return Result.failed(false, "登陆失败");
} }
if(sysuser.getType() == UserTypeEnum.LEAD.getTypeid()){
return Result.failedstr("登陆失败。当前用户是公司管理员,请登陆结算中心系统");
}
if (sysuser.getType() == UserTypeEnum.SUPERMARKET.getTypeid() && sysuser.getEntityId() != CliCacheData.SUP.getId()) { if (sysuser.getType() == UserTypeEnum.SUPERMARKET.getTypeid() && sysuser.getEntityId() != CliCacheData.SUP.getId()) {
return Result.failedstr("登陆失败。当前系统是%s", CliCacheData.SUP.getName()); return Result.failedstr("登陆失败。当前系统是%s", CliCacheData.SUP.getName());
} }