【功能完善】【CCD校验空值处理】

src/main/java/com/uas/eis/serviceImpl/MESDataServiceImpl.java

@@ -457,34 +457,34 @@ public class MESDataServiceImpl implements MESDataService {
 				condition=condition+" and pcq_machineno='" + MachineNo + "'";
 			}
 			if (rs.getGeneralInt("cd_number_3")!=0){
-				condition=condition+" and pcq_retraceno1='" + StringUtil.nvl(map.get("RetraceNo1"), "") + "'";
+				condition=condition+" and nvl(pcq_retraceno1,' ')='" + StringUtil.nvl(map.get("RetraceNo1"), " ") + "'";
 			}
 			if (rs.getGeneralInt("cd_number_4")!=0){
-				condition=condition+" and pcq_retraceno2='" + StringUtil.nvl(map.get("RetraceNo2"), "") + "'";
+				condition=condition+" and nvl(pcq_retraceno2,' ')='" + StringUtil.nvl(map.get("RetraceNo2"), " ") + "'";
 			}
 			if (rs.getGeneralInt("cd_number_5")!=0){
-				condition=condition+" and pcq_retraceno3='" + StringUtil.nvl(map.get("RetraceNo3"), "") + "'";
+				condition=condition+" and nvl(pcq_retraceno3,' ')='" + StringUtil.nvl(map.get("RetraceNo3"), " ") + "'";
 			}
 			if (rs.getGeneralInt("cd_number_6")!=0){
-				condition=condition+" and pcq_retraceno4='" + StringUtil.nvl(map.get("RetraceNo4"), "") + "'";
+				condition=condition+" and nvl(pcq_retraceno4,' ')='" + StringUtil.nvl(map.get("RetraceNo4"), " ") + "'";
 			}
 			if (rs.getGeneralInt("cd_number_7")!=0){
-				condition=condition+" and pcq_retraceno5='" + StringUtil.nvl(map.get("RetraceNo5"), "") + "'";
+				condition=condition+" and nvl(pcq_retraceno5,' ')='" + StringUtil.nvl(map.get("RetraceNo5"), " ") + "'";
 			}
 			if (rs.getGeneralInt("cd_number_8")!=0){
-				condition=condition+" and pcq_retraceno6='" + StringUtil.nvl(map.get("RetraceNo6"), "") + "'";
+				condition=condition+" and nvl(pcq_retraceno6,' ')='" + StringUtil.nvl(map.get("RetraceNo6"), " ") + "'";
 			}
 			if (rs.getGeneralInt("cd_number_9")!=0){
-				condition=condition+" and pcq_retraceno7='" + StringUtil.nvl(map.get("RetraceNo7"), "") + "'";
+				condition=condition+" and nvl(pcq_retraceno7,' ')='" + StringUtil.nvl(map.get("RetraceNo7"), " ") + "'";
 			}
 			if (rs.getGeneralInt("cd_number_10")!=0){
-				condition=condition+" and pcq_retraceno8='" + StringUtil.nvl(map.get("RetraceNo8"), "") + "'";
+				condition=condition+" and nvl(pcq_retraceno8,' ')='" + StringUtil.nvl(map.get("RetraceNo8"), " ") + "'";
 			}
 			if (rs.getGeneralInt("cd_number_11")!=0){
-				condition=condition+" and pcq_retraceno9='" + StringUtil.nvl(map.get("RetraceNo9"), "") + "'";
+				condition=condition+" and nvl(pcq_retraceno9,' ')='" + StringUtil.nvl(map.get("RetraceNo9"), " ") + "'";
 			}
 			if (rs.getGeneralInt("cd_number_12")!=0){
-				condition=condition+" and pcq_retraceno10='" + StringUtil.nvl(map.get("RetraceNo10"), "") + "'";
+				condition=condition+" and nvl(pcq_retraceno10,' ')='" + StringUtil.nvl(map.get("RetraceNo10"), " ") + "'";
 			}
 		}
 		if (baseDao.checkIf("ProdCCDQRCode",condition)){