Skip to content

K
kwell-mes
Commit 1ae725aa authored by yff's avatar yff
Browse files
Options

修改BUG

parent b03ab1ea
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 0 deletions
gavel/src/main/java/com/gavel/kwell/service/impl/GpfkServiceImpl.java
View file @ 1ae725aa
...@@ -1631,6 +1631,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1631,6 +1631,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
} }
Gpfk gpfk = new Gpfk(); Gpfk gpfk = new Gpfk();
FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid()); FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
checkLastBzgxIfComplete(curFkVo);
checkNextBzgxIfExistFk(curFkVo);
gpfk.setWosnid(curFkVo.getWosnCode()); gpfk.setWosnid(curFkVo.getWosnCode());
gpfk.setWogylx(curFkVo.getWogylxid()); gpfk.setWogylx(curFkVo.getWogylxid());
gpfk.setFkgx(curFkVo.getWogylxid()); gpfk.setFkgx(curFkVo.getWogylxid());
...@@ -1657,6 +1659,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1657,6 +1659,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
} }
Gpfk gpfk = new Gpfk(); Gpfk gpfk = new Gpfk();
FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid()); FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
checkLastBzgxIfComplete(curFkVo);
checkNextBzgxIfExistFk(curFkVo);
gpfk.setWosnid(curFkVo.getWosnCode()); gpfk.setWosnid(curFkVo.getWosnCode());
gpfk.setWogylx(curFkVo.getWogylxid()); gpfk.setWogylx(curFkVo.getWogylxid());
gpfk.setFkgx(curFkVo.getWogylxid()); gpfk.setFkgx(curFkVo.getWogylxid());
...@@ -1737,6 +1741,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1737,6 +1741,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
if(curFkVo==null) { if(curFkVo==null) {
throwReturnMessage("该订单不存在对应工序，请重新确认！"); throwReturnMessage("该订单不存在对应工序，请重新确认！");
} }
checkLastBzgxIfComplete(curFkVo);
checkNextBzgxIfExistFk(curFkVo);
GphyCondition hyCondition =new GphyCondition(); GphyCondition hyCondition =new GphyCondition();
hyCondition.setBzgxid(fkCondition.getBzgxid()); hyCondition.setBzgxid(fkCondition.getBzgxid());
hyCondition.setWosncode(fkCondition.getWosncode()); hyCondition.setWosncode(fkCondition.getWosncode());
...@@ -1827,6 +1833,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1827,6 +1833,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
} }
Gpfk gpfk = new Gpfk(); Gpfk gpfk = new Gpfk();
FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid()); FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
checkLastBzgxIfComplete(curFkVo);
checkNextBzgxIfExistFk(curFkVo);
gpfk.setWosnid(curFkVo.getWosnCode()); gpfk.setWosnid(curFkVo.getWosnCode());
gpfk.setWogylx(curFkVo.getWogylxid()); gpfk.setWogylx(curFkVo.getWogylxid());
gpfk.setFkgx(curFkVo.getWogylxid()); gpfk.setFkgx(curFkVo.getWogylxid());
...@@ -1853,6 +1861,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1853,6 +1861,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
} }
Gpfk gpfk = new Gpfk(); Gpfk gpfk = new Gpfk();
FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid()); FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
checkLastBzgxIfComplete(curFkVo);
checkNextBzgxIfExistFk(curFkVo);
gpfk.setWosnid(curFkVo.getWosnCode()); gpfk.setWosnid(curFkVo.getWosnCode());
gpfk.setWogylx(curFkVo.getWogylxid()); gpfk.setWogylx(curFkVo.getWogylxid());
gpfk.setFkgx(curFkVo.getWogylxid()); gpfk.setFkgx(curFkVo.getWogylxid());
...@@ -2102,6 +2112,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -2102,6 +2112,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
} }
Gpfk gpfk = new Gpfk(); Gpfk gpfk = new Gpfk();
FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid()); FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
checkLastBzgxIfComplete(curFkVo);
checkNextBzgxIfExistFk(curFkVo);
gpfk.setWosnid(curFkVo.getWosnCode()); gpfk.setWosnid(curFkVo.getWosnCode());
gpfk.setWogylx(curFkVo.getWogylxid()); gpfk.setWogylx(curFkVo.getWogylxid());
gpfk.setFkgx(curFkVo.getWogylxid()); gpfk.setFkgx(curFkVo.getWogylxid());
...@@ -2128,6 +2140,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -2128,6 +2140,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
} }
Gpfk gpfk = new Gpfk(); Gpfk gpfk = new Gpfk();
FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid()); FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
checkLastBzgxIfComplete(curFkVo);
checkNextBzgxIfExistFk(curFkVo);
gpfk.setWosnid(curFkVo.getWosnCode()); gpfk.setWosnid(curFkVo.getWosnCode());
gpfk.setWogylx(curFkVo.getWogylxid()); gpfk.setWogylx(curFkVo.getWogylxid());
gpfk.setFkgx(curFkVo.getWogylxid()); gpfk.setFkgx(curFkVo.getWogylxid());
......
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