【功能完善】【CCD校验逻辑更改】

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

@@ -439,52 +439,51 @@ public class MESDataServiceImpl implements MESDataService {
 			return ApiResponse.failRsp("10034","请确认拍照时间！");
 
 		}
-		String MaCode = StringUtil.nvl(map.get("MaCode"), "");
-		if ("".equals(MaCode)){
-			return ApiResponse.failRsp("10035","请确定工单！");
-		}
-		//获取校验规则
-		if(!baseDao.checkIf("customtabledetail left join customtable on ct_id=cd_ctid","ct_caller='CCDVerifyLogic' and cd_varchar50_1='"+MaCode+"'")){
-			return ApiResponse.failRsp("10036","请设置工单对应的校验规则！");
-		}
-		SqlRowList rs = baseDao.queryForRowSet("select cd_number_1,cd_number_2,cd_number_3,cd_number_4,cd_number_5,cd_number_6,cd_number_7,cd_number_8,cd_number_9,cd_number_10,cd_number_11,cd_number_12 from customtable left join customtabledetail on ct_id=cd_ctid where ct_caller='CCDVerifyLogic' and cd_varchar50_1='" + MaCode + "' order by ct_recorddate desc,cd_detno desc");
 		String condition="pcq_qrcode='"+QRCode+"'";
-		if (rs.next()){
-			if (rs.getGeneralInt("cd_number_1")!=0){
-				condition=condition+" and pcq_qrgrade='" + QRGrade + "'";
-			}
-			if (rs.getGeneralInt("cd_number_2")!=0){
-				condition=condition+" and pcq_machineno='" + MachineNo + "'";
-			}
-			if (rs.getGeneralInt("cd_number_3")!=0){
-				condition=condition+" and nvl(pcq_retraceno1,' ')='" + StringUtil.nvl(map.get("RetraceNo1"), " ") + "'";
-			}
-			if (rs.getGeneralInt("cd_number_4")!=0){
-				condition=condition+" and nvl(pcq_retraceno2,' ')='" + StringUtil.nvl(map.get("RetraceNo2"), " ") + "'";
-			}
-			if (rs.getGeneralInt("cd_number_5")!=0){
-				condition=condition+" and nvl(pcq_retraceno3,' ')='" + StringUtil.nvl(map.get("RetraceNo3"), " ") + "'";
-			}
-			if (rs.getGeneralInt("cd_number_6")!=0){
-				condition=condition+" and nvl(pcq_retraceno4,' ')='" + StringUtil.nvl(map.get("RetraceNo4"), " ") + "'";
-			}
-			if (rs.getGeneralInt("cd_number_7")!=0){
-				condition=condition+" and nvl(pcq_retraceno5,' ')='" + StringUtil.nvl(map.get("RetraceNo5"), " ") + "'";
-			}
-			if (rs.getGeneralInt("cd_number_8")!=0){
-				condition=condition+" and nvl(pcq_retraceno6,' ')='" + StringUtil.nvl(map.get("RetraceNo6"), " ") + "'";
-			}
-			if (rs.getGeneralInt("cd_number_9")!=0){
-				condition=condition+" and nvl(pcq_retraceno7,' ')='" + StringUtil.nvl(map.get("RetraceNo7"), " ") + "'";
-			}
-			if (rs.getGeneralInt("cd_number_10")!=0){
-				condition=condition+" and nvl(pcq_retraceno8,' ')='" + StringUtil.nvl(map.get("RetraceNo8"), " ") + "'";
-			}
-			if (rs.getGeneralInt("cd_number_11")!=0){
-				condition=condition+" and nvl(pcq_retraceno9,' ')='" + StringUtil.nvl(map.get("RetraceNo9"), " ") + "'";
+		String MaCode = StringUtil.nvl(map.get("MaCode"), "");
+		if (!"".equals(MaCode)) {
+			//获取校验规则
+			if (!baseDao.checkIf("customtabledetail left join customtable on ct_id=cd_ctid", "ct_caller='CCDVerifyLogic' and cd_varchar50_1='" + MaCode + "'")) {
+				return ApiResponse.failRsp("10036", "请设置工单对应的校验规则！");
 			}
-			if (rs.getGeneralInt("cd_number_12")!=0){
-				condition=condition+" and nvl(pcq_retraceno10,' ')='" + StringUtil.nvl(map.get("RetraceNo10"), " ") + "'";
+			SqlRowList rs = baseDao.queryForRowSet("select cd_number_1,cd_number_2,cd_number_3,cd_number_4,cd_number_5,cd_number_6,cd_number_7,cd_number_8,cd_number_9,cd_number_10,cd_number_11,cd_number_12 from customtable left join customtabledetail on ct_id=cd_ctid where ct_caller='CCDVerifyLogic' and cd_varchar50_1='" + MaCode + "' order by ct_recorddate desc,cd_detno desc");
+			if (rs.next()) {
+				if (rs.getGeneralInt("cd_number_1") != 0) {
+					condition = condition + " and pcq_qrgrade='" + QRGrade + "'";
+				}
+				if (rs.getGeneralInt("cd_number_2") != 0) {
+					condition = condition + " and pcq_machineno='" + MachineNo + "'";
+				}
+				if (rs.getGeneralInt("cd_number_3") != 0) {
+					condition = condition + " and nvl(pcq_retraceno1,' ')='" + StringUtil.nvl(map.get("RetraceNo1"), " ") + "'";
+				}
+				if (rs.getGeneralInt("cd_number_4") != 0) {
+					condition = condition + " and nvl(pcq_retraceno2,' ')='" + StringUtil.nvl(map.get("RetraceNo2"), " ") + "'";
+				}
+				if (rs.getGeneralInt("cd_number_5") != 0) {
+					condition = condition + " and nvl(pcq_retraceno3,' ')='" + StringUtil.nvl(map.get("RetraceNo3"), " ") + "'";
+				}
+				if (rs.getGeneralInt("cd_number_6") != 0) {
+					condition = condition + " and nvl(pcq_retraceno4,' ')='" + StringUtil.nvl(map.get("RetraceNo4"), " ") + "'";
+				}
+				if (rs.getGeneralInt("cd_number_7") != 0) {
+					condition = condition + " and nvl(pcq_retraceno5,' ')='" + StringUtil.nvl(map.get("RetraceNo5"), " ") + "'";
+				}
+				if (rs.getGeneralInt("cd_number_8") != 0) {
+					condition = condition + " and nvl(pcq_retraceno6,' ')='" + StringUtil.nvl(map.get("RetraceNo6"), " ") + "'";
+				}
+				if (rs.getGeneralInt("cd_number_9") != 0) {
+					condition = condition + " and nvl(pcq_retraceno7,' ')='" + StringUtil.nvl(map.get("RetraceNo7"), " ") + "'";
+				}
+				if (rs.getGeneralInt("cd_number_10") != 0) {
+					condition = condition + " and nvl(pcq_retraceno8,' ')='" + StringUtil.nvl(map.get("RetraceNo8"), " ") + "'";
+				}
+				if (rs.getGeneralInt("cd_number_11") != 0) {
+					condition = condition + " and nvl(pcq_retraceno9,' ')='" + StringUtil.nvl(map.get("RetraceNo9"), " ") + "'";
+				}
+				if (rs.getGeneralInt("cd_number_12") != 0) {
+					condition = condition + " and nvl(pcq_retraceno10,' ')='" + StringUtil.nvl(map.get("RetraceNo10"), " ") + "'";
+				}
 			}
 		}
 		if (baseDao.checkIf("ProdCCDQRCode",condition)){