Skip to content

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

修改文件

parent 8eb78347
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 18 deletions
gavel/src/main/java/com/gavel/kwell/config/ShiroConfig.java
View file @ e7f62226
...@@ -110,6 +110,7 @@ public class ShiroConfig { ...@@ -110,6 +110,7 @@ public class ShiroConfig {
shiroFilterFactoryBean.setFilters(filters); shiroFilterFactoryBean.setFilters(filters);
Map<String, String> filterChainDefinitionMap = GavelAuthResource.init(); Map<String, String> filterChainDefinitionMap = GavelAuthResource.init();
filterChainDefinitionMap.put("/kmes/gpfk/login", "anon"); filterChainDefinitionMap.put("/kmes/gpfk/login", "anon");
filterChainDefinitionMap.put("/kmes/gpfk/testFeedBack", "anon");
filterChainDefinitionMap.put("/loginscan_view", "anon"); filterChainDefinitionMap.put("/loginscan_view", "anon");
filterChainDefinitionMap.put("/logout", "logout"); filterChainDefinitionMap.put("/logout", "logout");
filterChainDefinitionMap.put("/**", "permFilter"); filterChainDefinitionMap.put("/**", "permFilter");
......
gavel/src/main/java/com/gavel/kwell/service/impl/GpfkServiceImpl.java
View file @ e7f62226
...@@ -2087,9 +2087,11 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -2087,9 +2087,11 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
GpfkCondition gpfkCondition = new GpfkCondition(); GpfkCondition gpfkCondition = new GpfkCondition();
gpfkCondition.setWosnid(fkCondition.getSncode()); gpfkCondition.setWosnid(fkCondition.getSncode());
gpfkCondition.setBzgxid(fkCondition.getBzgxid()); gpfkCondition.setBzgxid(fkCondition.getBzgxid());
FkVO curFkVo = gpfkDao.queryWxWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getSncode(), fkCondition.getBzgxid()); FkVO curFkVo = gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getSncode(), fkCondition.getBzgxid());
if (curFkVo == null) { checkLastBzgxIfComplete(curFkVo);
curFkVo = gpfkDao.queryKwellWxWoBySnidUptoDate(fkCondition.getSncode()); checkNextBzgxIfExistFk(curFkVo);
if(StringUtils.isNotEmpty(curFkVo.getId())) {
curFkVo = gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getSncode(), fkCondition.getBzgxid());
} }
curFkVo.setSntype(snType); curFkVo.setSntype(snType);
return curFkVo; return curFkVo;
...@@ -2099,8 +2101,10 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -2099,8 +2101,10 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
throwReturnMessage("该订单序列号未输入，请重新确认！"); throwReturnMessage("该订单序列号未输入，请重新确认！");
} }
Gpfk gpfk = new Gpfk(); Gpfk gpfk = new Gpfk();
FkVO curFkVo =gpfkDao.queryKwellWxWoBySnidUptoDate(fkCondition.getWosncode()); FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
gpfk.setWosnid(curFkVo.getWosnCode()); gpfk.setWosnid(curFkVo.getWosnCode());
gpfk.setWogylx(curFkVo.getWogylxid());
gpfk.setFkgx(curFkVo.getWogylxid());
gpfk.setFkrid(UserInfoUtil.getId()); gpfk.setFkrid(UserInfoUtil.getId());
gpfk.setFkr(UserInfoUtil.getUserName()); gpfk.setFkr(UserInfoUtil.getUserName());
gpfk.setFksj(DateUtils.getDateTime()); gpfk.setFksj(DateUtils.getDateTime());
...@@ -2108,14 +2112,14 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -2108,14 +2112,14 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
gpfk.setYwrq(DateUtils.getDate()); gpfk.setYwrq(DateUtils.getDate());
gpfk.setHgbz(HGBZ); gpfk.setHgbz(HGBZ);
gpfk.setFklx(GpfkFklxEnum.WO.getId()); gpfk.setFklx(GpfkFklxEnum.WO.getId());
gpfk.setHgsl(1.0); gpfk.setHgsl(1.0d);
gpfk.setBhgsl(0.0); gpfk.setFksl(1.0d);
gpfk.setBhgsl(0.0d);
gpfk.setBzgxid(fkCondition.getBzgxid()); gpfk.setBzgxid(fkCondition.getBzgxid());
gpfk.setFkgx(fkCondition.getBzgxid());
insert(gpfk); insert(gpfk);
FkVO newFkVo =gpfkDao.queryWxWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getWosncode(), fkCondition.getBzgxid()); FkVO newFkVo =gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
addOrUpdateGpfkjg(curFkVo.getWlid(), fkCondition.getBzgxid(), fkCondition.getBzgxid(), curFkVo.getWosnCode(), HGBZ);
newFkVo.setSntype(snType); newFkVo.setSntype(snType);
addOrUpdateGpfkjg(newFkVo.getWlid(), fkCondition.getBzgxid(), newFkVo.getFkgx(), fkCondition.getWosncode(), HGBZ);
return newFkVo; return newFkVo;
} }
else if(snType.equals(SmCodeEnum.NGBZ.getId())) { else if(snType.equals(SmCodeEnum.NGBZ.getId())) {
...@@ -2123,23 +2127,24 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -2123,23 +2127,24 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
throwReturnMessage("该订单序列号未输入，请重新确认！"); throwReturnMessage("该订单序列号未输入，请重新确认！");
} }
Gpfk gpfk = new Gpfk(); Gpfk gpfk = new Gpfk();
FkVO curFkVo =gpfkDao.queryKwellWxWoBySnidUptoDate(fkCondition.getWosncode()); FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
gpfk.setWosnid(curFkVo.getWosnCode()); gpfk.setWosnid(curFkVo.getWosnCode());
gpfk.setWogylx(curFkVo.getWogylxid());
gpfk.setFkgx(curFkVo.getWogylxid());
gpfk.setFkrid(UserInfoUtil.getId()); gpfk.setFkrid(UserInfoUtil.getId());
gpfk.setFkr(UserInfoUtil.getUserName()); gpfk.setFkr(UserInfoUtil.getUserName());
gpfk.setFksj(DateUtils.getDateTime()); gpfk.setFksj(DateUtils.getDateTime());
gpfk.setWlid(curFkVo.getWlid()); gpfk.setWlid(curFkVo.getWlid());
gpfk.setYwrq(DateUtils.getDate());
gpfk.setHgbz(BHGBZ); gpfk.setHgbz(BHGBZ);
gpfk.setFklx(GpfkFklxEnum.WO.getId()); gpfk.setFklx(GpfkFklxEnum.WO.getId());
gpfk.setHgsl(1.0); gpfk.setYwrq(DateUtils.getDate());
gpfk.setBhgsl(0.0); gpfk.setHgsl(0.0);
gpfk.setBhgsl(1.0);
gpfk.setBzgxid(fkCondition.getBzgxid()); gpfk.setBzgxid(fkCondition.getBzgxid());
gpfk.setFkgx(fkCondition.getBzgxid());
insert(gpfk); insert(gpfk);
FkVO newFkVo =gpfkDao.queryWxWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getWosncode(), fkCondition.getBzgxid()); FkVO newFkVo =gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
addOrUpdateGpfkjg(curFkVo.getWlid(), fkCondition.getBzgxid(), fkCondition.getBzgxid(), curFkVo.getWosnCode(), BHGBZ);
newFkVo.setSntype(snType); newFkVo.setSntype(snType);
addOrUpdateGpfkjg(newFkVo.getWlid(), fkCondition.getBzgxid(), newFkVo.getFkgx(), fkCondition.getWosncode(), BHGBZ);
return newFkVo; return newFkVo;
} }
else { else {
......
gavel/src/main/resources/module.xml
View file @ e7f62226
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<print entity="com.gavel.kwell.vo.GpfkVO"/> <print entity="com.gavel.kwell.vo.GpfkVO"/>
<mkcz czid = "21" czmc = "取消改制" value="Y"/> <mkcz czid = "21" czmc = "取消改制" value="Y"/>
</menu> </menu>
<menu mkid="901002000" mkmc="测试反馈" url="kmes/csfk/zpindex"> <menu mkid="901001820" mkmc="测试反馈" url="kmes/csfk/zpindex">
<print entity="com.gavel.kwell.vo.GpfkVO"/> <print entity="com.gavel.kwell.vo.GpfkVO"/>
</menu> </menu>
<menu mkid="901000200" mkmc="装配反馈" url="kmes/gphy/zpindex"> <menu mkid="901000200" mkmc="装配反馈" url="kmes/gphy/zpindex">
......
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