Commit c76d4060 authored by yff's avatar yff

修改bug

parent 0998f749
......@@ -955,6 +955,13 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
throwReturnMessage("该订单未下达无法进行反馈,请重新确认!");
}
curFkVo.setSntype(snType);
if(StringUtils.isNotEmpty(curFkVo.getId())) {
GphyCondition hyCondition =new GphyCondition();
hyCondition.setMid(curFkVo.getId());
if(gphyDao.queryIfZpwc(hyCondition)!=0) {
curFkVo.setZpbz(SmCodeEnum.OKBZ.getPrefix());
}
}
return curFkVo;
}
else if(snType.equals(SmCodeEnum.WLID.getId())) {
......@@ -1011,6 +1018,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
gphyService.insert(gphy);
}
if(gphyDao.queryIfZpwc(hyCondition)!=0) {
curFkVo.setZpbz(SmCodeEnum.OKBZ.getPrefix());
Wogylx wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, gpfkVo.getWogylx());
if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
if(StringUtils.isNotEmpty(gpfkVo.getHgbz())&&gpfkVo.getHgbz().equals("N")) {
......@@ -1021,6 +1029,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
}
}
}
return curFkVo;
}
else {
throwReturnMessage("序列号类型错误,请重新确认!");
......
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