Skip to content

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

修改BUG

parent a0df138f
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 56 deletions
gavel/src/main/java/com/gavel/kwell/dao/GpfkDao.java
View file @ d4183e15
...@@ -123,7 +123,7 @@ public interface GpfkDao extends BaseDao { ...@@ -123,7 +123,7 @@ public interface GpfkDao extends BaseDao {
public GylxVO queryKwellWoStandGylx(String djid,String bzgx); public GylxVO queryKwellWoStandGylx(String djid,String bzgx);
public GpfkVO queryKwellGpfkByWosnAndGxid(FkCondition condition); public FkVO queryKwellGpfkByWosnAndGxid(FkCondition condition);
public double queryWobomZpslByDjidAndWlid(String fkid,String wlid); public double queryWobomZpslByDjidAndWlid(String fkid,String wlid);
......
gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkDaoImpl.java
View file @ d4183e15
...@@ -1048,7 +1048,8 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao { ...@@ -1048,7 +1048,8 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.append(" left join WOSN on WOSN_CODE = GPFK_WOSNID "); sqlMap.append(" left join WOSN on WOSN_CODE = GPFK_WOSNID ");
sqlMap.append(" left join WO on WO_ID = WOSN_WOID "); sqlMap.append(" left join WO on WO_ID = WOSN_WOID ");
sqlMap.append(" left join WLXX on WLXX_ID = WO_WLID "); sqlMap.append(" left join WLXX on WLXX_ID = WO_WLID ");
sqlMap.append(" left join BZGX on BZGX_ID = GPFK_FKGX "); sqlMap.append(" left join WOGYLX on WOGYLX_ID = GPFK_FKGX ");
sqlMap.append(" left join BZGX on BZGX_ID = WOGYLX_BZGXID ");
sqlMap.append("where 1 = 1 "); sqlMap.append("where 1 = 1 ");
sqlMap.append(" and GPFK_FKLX = :pFKLX "); sqlMap.append(" and GPFK_FKLX = :pFKLX ");
sqlMap.append(" and GPFK_WOSNID = :pWOSNID "); sqlMap.append(" and GPFK_WOSNID = :pWOSNID ");
...@@ -1103,9 +1104,9 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao { ...@@ -1103,9 +1104,9 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.append(" left join WLXX on WLXX_ID = WOBOM_WLID"); sqlMap.append(" left join WLXX on WLXX_ID = WOBOM_WLID");
sqlMap.append(" left join WO on WO_ID = WOBOM_WOID"); sqlMap.append(" left join WO on WO_ID = WOBOM_WOID");
sqlMap.append(" left join WOSN on WOSN_WOID = WO_ID"); sqlMap.append(" left join WOSN on WOSN_WOID = WO_ID");
sqlMap.append(" left join WOGYLX on WOGYLX_WOID = WO_ID "); sqlMap.append(" left join WOGYLX on WOGYLX_ID = WOBOM_FFGX ");
sqlMap.append(" left join BZGX on BZGX_ID = WOGYLX_BZGXID and BZGX_ID = WOBOM_FFGX"); sqlMap.append(" left join BZGX on BZGX_ID = WOGYLX_BZGXID ");
sqlMap.append(" left join GPFK on GPFK_WOSNID = WOSN_CODE and GPFK_FKGX= BZGX_ID and GPFK_WOGYLX =WOGYLX_ID"); sqlMap.append(" left join GPFK on GPFK_WOSNID = WOSN_CODE and GPFK_FKGX= WOGYLX_ID and GPFK_WOGYLX =WOGYLX_ID");
sqlMap.append(" left join (select sum(GPHY_ZPSL) as ZPSL,GPHY_MID,GPHY_WLID,GPHY_FKGX from GPHY group by GPHY_MID,GPHY_WLID) k on k.GPHY_FKGX=WOBOM_FFGX and k.GPHY_MID = GPFK_ID and k.GPHY_WLID = WLXX_ID"); sqlMap.append(" left join (select sum(GPHY_ZPSL) as ZPSL,GPHY_MID,GPHY_WLID,GPHY_FKGX from GPHY group by GPHY_MID,GPHY_WLID) k on k.GPHY_FKGX=WOBOM_FFGX and k.GPHY_MID = GPFK_ID and k.GPHY_WLID = WLXX_ID");
sqlMap.append("where 1=1"); sqlMap.append("where 1=1");
if (StringUtils.isNotEmpty(woid)){ if (StringUtils.isNotEmpty(woid)){
...@@ -1151,13 +1152,13 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao { ...@@ -1151,13 +1152,13 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
} }
@Override @Override
public GpfkVO queryKwellGpfkByWosnAndGxid(FkCondition condition){ public FkVO queryKwellGpfkByWosnAndGxid(FkCondition condition){
SqlMap sqlMap = new SqlMap(); SqlMap sqlMap = new SqlMap();
sqlMap.append("select GPFK_ID, GPFK_WOSNID, GPFK_FKLX, GPFK_FKSJ, GPFK_HGBZ, GPFK_FKSL, "); sqlMap.append("select GPFK_ID, GPFK_WOSNID, GPFK_FKLX, GPFK_FKSJ, GPFK_HGBZ, GPFK_FKSL, ");
sqlMap.append(" GPFK_HGSL, GPFK_BHGSL, GPFK_FKR, GPFK_FKGX, GPFK_BZ, "); sqlMap.append(" GPFK_HGSL, GPFK_BHGSL, GPFK_FKR, GPFK_FKGX, GPFK_BZ, ");
sqlMap.append(" GPFK_WHRID, GPFK_WHR, GPFK_WHSJ, GPFK_CJRID, GPFK_CJR, "); sqlMap.append(" GPFK_WHRID, GPFK_WHR, GPFK_WHSJ, GPFK_CJRID, GPFK_CJR, ");
sqlMap.append(" GPFK_CJSJ, GPFK_SYSVERSION, GPFK_FKRID, GPFK_FKBX, GPFK_FKJSSJ, "); sqlMap.append(" GPFK_CJSJ, GPFK_SYSVERSION, GPFK_FKRID, GPFK_FKBX, GPFK_FKJSSJ, ");
sqlMap.append(" BX_CODE, BX_NAME, BZGX_CODE, BZGX_NAME, "); sqlMap.append(" BX_CODE, BX_NAME, BZGX_CODE, BZGX_NAME,WLXX_ID, ");
sqlMap.append(" WLXX_CODE, WLXX_NAME, WLXX_GG, WO_DJID,WO_ID, "); sqlMap.append(" WLXX_CODE, WLXX_NAME, WLXX_GG, WO_DJID,WO_ID, ");
sqlMap.append(" GPFK_GFSL, GPFK_LFSL, GPFK_FXSL, GPFK_FGSL, GPFK_YWRQ, GPFK_HGDJ, WOSN_KHCODE"); sqlMap.append(" GPFK_GFSL, GPFK_LFSL, GPFK_FXSL, GPFK_FGSL, GPFK_YWRQ, GPFK_HGDJ, WOSN_KHCODE");
sqlMap.append("from GPFK "); sqlMap.append("from GPFK ");
...@@ -1165,12 +1166,12 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao { ...@@ -1165,12 +1166,12 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.append(" left join WOSN on WOSN_CODE = GPFK_WOSNID "); sqlMap.append(" left join WOSN on WOSN_CODE = GPFK_WOSNID ");
sqlMap.append(" left join WO on WO_ID = WOSN_WOID "); sqlMap.append(" left join WO on WO_ID = WOSN_WOID ");
sqlMap.append(" left join WLXX on WLXX_ID = WO_WLID "); sqlMap.append(" left join WLXX on WLXX_ID = WO_WLID ");
sqlMap.append(" left join WOGYLX on WOGYLX_ID = GPFK_WOGYLX "); sqlMap.append(" left join WOGYLX on WOGYLX_ID = GPFK_FKGX ");
sqlMap.append(" left join BZGX on BZGX_ID = GPFK_FKGX "); sqlMap.append(" left join BZGX on BZGX_ID = WOGYLX_BZGXID ");
sqlMap.append("where 1 = 1 "); sqlMap.append("where 1 = 1 ");
if (StringUtils.isNotEmpty(condition.getBzgxid())){ if (StringUtils.isNotEmpty(condition.getBzgxid())){
sqlMap.append(" and GPFK_FKGX = :pFKGX "); sqlMap.append(" and BZGX_ID = :pBZGXID ");
sqlMap.setParamValue("pFKGX",condition.getBzgxid()); sqlMap.setParamValue("pBZGXID",condition.getBzgxid());
} }
if (StringUtils.isNotEmpty(condition.getWogylx())){ if (StringUtils.isNotEmpty(condition.getWogylx())){
sqlMap.append(" and WOGYLX_ID = :pWOGYLX "); sqlMap.append(" and WOGYLX_ID = :pWOGYLX ");
...@@ -1181,7 +1182,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao { ...@@ -1181,7 +1182,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.setParamValueLike("pWOSNID", condition.getWosncode()); sqlMap.setParamValueLike("pWOSNID", condition.getWosncode());
} }
sqlMap.append("order by GPFK_FKSJ desc, GPFK_FKGX "); sqlMap.append("order by GPFK_FKSJ desc, GPFK_FKGX ");
return sqlMap.queryEntity(GpfkVO.class); return sqlMap.queryEntity(FkVO.class);
} }
...@@ -1301,7 +1302,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao { ...@@ -1301,7 +1302,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.append(" left join WO on WO_ID = WOBOM_WOID"); sqlMap.append(" left join WO on WO_ID = WOBOM_WOID");
sqlMap.append(" left join WOSN on WOSN_WOID = WO_ID"); sqlMap.append(" left join WOSN on WOSN_WOID = WO_ID");
sqlMap.append(" left join WOGYLX on WOGYLX_WOID = WO_ID "); sqlMap.append(" left join WOGYLX on WOGYLX_WOID = WO_ID ");
sqlMap.append(" left join BZGX on BZGX_ID = WOGYLX_BZGXID and BZGX_ID = WOBOM_FFGX"); sqlMap.append(" left join BZGX on WOGYLX_ID = WOBOM_FFGX ");
sqlMap.append(" left join GPFK on GPFK_WOSNID = WOSN_CODE and GPFK_FKGX= BZGX_ID and GPFK_WOGYLX =WOGYLX_ID"); sqlMap.append(" left join GPFK on GPFK_WOSNID = WOSN_CODE and GPFK_FKGX= BZGX_ID and GPFK_WOGYLX =WOGYLX_ID");
sqlMap.append("where 1=1"); sqlMap.append("where 1=1");
if (StringUtils.isNotEmpty(bzlx)){ if (StringUtils.isNotEmpty(bzlx)){
...@@ -1345,10 +1346,12 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao { ...@@ -1345,10 +1346,12 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.append(" left join WLXX on WLXX_ID = WOBOM_WLID"); sqlMap.append(" left join WLXX on WLXX_ID = WOBOM_WLID");
sqlMap.append(" left join WO on WO_ID = WOBOM_WOID"); sqlMap.append(" left join WO on WO_ID = WOBOM_WOID");
sqlMap.append(" left join WOSN on WOSN_WOID = WO_ID"); sqlMap.append(" left join WOSN on WOSN_WOID = WO_ID");
sqlMap.append(" left join WOGYLX on WOGYLX_ID = WOBOM_FFGX ");
sqlMap.append(" left join BZGX on BZGX_ID = WOGYLX_BZGXID ");
sqlMap.append("where 1=1"); sqlMap.append("where 1=1");
if (StringUtils.isNotEmpty(fkCondition.getBzgxid())){ if (StringUtils.isNotEmpty(fkCondition.getBzgxid())){
sqlMap.append(" and " + SqlUtil.getWhereSql("WOBOM_FFGX", fkCondition.getBzgxid())); sqlMap.append(" and " + SqlUtil.getWhereSql("BZGX_ID", fkCondition.getBzgxid()));
sqlMap.setParamValue("WOBOM_FFGX", fkCondition.getBzgxid()); sqlMap.setParamValue("BZGX_ID", fkCondition.getBzgxid());
} }
if (StringUtils.isNotEmpty(fkCondition.getWosncode())){ if (StringUtils.isNotEmpty(fkCondition.getWosncode())){
sqlMap.append(" and " + SqlUtil.getWhereSql("WOSN_CODE", fkCondition.getWosncode())); sqlMap.append(" and " + SqlUtil.getWhereSql("WOSN_CODE", fkCondition.getWosncode()));
...@@ -1358,6 +1361,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao { ...@@ -1358,6 +1361,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.append(" and " + SqlUtil.getWhereSql("WLXX_ID", fkCondition.getWlxxId())); sqlMap.append(" and " + SqlUtil.getWhereSql("WLXX_ID", fkCondition.getWlxxId()));
sqlMap.setParamValue("WLXX_ID", fkCondition.getWlxxId()); sqlMap.setParamValue("WLXX_ID", fkCondition.getWlxxId());
} }
System.out.println(sqlMap.getSqlText());
return sqlMap.queryDouble(); return sqlMap.queryDouble();
} }
......
gavel/src/main/java/com/gavel/kwell/service/impl/GpfkServiceImpl.java
View file @ d4183e15
...@@ -905,10 +905,10 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -905,10 +905,10 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
@Override @Override
public FkVO zpfk(FkCondition fkCondition) { public FkVO zpfk(FkCondition fkCondition) {
if(StringUtils.isNotEmpty(fkCondition.getSncode())) { if(StringUtils.isEmpty(fkCondition.getSncode())) {
throwReturnMessage("未扫描到条码，请重新确认！"); throwReturnMessage("未扫描到条码，请重新确认！");
} }
if(StringUtils.isNotEmpty(fkCondition.getBzgxid())) { if(StringUtils.isEmpty(fkCondition.getBzgxid())) {
throwReturnMessage("扫描工序出错，请重新确认！"); throwReturnMessage("扫描工序出错，请重新确认！");
} }
String snType = checkSnType(fkCondition.getSncode()); String snType = checkSnType(fkCondition.getSncode());
...@@ -936,7 +936,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -936,7 +936,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
fkCondition2.setWogylx(existLastWogylx.getId()); fkCondition2.setWogylx(existLastWogylx.getId());
fkCondition2.setWosncode(fkCondition.getSncode()); fkCondition2.setWosncode(fkCondition.getSncode());
fkCondition2.setBzgxid(existLastWogylx.getBzgxid()); fkCondition2.setBzgxid(existLastWogylx.getBzgxid());
GpfkVO gpfkVo2 = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition2); FkVO gpfkVo2 = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition2);
if(gpfkVo2!=null) { if(gpfkVo2!=null) {
if(existLastWogylx.getGylxid().equals(HzGylxEnum.ZP.getId())) { if(existLastWogylx.getGylxid().equals(HzGylxEnum.ZP.getId())) {
GphyCondition gphyCondition =new GphyCondition(); GphyCondition gphyCondition =new GphyCondition();
...@@ -954,14 +954,16 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -954,14 +954,16 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
if(!curFkVo.getWozt().equals("R")) { if(!curFkVo.getWozt().equals("R")) {
throwReturnMessage("该订单未下达无法进行反馈，请重新确认！"); throwReturnMessage("该订单未下达无法进行反馈，请重新确认！");
} }
curFkVo.setSntype(snType);
if(StringUtils.isNotEmpty(curFkVo.getId())) { if(StringUtils.isNotEmpty(curFkVo.getId())) {
GphyCondition hyCondition =new GphyCondition(); GphyCondition hyCondition =new GphyCondition();
hyCondition.setMid(curFkVo.getId()); hyCondition.setMid(curFkVo.getId());
if(gphyDao.queryIfZpwc(hyCondition)!=0) { if(gphyDao.queryIfZpwc(hyCondition)!=0) {
curFkVo.setZpbz(SmCodeEnum.OKBZ.getPrefix()); curFkVo.setZpbz(SmCodeEnum.OKBZ.getPrefix());
} }
curFkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
} }
curFkVo.setSntype(snType);
return curFkVo; return curFkVo;
} }
else if(snType.equals(SmCodeEnum.WLID.getId())) { else if(snType.equals(SmCodeEnum.WLID.getId())) {
...@@ -973,27 +975,27 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -973,27 +975,27 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
if(StringUtils.isEmpty(fkCondition.getWosncode())) { if(StringUtils.isEmpty(fkCondition.getWosncode())) {
throwReturnMessage("该订单序列号未输入，请重新确认！"); throwReturnMessage("该订单序列号未输入，请重新确认！");
} }
FkVO curFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getSncode(), fkCondition.getBzgxid()); FkVO curFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getWosncode(), fkCondition.getBzgxid());
if(curFkVo==null) { if(curFkVo==null) {
throwReturnMessage("该订单不存在对应工序，请重新确认！"); throwReturnMessage("该订单不存在对应工序，请重新确认！");
} }
GpfkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition); FkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
if(gpfkVo==null) { if(gpfkVo==null) {
Gpfk gpfk = new Gpfk(); Gpfk gpfk = new Gpfk();
gpfk.setWosnid(curFkVo.getWosnCode()); gpfk.setWosnid(curFkVo.getWosnCode());
gpfk.setWogylx(curFkVo.getWogylxid()); gpfk.setWogylx(curFkVo.getWogylxid());
gpfk.setFkgx(curFkVo.getBzgxid()); gpfk.setFkgx(curFkVo.getWogylxid());
gpfk.setFkrid(UserInfoUtil.getId()); gpfk.setFkrid(UserInfoUtil.getId());
gpfk.setFkr(UserInfoUtil.getUserName()); gpfk.setFkr(UserInfoUtil.getUserName());
gpfk.setFksj(DateUtils.getDate()); gpfk.setFksj(DateUtils.getDate());
gpfk.setWlid(curFkVo.getWlid()); gpfk.setWlid(wlid);
insert(gpfk); insert(gpfk);
gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition); gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
} }
else { else {
Gpfk gpfk = new Gpfk(); Gpfk gpfk = new Gpfk();
EntityDataFactory.copyEntity(gpfkVo, gpfk); EntityDataFactory.copyEntity(gpfkVo, gpfk);
gpfk.setFkgx(curFkVo.getBzgxid()); gpfk.setFkgx(curFkVo.getWogylxid());
gpfk.setFkrid(UserInfoUtil.getId()); gpfk.setFkrid(UserInfoUtil.getId());
gpfk.setFkr(UserInfoUtil.getUserName()); gpfk.setFkr(UserInfoUtil.getUserName());
gpfk.setFksj(DateUtils.getDate()); gpfk.setFksj(DateUtils.getDate());
...@@ -1003,7 +1005,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1003,7 +1005,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
GphyCondition hyCondition =new GphyCondition(); GphyCondition hyCondition =new GphyCondition();
hyCondition.setMid(gpfkVo.getId()); hyCondition.setMid(gpfkVo.getId());
hyCondition.setSnid(fkCondition.getSncode()); hyCondition.setSnid(fkCondition.getSncode());
if( gpfkDao.checkIfContainsGphywl(hyCondition)<=0) { if( gpfkDao.checkIfContainsGphywl(hyCondition)>0) {
throwReturnMessage("该序列号已经被扫描"); throwReturnMessage("该序列号已经被扫描");
} }
if(gphyService.compareIsZpComplete(gpfkVo.getId(),wlid)) { if(gphyService.compareIsZpComplete(gpfkVo.getId(),wlid)) {
...@@ -1029,7 +1031,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1029,7 +1031,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
} }
} }
} }
return curFkVo; return gpfkVo;
} }
else { else {
throwReturnMessage("序列号类型错误，请重新确认！"); throwReturnMessage("序列号类型错误，请重新确认！");
...@@ -1040,10 +1042,10 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1040,10 +1042,10 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
@Override @Override
public FkVO jyfk(FkCondition fkCondition) { public FkVO jyfk(FkCondition fkCondition) {
if(StringUtils.isNotEmpty(fkCondition.getSncode())) { if(StringUtils.isEmpty(fkCondition.getSncode())) {
throwReturnMessage("未扫描到条码，请重新确认！"); throwReturnMessage("未扫描到条码，请重新确认！");
} }
if(StringUtils.isNotEmpty(fkCondition.getBzgxid())) { if(StringUtils.isEmpty(fkCondition.getBzgxid())) {
throwReturnMessage("扫描工序出错，请重新确认！"); throwReturnMessage("扫描工序出错，请重新确认！");
} }
String snType = checkSnType(fkCondition.getSncode()); String snType = checkSnType(fkCondition.getSncode());
...@@ -1072,7 +1074,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1072,7 +1074,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
fkCondition2.setWogylx(existLastWogylx.getId()); fkCondition2.setWogylx(existLastWogylx.getId());
fkCondition2.setWosncode(fkCondition.getSncode()); fkCondition2.setWosncode(fkCondition.getSncode());
fkCondition2.setBzgxid(existLastWogylx.getBzgxid()); fkCondition2.setBzgxid(existLastWogylx.getBzgxid());
GpfkVO gpfkVo2 = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition2); FkVO gpfkVo2 = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition2);
if(gpfkVo2!=null) { if(gpfkVo2!=null) {
if(existLastWogylx.getGylxid().equals(HzGylxEnum.ZP.getId())) { if(existLastWogylx.getGylxid().equals(HzGylxEnum.ZP.getId())) {
GphyCondition gphyCondition =new GphyCondition(); GphyCondition gphyCondition =new GphyCondition();
...@@ -1090,17 +1092,20 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1090,17 +1092,20 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
if(!curFkVo.getWozt().equals("R")) { if(!curFkVo.getWozt().equals("R")) {
throwReturnMessage("该订单未下达无法进行反馈，请重新确认！"); throwReturnMessage("该订单未下达无法进行反馈，请重新确认！");
} }
if(StringUtils.isNotEmpty(curFkVo.getId())) {
curFkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
}
curFkVo.setSntype(snType); curFkVo.setSntype(snType);
return curFkVo; return curFkVo;
} }
else if(snType.equals(SmCodeEnum.OKBZ.getId())) { else if(snType.equals(SmCodeEnum.OKBZ.getId())) {
GpfkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition); FkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
if(gpfkVo==null) { if(gpfkVo==null) {
Gpfk gpfk = new Gpfk(); Gpfk gpfk = new Gpfk();
FkVO curFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getSncode(), fkCondition.getBzgxid()); FkVO curFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getWosncode(), fkCondition.getBzgxid());
gpfk.setWosnid(curFkVo.getWosnCode()); gpfk.setWosnid(curFkVo.getWosnCode());
gpfk.setWogylx(curFkVo.getWogylxid()); gpfk.setWogylx(curFkVo.getWogylxid());
gpfk.setFkgx(curFkVo.getBzgxid()); gpfk.setFkgx(curFkVo.getWogylxid());
gpfk.setFkrid(UserInfoUtil.getId()); gpfk.setFkrid(UserInfoUtil.getId());
gpfk.setFkr(UserInfoUtil.getUserName()); gpfk.setFkr(UserInfoUtil.getUserName());
gpfk.setFksj(DateUtils.getDate()); gpfk.setFksj(DateUtils.getDate());
...@@ -1118,9 +1123,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1118,9 +1123,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
gpfk.setBhgsl(0.0); gpfk.setBhgsl(0.0);
update(gpfk); update(gpfk);
} }
FkVO newFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getSncode(), fkCondition.getBzgxid()); FkVO newFkVo =gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
newFkVo.setSntype(snType); newFkVo.setSntype(snType);
Wogylx wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, gpfkVo.getWogylx()); Wogylx wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, newFkVo.getWogylx());
if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) { if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
if(StringUtils.isNotEmpty(gpfkVo.getHgbz())&&gpfkVo.getHgbz().equals("N")) { if(StringUtils.isNotEmpty(gpfkVo.getHgbz())&&gpfkVo.getHgbz().equals("N")) {
updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false); updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false);
...@@ -1132,13 +1137,13 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1132,13 +1137,13 @@ 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())) {
GpfkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition); FkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
if(gpfkVo==null) { if(gpfkVo==null) {
Gpfk gpfk = new Gpfk(); Gpfk gpfk = new Gpfk();
FkVO curFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getSncode(), fkCondition.getBzgxid()); FkVO curFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getWosncode(), fkCondition.getBzgxid());
gpfk.setWosnid(curFkVo.getWosnCode()); gpfk.setWosnid(curFkVo.getWosnCode());
gpfk.setWogylx(curFkVo.getWogylxid()); gpfk.setWogylx(curFkVo.getWogylxid());
gpfk.setFkgx(curFkVo.getBzgxid()); gpfk.setFkgx(curFkVo.getWogylxid());
gpfk.setFkrid(UserInfoUtil.getId()); gpfk.setFkrid(UserInfoUtil.getId());
gpfk.setFkr(UserInfoUtil.getUserName()); gpfk.setFkr(UserInfoUtil.getUserName());
gpfk.setFksj(DateUtils.getDate()); gpfk.setFksj(DateUtils.getDate());
...@@ -1156,8 +1161,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1156,8 +1161,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
gpfk.setBhgsl(1.0); gpfk.setBhgsl(1.0);
update(gpfk); update(gpfk);
} }
FkVO newFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getSncode(), fkCondition.getBzgxid()); FkVO newFkVo =gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
Wogylx wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, gpfkVo.getWogylx()); newFkVo.setSntype(snType);
Wogylx wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, newFkVo.getWogylx());
if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) { if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
if(StringUtils.isNotEmpty(gpfkVo.getHgbz())&&gpfkVo.getHgbz().equals("N")) { if(StringUtils.isNotEmpty(gpfkVo.getHgbz())&&gpfkVo.getHgbz().equals("N")) {
updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false); updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false);
...@@ -1177,10 +1183,10 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1177,10 +1183,10 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
@Override @Override
public FkVO wxfk(FkCondition fkCondition) { public FkVO wxfk(FkCondition fkCondition) {
if(StringUtils.isNotEmpty(fkCondition.getSncode())) { if(StringUtils.isEmpty(fkCondition.getSncode())) {
throwReturnMessage("未扫描到条码，请重新确认！"); throwReturnMessage("未扫描到条码，请重新确认！");
} }
if(StringUtils.isNotEmpty(fkCondition.getBzgxid())) { if(StringUtils.isEmpty(fkCondition.getBzgxid())) {
throwReturnMessage("扫描工序出错，请重新确认！"); throwReturnMessage("扫描工序出错，请重新确认！");
} }
String snType = checkSnType(fkCondition.getSncode()); String snType = checkSnType(fkCondition.getSncode());
...@@ -1209,7 +1215,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1209,7 +1215,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
fkCondition2.setWogylx(existLastWogylx.getId()); fkCondition2.setWogylx(existLastWogylx.getId());
fkCondition2.setWosncode(fkCondition.getSncode()); fkCondition2.setWosncode(fkCondition.getSncode());
fkCondition2.setBzgxid(existLastWogylx.getBzgxid()); fkCondition2.setBzgxid(existLastWogylx.getBzgxid());
GpfkVO gpfkVo2 = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition2); FkVO gpfkVo2 = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition2);
if(gpfkVo2!=null) { if(gpfkVo2!=null) {
if(existLastWogylx.getGylxid().equals(HzGylxEnum.ZP.getId())) { if(existLastWogylx.getGylxid().equals(HzGylxEnum.ZP.getId())) {
GphyCondition gphyCondition =new GphyCondition(); GphyCondition gphyCondition =new GphyCondition();
...@@ -1227,17 +1233,20 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1227,17 +1233,20 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
if(!curFkVo.getWozt().equals("R")) { if(!curFkVo.getWozt().equals("R")) {
throwReturnMessage("该订单未下达无法进行反馈，请重新确认！"); throwReturnMessage("该订单未下达无法进行反馈，请重新确认！");
} }
if(StringUtils.isNotEmpty(curFkVo.getId())) {
curFkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
}
curFkVo.setSntype(snType); curFkVo.setSntype(snType);
return curFkVo; return curFkVo;
} }
else if(snType.equals(SmCodeEnum.OKBZ.getId())) { else if(snType.equals(SmCodeEnum.OKBZ.getId())) {
GpfkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition); FkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
if(gpfkVo==null) { if(gpfkVo==null) {
Gpfk gpfk = new Gpfk(); Gpfk gpfk = new Gpfk();
FkVO curFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getSncode(), fkCondition.getBzgxid()); FkVO curFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getWosncode(), fkCondition.getBzgxid());
gpfk.setWosnid(curFkVo.getWosnCode()); gpfk.setWosnid(curFkVo.getWosnCode());
gpfk.setWogylx(curFkVo.getWogylxid()); gpfk.setWogylx(curFkVo.getWogylxid());
gpfk.setFkgx(curFkVo.getBzgxid()); gpfk.setFkgx(curFkVo.getWogylxid());
gpfk.setFkrid(UserInfoUtil.getId()); gpfk.setFkrid(UserInfoUtil.getId());
gpfk.setFkr(UserInfoUtil.getUserName()); gpfk.setFkr(UserInfoUtil.getUserName());
gpfk.setFksj(DateUtils.getDate()); gpfk.setFksj(DateUtils.getDate());
...@@ -1255,9 +1264,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1255,9 +1264,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
gpfk.setBhgsl(0.0); gpfk.setBhgsl(0.0);
update(gpfk); update(gpfk);
} }
FkVO newFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getSncode(), fkCondition.getBzgxid()); FkVO newFkVo =gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
newFkVo.setSntype(snType); newFkVo.setSntype(snType);
Wogylx wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, gpfkVo.getWogylx()); Wogylx wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, newFkVo.getWogylx());
if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) { if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
if(StringUtils.isNotEmpty(gpfkVo.getHgbz())&&gpfkVo.getHgbz().equals("N")) { if(StringUtils.isNotEmpty(gpfkVo.getHgbz())&&gpfkVo.getHgbz().equals("N")) {
updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false); updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false);
...@@ -1269,13 +1278,13 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1269,13 +1278,13 @@ 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())) {
GpfkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition); FkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
if(gpfkVo==null) { if(gpfkVo==null) {
Gpfk gpfk = new Gpfk(); Gpfk gpfk = new Gpfk();
FkVO curFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getSncode(), fkCondition.getBzgxid()); FkVO curFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getWosncode(), fkCondition.getBzgxid());
gpfk.setWosnid(curFkVo.getWosnCode()); gpfk.setWosnid(curFkVo.getWosnCode());
gpfk.setWogylx(curFkVo.getWogylxid()); gpfk.setWogylx(curFkVo.getWogylxid());
gpfk.setFkgx(curFkVo.getBzgxid()); gpfk.setFkgx(curFkVo.getWogylxid());
gpfk.setFkrid(UserInfoUtil.getId()); gpfk.setFkrid(UserInfoUtil.getId());
gpfk.setFkr(UserInfoUtil.getUserName()); gpfk.setFkr(UserInfoUtil.getUserName());
gpfk.setFksj(DateUtils.getDate()); gpfk.setFksj(DateUtils.getDate());
...@@ -1293,8 +1302,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1293,8 +1302,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
gpfk.setBhgsl(1.0); gpfk.setBhgsl(1.0);
update(gpfk); update(gpfk);
} }
FkVO newFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getSncode(), fkCondition.getBzgxid()); FkVO newFkVo =gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
Wogylx wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, gpfkVo.getWogylx()); newFkVo.setSntype(snType);
Wogylx wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, newFkVo.getWogylx());
if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) { if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
if(StringUtils.isNotEmpty(gpfkVo.getHgbz())&&gpfkVo.getHgbz().equals("N")) { if(StringUtils.isNotEmpty(gpfkVo.getHgbz())&&gpfkVo.getHgbz().equals("N")) {
updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false); updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false);
......
gavel/src/main/java/com/gavel/kwell/vo/FkCondition.java
View file @ d4183e15
...@@ -13,6 +13,8 @@ public class FkCondition extends BaseEntity { ...@@ -13,6 +13,8 @@ public class FkCondition extends BaseEntity {
private String wogylx; private String wogylx;
private String wlid; private String wlid;
public String getWlid() { public String getWlid() {
return wlid; return wlid;
} }
......
gavel/src/main/java/com/gavel/kwell/vo/FkVO.java
View file @ d4183e15
...@@ -92,7 +92,7 @@ public class FkVO extends BaseEntity { ...@@ -92,7 +92,7 @@ public class FkVO extends BaseEntity {
@FieldMeta(fieldName = "GPFK_HGDJ", caption = "合格等级") @FieldMeta(fieldName = "GPFK_HGDJ", caption = "合格等级")
private String hgdj; private String hgdj;
@FieldMeta(fieldName = "GPFK_WLID", caption = "物料编码") @FieldMeta(fieldName = "WLXX_ID", caption = "物料编码")
private String wlid; private String wlid;
@FieldMeta(fieldName = "BX_CODE", caption = "班型编码") @FieldMeta(fieldName = "BX_CODE", caption = "班型编码")
private String bxCode; private String bxCode;
......
gavel/src/main/resources/templates/views/kmes/gphy/index.html
View file @ d4183e15
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
if(res.data&&res.data.records){ if(res.data&&res.data.records){
/* 赋值操作 */ /* 赋值操作 */
that.gd = res.data.records.woDjid; that.gd = res.data.records.woDjid;
that.cpsn = res.data.records.wosnid; that.cpsn = res.data.records.wosnCode;
that.ph = res.data.records.wlxxCode; that.ph = res.data.records.wlxxCode;
let woid = res.data.records.woid; let woid = res.data.records.woid;
that.fkid=res.data.records.id||"" that.fkid=res.data.records.id||""
......
gavel/src/main/resources/templates/views/kmes/gpjy/index.html
View file @ d4183e15
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
that.hg= res.data.records.hgsl||0; that.hg= res.data.records.hgsl||0;
that.ng= res.data.records.bhgsl||0; that.ng= res.data.records.bhgsl||0;
that.gd = res.data.records.woDjid; that.gd = res.data.records.woDjid;
that.cpsn = res.data.records.wosnid; that.cpsn = res.data.records.wosnCode;
that.ph = res.data.records.wlxxCode; that.ph = res.data.records.wlxxCode;
let woid = res.data.records.woDjid; let woid = res.data.records.woDjid;
that.fkid = res.data.records.id; that.fkid = res.data.records.id;
......
gavel/src/main/resources/templates/views/kmes/gpwx/index.html
View file @ d4183e15
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
that.hg= res.data.records.hgsl||0; that.hg= res.data.records.hgsl||0;
that.ng= res.data.records.bhgsl||0; that.ng= res.data.records.bhgsl||0;
that.gd = res.data.records.woDjid; that.gd = res.data.records.woDjid;
that.cpsn = res.data.records.wosnid; that.cpsn = res.data.records.wosnCode;
that.ph = res.data.records.wlxxCode; that.ph = res.data.records.wlxxCode;
let woid = res.data.records.woDjid; let woid = res.data.records.woDjid;
that.fkid = res.data.records.id; that.fkid = res.data.records.id;
......
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