Skip to content

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

增加加工反馈

parent 7ef67d78
Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 415 deletions
gavel/src/main/java/com/gavel/kwell/controller/GpfkController.java
View file @ e910bbf2
...@@ -280,9 +280,21 @@ public class GpfkController extends BaseController { ...@@ -280,9 +280,21 @@ public class GpfkController extends BaseController {
} }
} }
@RequestMapping(value = "/jgfk", method = RequestMethod.POST)
@ResponseBody
public Object jgfk(@RequestBody JSONObject param) {
FkCondition condition = JSONObject.toJavaObject(param, FkCondition.class);
FkVO gpfk = gpfkService.zpfkUpgrade(condition);
if(gpfk!=null) {
return buildReturnData(gpfk);
}
return ThreadContext.getReturnData();
}
@RequestMapping(value = "/zpfk", method = RequestMethod.POST) @RequestMapping(value = "/zpfk", method = RequestMethod.POST)
@ResponseBody @ResponseBody
public Object query(@RequestBody JSONObject param) { public Object zpfk(@RequestBody JSONObject param) {
FkCondition condition = JSONObject.toJavaObject(param, FkCondition.class); FkCondition condition = JSONObject.toJavaObject(param, FkCondition.class);
FkVO gpfk = gpfkService.zpfkUpgrade(condition); FkVO gpfk = gpfkService.zpfkUpgrade(condition);
if(gpfk!=null) { if(gpfk!=null) {
......
gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkDaoImpl.java
View file @ e910bbf2
...@@ -1640,7 +1640,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao { ...@@ -1640,7 +1640,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
@Override @Override
public List<WobomVO> queryWobomByWosnAndBzgx(String wosnid, String bzgx) { public List<WobomVO> queryWobomByWosnAndBzgx(String wosnid, String bzgx) {
SqlMap sqlMap = new SqlMap(); SqlMap sqlMap = new SqlMap();
sqlMap.append("select WOBOM_ID, WOBOM_XH, WOBOM_WOID, WOBOM_WLID, WOBOM_FFGX,"); sqlMap.append("select WOBOM_ID,WOBOM_GJWL, WOBOM_XH, WOBOM_WOID, WOBOM_WLID, WOBOM_FFGX,");
sqlMap.append(" WOBOM_DWYL, WOBOM_XQSL, WOBOM_XQRQ, WOBOM_SHL, WOBOM_SHZ, WOBOM_FFYZ,"); sqlMap.append(" WOBOM_DWYL, WOBOM_XQSL, WOBOM_XQRQ, WOBOM_SHL, WOBOM_SHZ, WOBOM_FFYZ,");
sqlMap.append(" WOBOM_LLSL, WOBOM_CKSL, WOBOM_BZ, WOBOM_WHRID, WOBOM_WHR,"); sqlMap.append(" WOBOM_LLSL, WOBOM_CKSL, WOBOM_BZ, WOBOM_WHRID, WOBOM_WHR,");
sqlMap.append(" WOBOM_WHSJ, WOBOM_CJRID, WOBOM_CJR, WOBOM_CJSJ, WOBOM_SYSVERSION,"); sqlMap.append(" WOBOM_WHSJ, WOBOM_CJRID, WOBOM_CJR, WOBOM_CJSJ, WOBOM_SYSVERSION,");
......
gavel/src/main/java/com/gavel/kwell/service/GpfkService.java
View file @ e910bbf2
...@@ -106,7 +106,7 @@ public interface GpfkService extends BaseEditService { ...@@ -106,7 +106,7 @@ public interface GpfkService extends BaseEditService {
* 判断序列号类型 * 判断序列号类型
*/ */
public String checkSnType(String snid); public String checkSnType(String snid);
public FkVO jgfk(FkCondition fkCondition);
public FkVO zpfk(FkCondition fkCondition); public FkVO zpfk(FkCondition fkCondition);
public FkVO jyfk(FkCondition fkCondition); public FkVO jyfk(FkCondition fkCondition);
public FkVO wxfk(FkCondition fkCondition); public FkVO wxfk(FkCondition fkCondition);
......
gavel/src/main/java/com/gavel/kwell/service/impl/GpfkServiceImpl.java
View file @ e910bbf2
...@@ -1581,7 +1581,14 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1581,7 +1581,14 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
} }
} }
/**
* 加工反馈
*/
@Override
public FkVO jgfk(FkCondition fkCondition) {
// TODO Auto-generated method stub
return null;
}
/** /**
* 装配反馈流程升级 * 装配反馈流程升级
...@@ -1882,408 +1889,5 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1882,408 +1889,5 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
} }
// @Override
// public FkVO zpfkUpgrade(FkCondition fkCondition) {
// /*
// * 基础判断 1.条码是否为空 2.前端是否传入标准工序 3.条码是否为已知类型条码
// */
// if(StringUtils.isEmpty(fkCondition.getSncode())) {
// throwReturnMessage("未扫描到条码，请重新确认！");
// }
// if(StringUtils.isEmpty(fkCondition.getBzgxid())) {
// throwReturnMessage("扫描工序出错，请重新确认！");
// }
// String snType = checkSnType(fkCondition.getSncode());
// if(StringUtils.isEmpty(snType)) {
// throwReturnMessage("该条码为未知条码，请重新确认！");
// }
// FkVO fkVO = null;
// if(snType.equals(SmCodeEnum.LOGOUT.getId())) {
// fkVO = new FkVO();
// fkVO.setSntype(snType);
// }
// else if(snType.equals(SmCodeEnum.WOSNID.getId())) {
// GpfkCondition gpfkCondition = new GpfkCondition();
// gpfkCondition.setWosnid(fkCondition.getSncode());
// gpfkCondition.setBzgxid(fkCondition.getBzgxid());
// FkVO curFkVo = gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getSncode(), fkCondition.getBzgxid());
// checkLastBzgxIfComplete(curFkVo);
// checkNextBzgxIfExistFk(curFkVo);
// if(StringUtils.isNotEmpty(curFkVo.getId())) {
// curFkVo = gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getSncode(), fkCondition.getBzgxid());
// if(checkIfZpCompleteByWosnAndBzgx(fkCondition.getSncode(), fkCondition.getBzgxid())) {
// curFkVo.setZpbz(SmCodeEnum.OKBZ.getPrefix());
// }
// }
// curFkVo.setSntype(snType);
// return curFkVo;
// }
// else if(snType.equals(SmCodeEnum.WLID.getId())) {
// String wlid = coderuleService.matchCodeByRule(fkCondition.getSncode());
// fkCondition.setWlid(wlid);
// if(gpfkDao.checkIfContainsWobomWl(fkCondition)<=0) {
// throwReturnMessage("该订单下不存在该发放工序物料，请重新确认！");
// }
// if(StringUtils.isEmpty(fkCondition.getWosncode())) {
// throwReturnMessage("该订单序列号未输入，请重新确认！");
// }
// FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
// if(curFkVo==null) {
// throwReturnMessage("该订单不存在对应工序，请重新确认！");
// }
// FkVO gpfkVo =null;
// if(checkIsCurrentGx(curFkVo)) {
// /* 本工序为当前工序*/
// gpfkVo = gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
// Gpfk gpfk = new Gpfk();
// EntityDataFactory.copyEntity(gpfkVo, gpfk);
// gpfk.setFkgx(curFkVo.getWogylxid());
// gpfk.setFkrid(UserInfoUtil.getId());
// gpfk.setFkr(UserInfoUtil.getUserName());
// gpfk.setFksj(DateUtils.getDateTime());
// update(gpfk);
// gpfkVo = gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
// }
// else {
// /* 本工序不为最新工序 存在情况为该订单序列号去维修 */
// Gpfk gpfk = new Gpfk();
// gpfk.setWosnid(curFkVo.getWosnCode());
// gpfk.setWogylx(curFkVo.getWogylxid());
// gpfk.setFkgx(curFkVo.getWogylxid());
// gpfk.setFkrid(UserInfoUtil.getId());
// gpfk.setFkr(UserInfoUtil.getUserName());
// gpfk.setFksj(DateUtils.getDateTime());
// gpfk.setWlid(wlid);
// gpfk.setYwrq(DateUtils.getDate());
// gpfk.setFklx(GpfkFklxEnum.WO.getId());
// insert(gpfk);
// gpfkVo = gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
// }
// GphyCondition hyCondition =new GphyCondition();
// hyCondition.setBzgxid(fkCondition.getBzgxid());
// hyCondition.setWosncode(fkCondition.getWosncode());
// hyCondition.setSnid(fkCondition.getSncode());
// hyCondition.setWlid(wlid);
// if( gpfkDao.checkIfContainsGphywl(hyCondition)>0) {
// throwReturnMessage("该序列号已经被扫描");
// }
// compareIsZpComplete(hyCondition);
// Gphy gphy = new Gphy();
// gphy.setFkgx(gpfkVo.getFkgx());
// gphy.setWlid(wlid);
// gphy.setMid(gpfkVo.getId());
// gphy.setWlsnid(fkCondition.getSncode());
// gphy.setFkrid(UserInfoUtil.getId());
// gphy.setFkr(UserInfoUtil.getUserName());
// gphy.setFksj(DateUtils.getDateTime());
// gphy.setZpsl(1.0);
// gphy.setHylx("BOM");
// gphyService.insert(gphy);
// if(checkIfZpCompleteByWosnAndBzgx(fkCondition.getSncode(), fkCondition.getBzgxid())) {
// 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"))) {
// Gpfk gpfk = new Gpfk();
// EntityDataFactory.copyEntity(gpfkVo, gpfk);
// gpfk.setFksl(1.0);
// update(gpfk);
// if(StringUtils.isNotEmpty(gpfkVo.getHgbz())&&gpfkVo.getHgbz().equals("N")) {
// updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false);
// }
// else {
// updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
// }
// }
// }
// gpfkVo.setSntype(SmCodeEnum.WLID.getId());
// Wlxx cuwlxx = gpfkDao.queryById(Wlxx.class, wlid);
// gpfkVo.setCurwlsncode(cuwlxx.getCode());
// gpfkVo.setCurwlsnname(cuwlxx.getName());
// return gpfkVo;
// }
// else {
// throwReturnMessage("序列号类型错误，请重新确认！");
// }
// return null;
// }
// @Override
// public FkVO jyfkUpgrade(FkCondition fkCondition) {
// /*
// * 基础判断 1.条码是否为空 2.前端是否传入标准工序 3.条码是否为已知类型条码
// */
// if(StringUtils.isEmpty(fkCondition.getSncode())) {
// throwReturnMessage("未扫描到条码，请重新确认！");
// }
// if(StringUtils.isEmpty(fkCondition.getBzgxid())) {
// throwReturnMessage("扫描工序出错，请重新确认！");
// }
// String snType = checkSnType(fkCondition.getSncode());
// if(StringUtils.isEmpty(snType)) {
// throwReturnMessage("该条码为未知条码，请重新确认！");
// }
// FkVO fkVO = null;
// if(snType.equals(SmCodeEnum.LOGOUT.getId())) {
// fkVO = new FkVO();
// fkVO.setSntype(snType);
// }
// else if(snType.equals(SmCodeEnum.WOSNID.getId())) {
// GpfkCondition gpfkCondition = new GpfkCondition();
// gpfkCondition.setWosnid(fkCondition.getSncode());
// gpfkCondition.setBzgxid(fkCondition.getBzgxid());
// FkVO curFkVo = gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getSncode(), fkCondition.getBzgxid());
// checkLastBzgxIfComplete(curFkVo);
// checkNextBzgxIfExistFk(curFkVo);
// if(StringUtils.isNotEmpty(curFkVo.getId())) {
// curFkVo = gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getSncode(), fkCondition.getBzgxid());
// }
// curFkVo.setSntype(snType);
// return curFkVo;
// }
// else if(snType.equals(SmCodeEnum.OKBZ.getId())) {
// if(StringUtils.isEmpty(fkCondition.getWosncode())) {
// throwReturnMessage("该订单序列号未输入，请重新确认！");
// }
// FkVO gpfkVo = gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
// if(gpfkVo==null) {
// Gpfk gpfk = new Gpfk();
// FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
// gpfk.setWosnid(curFkVo.getWosnCode());
// gpfk.setWogylx(curFkVo.getWogylxid());
// gpfk.setFkgx(curFkVo.getWogylxid());
// gpfk.setFkrid(UserInfoUtil.getId());
// gpfk.setFkr(UserInfoUtil.getUserName());
// gpfk.setFksj(DateUtils.getDateTime());
// gpfk.setWlid(curFkVo.getWlid());
// gpfk.setYwrq(DateUtils.getDate());
// gpfk.setHgbz("Y");
// gpfk.setFklx(GpfkFklxEnum.WO.getId());
// gpfk.setHgsl(1.0);
// gpfk.setBhgsl(0.0);
// gpfk.setHgdj(GpfkHgEnum.JYHG.getId());
// insert(gpfk);
// }
// else {
// Gpfk gpfk = new Gpfk();
// EntityDataFactory.copyEntity(gpfkVo, gpfk);
// gpfk.setHgbz("Y");
// gpfk.setHgsl(1.0);
// gpfk.setBhgsl(0.0);
// gpfk.setFkrid(UserInfoUtil.getId());
// gpfk.setFkr(UserInfoUtil.getUserName());
// gpfk.setFksj(DateUtils.getDateTime());
// gpfk.setHgdj(GpfkHgEnum.JYHG.getId());
// update(gpfk);
// }
// FkVO newFkVo =gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
// newFkVo.setSntype(snType);
// Wogylx wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, newFkVo.getWogylxid());
// if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
// Gpfk gpfk = new Gpfk();
// EntityDataFactory.copyEntity(gpfkVo, gpfk);
// gpfk.setFksl(1.0);
// update(gpfk);
// if(StringUtils.isNotEmpty(newFkVo.getHgbz())&&newFkVo.getHgbz().equals("N")) {
// updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false);
// }
// else {
// updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
// }
// }
// return newFkVo;
// }
// else if(snType.equals(SmCodeEnum.NGBZ.getId())) {
// if(StringUtils.isEmpty(fkCondition.getWosncode())) {
// throwReturnMessage("该订单序列号未输入，请重新确认！");
// }
// FkVO gpfkVo = gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
// if(gpfkVo==null) {
// Gpfk gpfk = new Gpfk();
// FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
// gpfk.setWosnid(curFkVo.getWosnCode());
// gpfk.setWogylx(curFkVo.getWogylxid());
// gpfk.setFkgx(curFkVo.getWogylxid());
// gpfk.setFkrid(UserInfoUtil.getId());
// gpfk.setFkr(UserInfoUtil.getUserName());
// gpfk.setFksj(DateUtils.getDateTime());
// gpfk.setWlid(curFkVo.getWlid());
// gpfk.setHgbz("N");
// gpfk.setFklx(GpfkFklxEnum.WO.getId());
// gpfk.setYwrq(DateUtils.getDate());
// gpfk.setHgsl(0.0);
// gpfk.setBhgsl(1.0);
// gpfk.setHgdj(GpfkHgEnum.JYBHG.getId());
// insert(gpfk);
// }
// else {
// Gpfk gpfk = new Gpfk();
// EntityDataFactory.copyEntity(gpfkVo, gpfk);
// gpfk.setHgbz("N");
// gpfk.setHgsl(0.0);
// gpfk.setBhgsl(1.0);
// gpfk.setFkrid(UserInfoUtil.getId());
// gpfk.setFkr(UserInfoUtil.getUserName());
// gpfk.setFksj(DateUtils.getDateTime());
// gpfk.setHgdj(GpfkHgEnum.JYBHG.getId());
// update(gpfk);
// }
// FkVO newFkVo =gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
// newFkVo.setSntype(snType);
// Wogylx wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, newFkVo.getWogylxid());
// if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
// Gpfk gpfk = new Gpfk();
// EntityDataFactory.copyEntity(gpfkVo, gpfk);
// gpfk.setFksl(1.0);
// update(gpfk);
// if(StringUtils.isNotEmpty(newFkVo.getHgbz())&&newFkVo.getHgbz().equals("N")) {
// cancelPcjh(wogylx.getWoid(),wogylx.getGxlx(),false);
// }
// else {
// cancelPcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
// }
// }
// return newFkVo;
// }
// return null;
// }
// @Override
// public FkVO wxfkUpgrade(FkCondition fkCondition) {
// /*
// * 基础判断 1.条码是否为空 2.前端是否传入标准工序 3.条码是否为已知类型条码
// */
// if(StringUtils.isEmpty(fkCondition.getSncode())) {
// throwReturnMessage("未扫描到条码，请重新确认！");
// }
// if(StringUtils.isEmpty(fkCondition.getBzgxid())) {
// throwReturnMessage("扫描工序出错，请重新确认！");
// }
// String snType = checkSnType(fkCondition.getSncode());
// if(StringUtils.isEmpty(snType)) {
// throwReturnMessage("该条码为未知条码，请重新确认！");
// }
// FkVO fkVO = null;
// if(snType.equals(SmCodeEnum.LOGOUT.getId())) {
// fkVO = new FkVO();
// fkVO.setSntype(snType);
// }
// else if(snType.equals(SmCodeEnum.WOSNID.getId())) {
// GpfkCondition gpfkCondition = new GpfkCondition();
// gpfkCondition.setWosnid(fkCondition.getSncode());
// gpfkCondition.setBzgxid(fkCondition.getBzgxid());
// FkVO curFkVo = gpfkDao.queryKwellWxWoBySnidUptoDate(fkCondition.getSncode());
// checkLastBzgxIfComplete(curFkVo);
// checkNextBzgxIfExistFk(curFkVo);
// if(StringUtils.isNotEmpty(curFkVo.getId())) {
// curFkVo = gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getSncode(), fkCondition.getBzgxid());
// }
// curFkVo.setSntype(snType);
// return curFkVo;
// }
// else if(snType.equals(SmCodeEnum.OKBZ.getId())) {
// if(StringUtils.isEmpty(fkCondition.getWosncode())) {
// throwReturnMessage("该订单序列号未输入，请重新确认！");
// }
// FkVO gpfkVo = gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getSncode(), fkCondition.getBzgxid());
// if(gpfkVo==null) {
// Gpfk gpfk = new Gpfk();
// FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
// gpfk.setWosnid(curFkVo.getWosnCode());
// gpfk.setWogylx(curFkVo.getWogylxid());
// gpfk.setFkgx(curFkVo.getWogylxid());
// gpfk.setFkrid(UserInfoUtil.getId());
// gpfk.setFkr(UserInfoUtil.getUserName());
// gpfk.setFksj(DateUtils.getDateTime());
// gpfk.setWlid(curFkVo.getWlid());
// gpfk.setYwrq(DateUtils.getDate());
// gpfk.setHgbz("Y");
// gpfk.setFklx(GpfkFklxEnum.WO.getId());
// gpfk.setHgsl(1.0);
// gpfk.setBhgsl(0.0);
// insert(gpfk);
// }
// else {
// Gpfk gpfk = new Gpfk();
// EntityDataFactory.copyEntity(gpfkVo, gpfk);
// gpfk.setHgbz("Y");
// gpfk.setHgsl(1.0);
// gpfk.setBhgsl(0.0);
// gpfk.setFkrid(UserInfoUtil.getId());
// gpfk.setFkr(UserInfoUtil.getUserName());
// gpfk.setFksj(DateUtils.getDateTime());
// update(gpfk);
// }
// GpfkVO jygpfkVo =gpfkDao.queryJyGpfkByWosnUptoDate(fkCondition.getWosncode());
// if(jygpfkVo!=null) {
// Gpfk jygpfk = new Gpfk();
// EntityDataFactory.copyEntity(jygpfkVo, jygpfk);
// jygpfk.setHgdj(GpfkHgEnum.WXHG.getId());
// update(jygpfk);
// }
// FkVO newFkVo =gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getSncode(), fkCondition.getBzgxid());
// newFkVo.setSntype(snType);
// Wogylx wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, newFkVo.getWogylxid());
// if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
// if(StringUtils.isNotEmpty(newFkVo.getHgbz())&&newFkVo.getHgbz().equals("N")) {
// updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false);
// }
// else {
// updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
// }
// }
// return newFkVo;
// }
// else if(snType.equals(SmCodeEnum.NGBZ.getId())) {
// if(StringUtils.isEmpty(fkCondition.getWosncode())) {
// throwReturnMessage("该订单序列号未输入，请重新确认！");
// }
// FkVO gpfkVo = gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getSncode(), fkCondition.getBzgxid());
// if(gpfkVo==null) {
// Gpfk gpfk = new Gpfk();
// FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
// gpfk.setWosnid(curFkVo.getWosnCode());
// gpfk.setWogylx(curFkVo.getWogylxid());
// gpfk.setFkgx(curFkVo.getWogylxid());
// gpfk.setFkrid(UserInfoUtil.getId());
// gpfk.setFkr(UserInfoUtil.getUserName());
// gpfk.setFksj(DateUtils.getDateTime());
// gpfk.setWlid(curFkVo.getWlid());
// gpfk.setHgbz("N");
// gpfk.setFklx(GpfkFklxEnum.WO.getId());
// gpfk.setYwrq(DateUtils.getDate());
// gpfk.setHgsl(0.0);
// gpfk.setBhgsl(1.0);
// insert(gpfk);
// }
// else {
// Gpfk gpfk = new Gpfk();
// EntityDataFactory.copyEntity(gpfkVo, gpfk);
// gpfk.setHgbz("N");
// gpfk.setHgsl(0.0);
// gpfk.setBhgsl(1.0);
// gpfk.setFkrid(UserInfoUtil.getId());
// gpfk.setFkr(UserInfoUtil.getUserName());
// gpfk.setFksj(DateUtils.getDateTime());
// update(gpfk);
// }
// FkVO newFkVo =gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
// newFkVo.setSntype(snType);
//// Wogylx wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, newFkVo.getWogylxid());
//// if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
//// if(StringUtils.isNotEmpty(newFkVo.getHgbz())&&newFkVo.getHgbz().equals("N")) {
//// cancelPcjh(wogylx.getWoid(),wogylx.getGxlx(),false);
//// }
//// else {
//// cancelPcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
//// }
//// }
// return newFkVo;
// }
// return null;
// }
/************ -------------------科威尔反馈升级--END--------- ******/ /************ -------------------科威尔反馈升级--END--------- ******/
} }
gavel/src/main/java/com/gavel/kwell/utils/YymkFKEnum.java
View file @ e910bbf2
...@@ -12,7 +12,8 @@ public enum YymkFKEnum { ...@@ -12,7 +12,8 @@ public enum YymkFKEnum {
ZP("ZP", "1901000200"), ZP("ZP", "1901000200"),
JY("JY","1901000400"), JY("JY","1901000400"),
WX("WX","1901000600"); WX("WX","1901000600"),
JG("JG","1901000800");
private String id; private String id;
private String name; private String name;
......
gavel/src/main/resources/module.xml
View file @ e910bbf2
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
<version>1.0</version> <version>1.0</version>
<menu mkid="901000000" mkmc = "科威尔MES"> <menu mkid="901000000" mkmc = "科威尔MES">
<menu mkid="901001600" mkmc="加工反馈" url="kmes/jgfk/zpindex">
<print entity="com.gavel.kwell.vo.GpfkVO"/>
<mkcz czid = "21" czmc = "取消装配" value="Y"/>
</menu>
<menu mkid="901000200" mkmc="装配反馈" url="kmes/gphy/zpindex"> <menu mkid="901000200" mkmc="装配反馈" url="kmes/gphy/zpindex">
<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"/>
...@@ -42,6 +46,8 @@ ...@@ -42,6 +46,8 @@
</menu> </menu>
<menu mkid="1901000600" mkmc="维修反馈" url="kmes/gpwx/index" gnlx="M"> <menu mkid="1901000600" mkmc="维修反馈" url="kmes/gpwx/index" gnlx="M">
</menu> </menu>
<menu mkid="1901000800" mkmc="加工反馈" url="kmes/jgfk/index" gnlx="M">
</menu>
</menu> </menu>
<menu fmkid="510020000" mkid="510020300" mkmc="排产计划维护" url="kmes/pcjhk/index"> <menu fmkid="510020000" mkid="510020300" mkmc="排产计划维护" url="kmes/pcjhk/index">
<print entity="com.gavel.kwell.vo.PcjhkVO" type="M"/> <print entity="com.gavel.kwell.vo.PcjhkVO" type="M"/>
......
gavel/src/main/resources/templates/views/kmes/gphy/index.html
View file @ e910bbf2
...@@ -96,6 +96,11 @@ ...@@ -96,6 +96,11 @@
width: '20%', width: '20%',
align:"center" align:"center"
}, },
{title: "关键物料", field: "gjwl", fieldType: "ftString", width: 80,formatter:function (value,index,row) {
var map = {"Y":"<span style='color: green'>是</span>","N": "否"};
var text = map[value];
return text||"";
}},
] ]
] ]
/* 初始化工序 */ /* 初始化工序 */
...@@ -227,11 +232,11 @@ ...@@ -227,11 +232,11 @@
height: '100%', height: '100%',
width:"100%", width:"100%",
fitColumns: false, fitColumns: false,
// rowStyler:function(index,row){ rowStyler:function(index,row){
// if(index<2){ if(row.gjwl==''||row.gjwl==undefined||row.gjwl=='N'){
// return 'background-color:#6293BB;color:#fff;'; return 'background-color:#ADADAD;color:#fff;';
// } }
// }, },
columns:zpfk_columns, columns:zpfk_columns,
data: that.tabdata data: that.tabdata
} }
......
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