调整bug

gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkDaoImpl.java

@@ -900,9 +900,9 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
         return sqlMap.getRecordSet();
     }
 
-    
- 
-    
+
+
+
     @Override
     public GpfkVO queryDailyFkInfo(GpfkCondition condition){
         SqlMap sqlMap = new SqlMap();
@@ -1084,7 +1084,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
         return sqlMap.queryEntity(GpfkVO.class);
     }
 
-    
+
     @Override
 	public WosngzVO queryKwellWoBySnid(String snid){
         SqlMap sqlMap = new SqlMap();
@@ -1174,7 +1174,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
 	      }
 	      return sqlMap.queryEntity(GylxVO.class);
 	}
-	
+
 	@Override
 	public FkVO queryKwellGpfkByWosnAndGxid(FkCondition condition){
 			SqlMap sqlMap = new SqlMap();
@@ -1251,7 +1251,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
 	        sqlMap.setParamValue(" pBZGXID ",bzgx);
 	        return sqlMap.queryEntity(FkVO.class);
 	}
-	
+
 
 
 
@@ -1287,7 +1287,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
         }
         return sqlMap.queryDouble();
 	}
-	
+
 	@Override
 	public List<WobomVO> queryWobomByFkidAndWlid(String fkid,String wlid,String bzlx) {
 		 SqlMap sqlMap = new SqlMap();
@@ -1376,7 +1376,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
         sqlMap.append("LEFT JOIN WLXX ON WLXX_ID = GPHY_WLID ");
         sqlMap.append("where 1 = 1 ");
         if (StringUtils.isNotEmpty(condition.getSnid())){
-        	sqlMap.append("  and (WLXX_CODE = :pSnid) ");
+        	sqlMap.append("  and (GPHY_WLSNID = :pSnid) ");
             sqlMap.setParamValue("pSnid", condition.getSnid());
         }
         if (StringUtils.isNotEmpty(condition.getMid())){
@@ -1447,7 +1447,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
         sqlMap.append("order by GPFK_FKSJ desc ");
         return sqlMap.query(FkVO.class);
 	}
-	
+
 	@Override
 	public FkVO queryKwellWoBySnidUptoDate(String wosnid, String bzgx) {
 		 	SqlMap sqlMap = new SqlMap();
@@ -1468,7 +1468,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
 	        sqlMap.append(" order by GPFK_FKSJ DESC ");
 	        return sqlMap.queryEntity(FkVO.class);
 	}
-	
+
 	@Override
 	public List<FkVO> queryKwellAllGpfkByWosnAndGxid(FkCondition condition){
 			SqlMap sqlMap = new SqlMap();
@@ -1530,7 +1530,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
         return sqlMap.queryEntity(GpfkVO.class);
 	}
 
-	
+
 	@Override
 	public Wogylx getLastGx(Wogylx wogylx) {
 		 SqlMap sqlMap = new SqlMap();
@@ -1558,8 +1558,8 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
 	        sqlMap.setParamValue("pXH",wogylx.getXh());
 	        return sqlMap.queryEntity(Wogylx.class);
 	}
-	
-	
+
+
 	@Override
 	public Wogylx getNextGxUpdate(Wogylx wogylx) {
 		 SqlMap sqlMap = new SqlMap();
@@ -1731,7 +1731,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
 	          sqlMap.setParamValue("WOBOM_WLID", wlid);
 	      }
 	     sqlMap.append(" group by WOSN_CODE,bzgx_id,wobom_wlid ");
-	     
+
 	      return sqlMap.queryDouble();
 	}
 
@@ -1761,7 +1761,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
         sqlMap.append("order by GPFK_FKSJ desc, GPFK_FKGX ");
         return sqlMap.queryEntity(GpfkVO.class);
 	}
-	
-	
+
+
 }
 

gavel/src/main/java/com/gavel/kwell/service/impl/GpfkServiceImpl.java

@@ -86,43 +86,43 @@ import com.gavel.wo.vo.WobomVO;
 @Service("gpfkService")
 @Transactional
 public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService {
-	
+
     @Autowired
     private GpfkDao gpfkDao;
-    
+
     @Autowired
     private GphyDao gphyDao;
-    
+
     @Autowired
     private GphyDao gphydao;
 
     @Autowired
     private CommonService commonService;
-    
+
     @Autowired
     private BzgxService bzgxService;
 
     @Autowired
     private UserRoleService userRoleService;
-    
+
     @Autowired
     private GphyService gphyService;
-    
+
     @Autowired
     private YymkService yymkService;
-    
+
     @Autowired
     private PcjhmxService pcjhmxService;
-    
+
     @Autowired
     private AttachmentService attachmentService;
-    
+
     @Autowired
     private CoderuleService coderuleService;
-    
+
     @Autowired
     private UserDao userDao;
-    
+
 
     @Override
     public void initService() {
@@ -183,7 +183,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
             	else {
             		cancelPcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
             	}
-            } 
+            }
         }
     }
 
@@ -772,7 +772,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
             throwReturnMessage("用户不存在！");
         }
         if (StringUtils.equalsIgnoreCase(user.getTybz(), "Y")) {
-        	throwReturnMessage("用户禁用！"); 
+        	throwReturnMessage("用户禁用！");
         }
         if(!BooleanEnum.equalsYes(user.getLogin())){
         	throwReturnMessage("用户非登录用户！");
@@ -900,9 +900,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 		}
 		return null;
 	}
-	
 
-	
+
+
 
 	@Override
 	public FkVO jyfk(FkCondition fkCondition) {
@@ -1005,7 +1005,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 	        	else {
 	        		updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
 	        	}
-	        } 
+	        }
 			return newFkVo;
 		}
 		else if(snType.equals(SmCodeEnum.NGBZ.getId())) {
@@ -1051,13 +1051,13 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 	        	else {
 	        		updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
 	        	}
-	        } 
+	        }
 			return newFkVo;
 		}
 		else {
 			throwReturnMessage("序列号类型错误，请重新确认！");
 		}
-		
+
 		return fkVO;
 	}
 
@@ -1162,7 +1162,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 	        	else {
 	        		updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
 	        	}
-	        } 
+	        }
 			return newFkVo;
 		}
 		else if(snType.equals(SmCodeEnum.NGBZ.getId())) {
@@ -1208,16 +1208,16 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 	        	else {
 	        		updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
 	        	}
-	        } 
+	        }
 			return newFkVo;
 		}
 		else {
 			throwReturnMessage("序列号类型错误，请重新确认！");
 		}
-		
+
 		return fkVO;
 	}
-	
+
 	@Override
 	public FkVO zpfk(FkCondition fkCondition) {
 		if(StringUtils.isEmpty(fkCondition.getSncode())) {
@@ -1269,7 +1269,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 			if(!curFkVo.getWozt().equals("R")) {
 				throwReturnMessage("该订单未下达无法进行反馈，请重新确认！");
 			}
-			
+
 			if(StringUtils.isNotEmpty(curFkVo.getId())) {
 				GphyCondition hyCondition =new GphyCondition();
 				hyCondition.setMid(curFkVo.getId());
@@ -1348,7 +1348,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 		        	else {
 		        		updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
 		        	}
-		        } 
+		        }
 			}
 			gpfkVo.setSntype(SmCodeEnum.WLID.getId());
 			Wlxx cuwlxx = gpfkDao.queryById(Wlxx.class, wlid);
@@ -1360,7 +1360,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 			throwReturnMessage("序列号类型错误，请重新确认！");
 		}
 		return fkVO;
-		
+
 	}
 	/************   -------------------科威尔反馈升级--BEGIN---------   ******/
 
@@ -1388,7 +1388,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
             		}
             		if((existLastWogylx.getGxlx()).equals(YymkFKEnum.JY.getId())) {
             			if(StringUtils.isNotEmpty(gpfkVo2.getHgbz())&&(gpfkVo2.getHgbz().equals("Y")||gpfkVo2.getHgdj().equals(GpfkHgEnum.JYHG.getId())||gpfkVo2.getHgdj().equals(GpfkHgEnum.WXHG.getId()))) {
-            				
+
             			}
             			else {
             				throwReturnMessage("上道工序检验不合格不能反馈此道工序，请重新确认！");
@@ -1404,7 +1404,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 			throwReturnMessage("该订单未下达无法进行反馈，请重新确认！");
 		}
 	}
-	
+
 	/**  判断下一道工序是否存在反馈记录 */
 	public void checkNextBzgxIfExistFk(FkVO curFkVo) {
 		if(curFkVo==null) {
@@ -1428,18 +1428,18 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 			throwReturnMessage("该订单未下达无法进行反馈，请重新确认！");
 		}
 	}
-	
+
 	/**  判断下一道工序是否存在反馈记录 */
 	public boolean  checkIsCurrentGx(FkVO curFkVo) {
 		boolean flag = false;
 		GpfkVO  gpfk = gpfkDao.queryGpfkByWosnUptoDate(curFkVo.getWosnCode());
-		if((curFkVo!=null&&gpfk!=null&&StringUtils.isNotEmpty(gpfk.getFkgx())&&StringUtils.isNotEmpty(curFkVo.getWogylx())&&gpfk.getFkgx().equals(curFkVo.getWogylx())))
+    		if((curFkVo!=null&&gpfk!=null&&StringUtils.isNotEmpty(gpfk.getFkgx())&&StringUtils.isNotEmpty(curFkVo.getWogylxid())&&gpfk.getFkgx().equals(curFkVo.getWogylxid())))
 		{
 			flag =true;
 		}
 		return flag;
 	}
-	
+
 	/**  判断装配工序是否装配完成*/
 	public boolean  checkIfZpCompleteByWosnAndBzgx(String wosnid,String bzgx) {
 		boolean flag = false;
@@ -1448,7 +1448,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 		}
 		return flag;
 	}
-	
+
 	/**  判断该物料是否装配完成*/
 	public void  compareIsZpComplete(GphyCondition gphyCondition) {
 		WlslItem wlslItem =gpfkDao.queryKwellZpslGphy(gphyCondition);
@@ -1459,14 +1459,14 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 				}
 			}
 	}
-	
+
 	/**  查询订单清单及已经装配数量 */
 	@Override
 	public List<WobomVO> queryWobomByWoUpgrade(String wosn,String bzgx) {
 		return gpfkDao.queryWobomByWosnAndBzgx(wosn,bzgx);
 	}
-	
-	
+
+
 	/**
 	 * 装配反馈流程升级
 	 */
@@ -1577,7 +1577,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 		        	else {
 		        		updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
 		        	}
-		        } 
+		        }
 			}
 			gpfkVo.setSntype(SmCodeEnum.WLID.getId());
 			Wlxx cuwlxx = gpfkDao.queryById(Wlxx.class, wlid);
@@ -1628,7 +1628,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 			if(StringUtils.isEmpty(fkCondition.getWosncode())) {
 				throwReturnMessage("该订单序列号未输入，请重新确认！");
 			}
-			FkVO gpfkVo = gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getSncode(), fkCondition.getBzgxid());
+			FkVO gpfkVo = gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
 			if(gpfkVo==null) {
 				Gpfk gpfk = new Gpfk();
 				FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
@@ -1659,7 +1659,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 				gpfk.setHgdj(GpfkHgEnum.JYHG.getId());
 				update(gpfk);
 			}
-			FkVO newFkVo =gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getSncode(), fkCondition.getBzgxid());
+			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"))) {
@@ -1669,14 +1669,14 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 	        	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());
+			FkVO gpfkVo = gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
 			if(gpfkVo==null) {
 				Gpfk gpfk = new Gpfk();
 				FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
@@ -1717,7 +1717,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 	        	else {
 	        		cancelPcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
 	        	}
-	        } 
+	        }
 			return newFkVo;
 		}
 		return null;
@@ -1806,7 +1806,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 	        	else {
 	        		updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
 	        	}
-	        } 
+	        }
 			return newFkVo;
 		}
 		else if(snType.equals(SmCodeEnum.NGBZ.getId())) {
@@ -1852,11 +1852,11 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 	        	else {
 	        		cancelPcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
 	        	}
-	        } 
+	        }
 			return newFkVo;
 		}
 		return null;
 	}
-	
+
 	/************   -------------------科威尔反馈升级--END---------   ******/
 }