Skip to content

K
kwell-mes
Commit a7f2f3a5 authored by zhoumaotao's avatar zhoumaotao
Browse files
Options

Merge branch 'master' of gitlab.gavelinfo.com:gavelinfo/kwell-mes

parents 69cd2a88 f4ea9e17
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 4 deletions
gavel/src/main/java/com/gavel/kwell/service/impl/GpfkServiceImpl.java
View file @ a7f2f3a5
......@@ -774,7 +774,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
throwReturnMessage("用户不存在！");
}
if (StringUtils.equalsIgnoreCase(user.getTybz(), "Y")) {
throwReturnMessage("用户禁用！");
throwReturnMessage("用户禁用！");
}
if(!BooleanEnum.equalsYes(user.getLogin())){
throwReturnMessage("用户非登录用户！");
......@@ -938,7 +938,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
fkCondition2.setBzgxid(existLastWogylx.getBzgxid());
FkVO gpfkVo2 = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition2);
if(gpfkVo2!=null) {
if(existLastWogylx.getGylxid().equals(HzGylxEnum.ZP.getId())) {
if((existLastWogylx.getGxlx()).equals(YymkFKEnum.ZP.getId())) {
GphyCondition gphyCondition =new GphyCondition();
gphyCondition.setMid(gpfkVo2.getId());
if(gphyDao.queryIfZpwc(gphyCondition)!=0) {
......@@ -1084,7 +1084,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
fkCondition2.setBzgxid(existLastWogylx.getBzgxid());
FkVO gpfkVo2 = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition2);
if(gpfkVo2!=null) {
if(existLastWogylx.getGylxid().equals(HzGylxEnum.ZP.getId())) {
if((existLastWogylx.getGxlx()).equals(YymkFKEnum.ZP.getId())) {
GphyCondition gphyCondition =new GphyCondition();
gphyCondition.setMid(gpfkVo2.getId());
if(gphyDao.queryIfZpwc(gphyCondition)!=0) {
......@@ -1106,6 +1106,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
return curFkVo;
}
else if(snType.equals(SmCodeEnum.OKBZ.getId())) {
if(StringUtils.isEmpty(fkCondition.getWosncode())) {
throwReturnMessage("该订单序列号未输入，请重新确认！");
}
FkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
if(gpfkVo==null) {
Gpfk gpfk = new Gpfk();
......@@ -1131,6 +1134,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
gpfk.setHgbz("Y");
gpfk.setHgsl(1.0);
gpfk.setBhgsl(0.0);
gpfk.setFkrid(UserInfoUtil.getId());
gpfk.setFkr(UserInfoUtil.getUserName());
gpfk.setFksj(DateUtils.getDateTime());
update(gpfk);
}
FkVO newFkVo =gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
......@@ -1147,6 +1153,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
return newFkVo;
}
else if(snType.equals(SmCodeEnum.NGBZ.getId())) {
if(StringUtils.isEmpty(fkCondition.getWosncode())) {
throwReturnMessage("该订单序列号未输入，请重新确认！");
}
FkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
if(gpfkVo==null) {
Gpfk gpfk = new Gpfk();
......@@ -1171,6 +1180,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
gpfk.setHgbz("N");
gpfk.setHgsl(0.0);
gpfk.setBhgsl(1.0);
gpfk.setFkrid(UserInfoUtil.getId());
gpfk.setFkr(UserInfoUtil.getUserName());
gpfk.setFksj(DateUtils.getDateTime());
update(gpfk);
}
FkVO newFkVo =gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
......@@ -1229,7 +1241,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
fkCondition2.setBzgxid(existLastWogylx.getBzgxid());
FkVO gpfkVo2 = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition2);
if(gpfkVo2!=null) {
if(existLastWogylx.getGylxid().equals(HzGylxEnum.ZP.getId())) {
if((existLastWogylx.getGxlx()).equals(YymkFKEnum.ZP.getId())) {
GphyCondition gphyCondition =new GphyCondition();
gphyCondition.setMid(gpfkVo2.getId());
if(gphyDao.queryIfZpwc(gphyCondition)!=0) {
......@@ -1252,6 +1264,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
return curFkVo;
}
else if(snType.equals(SmCodeEnum.OKBZ.getId())) {
if(StringUtils.isEmpty(fkCondition.getWosncode())) {
throwReturnMessage("该订单序列号未输入，请重新确认！");
}
FkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
if(gpfkVo==null) {
Gpfk gpfk = new Gpfk();
......@@ -1276,6 +1291,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
gpfk.setHgbz("Y");
gpfk.setHgsl(1.0);
gpfk.setBhgsl(0.0);
gpfk.setFkrid(UserInfoUtil.getId());
gpfk.setFkr(UserInfoUtil.getUserName());
gpfk.setFksj(DateUtils.getDateTime());
update(gpfk);
}
FkVO newFkVo =gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
......@@ -1292,6 +1310,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
return newFkVo;
}
else if(snType.equals(SmCodeEnum.NGBZ.getId())) {
if(StringUtils.isEmpty(fkCondition.getWosncode())) {
throwReturnMessage("该订单序列号未输入，请重新确认！");
}
FkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
if(gpfkVo==null) {
Gpfk gpfk = new Gpfk();
......@@ -1316,6 +1337,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
gpfk.setHgbz("N");
gpfk.setHgsl(0.0);
gpfk.setBhgsl(1.0);
gpfk.setFkrid(UserInfoUtil.getId());
gpfk.setFkr(UserInfoUtil.getUserName());
gpfk.setFksj(DateUtils.getDateTime());
update(gpfk);
}
FkVO newFkVo =gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
......
gavel/src/main/resources/templates/views/loginscan_view.html
View file @ a7f2f3a5
......@@ -133,6 +133,13 @@
localStorage.setItem("username",result.data.username||"未知用户");
// window.location.href = "index";
let mkurl=result.data.records.fkurl
if(!mkurl){
logalert(result.message||"该工序无法登录!")
$rygh.val("")
$gylx.val("")
$rygh.focus()
return
}
let mkid=result.data.records.modulecode
let bzlx=result.data.records.id
let gx=result.data.records.name
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment