Skip to content

K
kwell-mes
Commit 2395ce3c authored by yff's avatar yff
Browse files
Options

修改BUG

parent f4098342
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 4 deletions
gavel/src/main/java/com/gavel/kwell/service/impl/GpfkServiceImpl.java
View file @ 2395ce3c
...@@ -774,7 +774,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -774,7 +774,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
throwReturnMessage("用户不存在！"); throwReturnMessage("用户不存在！");
} }
if (StringUtils.equalsIgnoreCase(user.getTybz(), "Y")) { if (StringUtils.equalsIgnoreCase(user.getTybz(), "Y")) {
throwReturnMessage("用户禁用！"); throwReturnMessage("用户禁用！");
} }
if(!BooleanEnum.equalsYes(user.getLogin())){ if(!BooleanEnum.equalsYes(user.getLogin())){
throwReturnMessage("用户非登录用户！"); throwReturnMessage("用户非登录用户！");
...@@ -938,7 +938,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -938,7 +938,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
fkCondition2.setBzgxid(existLastWogylx.getBzgxid()); fkCondition2.setBzgxid(existLastWogylx.getBzgxid());
FkVO gpfkVo2 = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition2); FkVO gpfkVo2 = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition2);
if(gpfkVo2!=null) { if(gpfkVo2!=null) {
if(existLastWogylx.getGylxid().equals(HzGylxEnum.ZP.getId())) { if((existLastWogylx.getGxlx()).equals(YymkFKEnum.ZP.getId())) {
GphyCondition gphyCondition =new GphyCondition(); GphyCondition gphyCondition =new GphyCondition();
gphyCondition.setMid(gpfkVo2.getId()); gphyCondition.setMid(gpfkVo2.getId());
if(gphyDao.queryIfZpwc(gphyCondition)!=0) { if(gphyDao.queryIfZpwc(gphyCondition)!=0) {
...@@ -1084,7 +1084,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1084,7 +1084,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
fkCondition2.setBzgxid(existLastWogylx.getBzgxid()); fkCondition2.setBzgxid(existLastWogylx.getBzgxid());
FkVO gpfkVo2 = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition2); FkVO gpfkVo2 = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition2);
if(gpfkVo2!=null) { if(gpfkVo2!=null) {
if(existLastWogylx.getGylxid().equals(HzGylxEnum.ZP.getId())) { if((existLastWogylx.getGxlx()).equals(YymkFKEnum.ZP.getId())) {
GphyCondition gphyCondition =new GphyCondition(); GphyCondition gphyCondition =new GphyCondition();
gphyCondition.setMid(gpfkVo2.getId()); gphyCondition.setMid(gpfkVo2.getId());
if(gphyDao.queryIfZpwc(gphyCondition)!=0) { if(gphyDao.queryIfZpwc(gphyCondition)!=0) {
...@@ -1106,6 +1106,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1106,6 +1106,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
return curFkVo; return curFkVo;
} }
else if(snType.equals(SmCodeEnum.OKBZ.getId())) { else if(snType.equals(SmCodeEnum.OKBZ.getId())) {
if(StringUtils.isEmpty(fkCondition.getWosncode())) {
throwReturnMessage("该订单序列号未输入，请重新确认！");
}
FkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition); FkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
if(gpfkVo==null) { if(gpfkVo==null) {
Gpfk gpfk = new Gpfk(); Gpfk gpfk = new Gpfk();
...@@ -1131,6 +1134,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1131,6 +1134,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
gpfk.setHgbz("Y"); gpfk.setHgbz("Y");
gpfk.setHgsl(1.0); gpfk.setHgsl(1.0);
gpfk.setBhgsl(0.0); gpfk.setBhgsl(0.0);
gpfk.setFkrid(UserInfoUtil.getId());
gpfk.setFkr(UserInfoUtil.getUserName());
gpfk.setFksj(DateUtils.getDateTime());
update(gpfk); update(gpfk);
} }
FkVO newFkVo =gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition); FkVO newFkVo =gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
...@@ -1147,6 +1153,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1147,6 +1153,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
return newFkVo; return newFkVo;
} }
else if(snType.equals(SmCodeEnum.NGBZ.getId())) { else if(snType.equals(SmCodeEnum.NGBZ.getId())) {
if(StringUtils.isEmpty(fkCondition.getWosncode())) {
throwReturnMessage("该订单序列号未输入，请重新确认！");
}
FkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition); FkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
if(gpfkVo==null) { if(gpfkVo==null) {
Gpfk gpfk = new Gpfk(); Gpfk gpfk = new Gpfk();
...@@ -1171,6 +1180,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1171,6 +1180,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
gpfk.setHgbz("N"); gpfk.setHgbz("N");
gpfk.setHgsl(0.0); gpfk.setHgsl(0.0);
gpfk.setBhgsl(1.0); gpfk.setBhgsl(1.0);
gpfk.setFkrid(UserInfoUtil.getId());
gpfk.setFkr(UserInfoUtil.getUserName());
gpfk.setFksj(DateUtils.getDateTime());
update(gpfk); update(gpfk);
} }
FkVO newFkVo =gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition); FkVO newFkVo =gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
...@@ -1229,7 +1241,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1229,7 +1241,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
fkCondition2.setBzgxid(existLastWogylx.getBzgxid()); fkCondition2.setBzgxid(existLastWogylx.getBzgxid());
FkVO gpfkVo2 = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition2); FkVO gpfkVo2 = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition2);
if(gpfkVo2!=null) { if(gpfkVo2!=null) {
if(existLastWogylx.getGylxid().equals(HzGylxEnum.ZP.getId())) { if((existLastWogylx.getGxlx()).equals(YymkFKEnum.ZP.getId())) {
GphyCondition gphyCondition =new GphyCondition(); GphyCondition gphyCondition =new GphyCondition();
gphyCondition.setMid(gpfkVo2.getId()); gphyCondition.setMid(gpfkVo2.getId());
if(gphyDao.queryIfZpwc(gphyCondition)!=0) { if(gphyDao.queryIfZpwc(gphyCondition)!=0) {
...@@ -1252,6 +1264,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1252,6 +1264,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
return curFkVo; return curFkVo;
} }
else if(snType.equals(SmCodeEnum.OKBZ.getId())) { else if(snType.equals(SmCodeEnum.OKBZ.getId())) {
if(StringUtils.isEmpty(fkCondition.getWosncode())) {
throwReturnMessage("该订单序列号未输入，请重新确认！");
}
FkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition); FkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
if(gpfkVo==null) { if(gpfkVo==null) {
Gpfk gpfk = new Gpfk(); Gpfk gpfk = new Gpfk();
...@@ -1276,6 +1291,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1276,6 +1291,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
gpfk.setHgbz("Y"); gpfk.setHgbz("Y");
gpfk.setHgsl(1.0); gpfk.setHgsl(1.0);
gpfk.setBhgsl(0.0); gpfk.setBhgsl(0.0);
gpfk.setFkrid(UserInfoUtil.getId());
gpfk.setFkr(UserInfoUtil.getUserName());
gpfk.setFksj(DateUtils.getDateTime());
update(gpfk); update(gpfk);
} }
FkVO newFkVo =gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition); FkVO newFkVo =gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
...@@ -1292,6 +1310,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1292,6 +1310,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
return newFkVo; return newFkVo;
} }
else if(snType.equals(SmCodeEnum.NGBZ.getId())) { else if(snType.equals(SmCodeEnum.NGBZ.getId())) {
if(StringUtils.isEmpty(fkCondition.getWosncode())) {
throwReturnMessage("该订单序列号未输入，请重新确认！");
}
FkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition); FkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
if(gpfkVo==null) { if(gpfkVo==null) {
Gpfk gpfk = new Gpfk(); Gpfk gpfk = new Gpfk();
...@@ -1316,6 +1337,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1316,6 +1337,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
gpfk.setHgbz("N"); gpfk.setHgbz("N");
gpfk.setHgsl(0.0); gpfk.setHgsl(0.0);
gpfk.setBhgsl(1.0); gpfk.setBhgsl(1.0);
gpfk.setFkrid(UserInfoUtil.getId());
gpfk.setFkr(UserInfoUtil.getUserName());
gpfk.setFksj(DateUtils.getDateTime());
update(gpfk); update(gpfk);
} }
FkVO newFkVo =gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition); FkVO newFkVo =gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
......
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