【功能完善】【CCD校验完善】

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

@@ -437,12 +437,61 @@ public class MESDataServiceImpl implements MESDataService {
 		String indate = StringUtil.nvl(map.get("indate"), "");
 		if ("".equals(indate)){
 			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 pcq_retraceno1='" + StringUtil.nvl(map.get("RetraceNo1"), "") + "'";
+			}
+			if (rs.getGeneralInt("cd_number_4")!=0){
+				condition=condition+" and pcq_retraceno2='" + StringUtil.nvl(map.get("RetraceNo2"), "") + "'";
+			}
+			if (rs.getGeneralInt("cd_number_5")!=0){
+				condition=condition+" and pcq_retraceno3='" + StringUtil.nvl(map.get("RetraceNo3"), "") + "'";
+			}
+			if (rs.getGeneralInt("cd_number_6")!=0){
+				condition=condition+" and pcq_retraceno4='" + StringUtil.nvl(map.get("RetraceNo4"), "") + "'";
+			}
+			if (rs.getGeneralInt("cd_number_7")!=0){
+				condition=condition+" and pcq_retraceno5='" + StringUtil.nvl(map.get("RetraceNo5"), "") + "'";
+			}
+			if (rs.getGeneralInt("cd_number_8")!=0){
+				condition=condition+" and pcq_retraceno6='" + StringUtil.nvl(map.get("RetraceNo6"), "") + "'";
+			}
+			if (rs.getGeneralInt("cd_number_9")!=0){
+				condition=condition+" and pcq_retraceno7='" + StringUtil.nvl(map.get("RetraceNo7"), "") + "'";
+			}
+			if (rs.getGeneralInt("cd_number_10")!=0){
+				condition=condition+" and pcq_retraceno8='" + StringUtil.nvl(map.get("RetraceNo8"), "") + "'";
+			}
+			if (rs.getGeneralInt("cd_number_11")!=0){
+				condition=condition+" and pcq_retraceno9='" + StringUtil.nvl(map.get("RetraceNo9"), "") + "'";
+			}
+			if (rs.getGeneralInt("cd_number_12")!=0){
+				condition=condition+" and pcq_retraceno10='" + StringUtil.nvl(map.get("RetraceNo10"), "") + "'";
+			}
 		}
-		if (baseDao.checkIf("ProdCCDQRCode","pcq_qrcode='"+QRCode+"' and pcq_qrgrade='" + QRGrade + "' and pcq_machineno='" + MachineNo + "' and nvl(pcq_macode,' ')='"+StringUtil.nvl(map.get("MaCode"), " ")+"' and nvl(pcq_retraceno1,' ')='" + StringUtil.nvl(map.get("RetraceNo1"), " ") + "' and nvl(pcq_retraceno2,' ')='" + StringUtil.nvl(map.get("RetraceNo2"), " ") + "' and nvl(pcq_retraceno3,' ')='" + StringUtil.nvl(map.get("RetraceNo3"), " ") + "' and nvl(pcq_retraceno4,' ')='" + StringUtil.nvl(map.get("RetraceNo4"), " ") + "' and nvl(pcq_retraceno5,' ')='" + StringUtil.nvl(map.get("RetraceNo5"), " ") + "' and nvl(pcq_retraceno6,' ')='" + StringUtil.nvl(map.get("RetraceNo6"), " ") + "' and nvl(pcq_retraceno7,' ')='" + StringUtil.nvl(map.get("RetraceNo7"), " ") + "' and nvl(pcq_retraceno8,' ')='" + StringUtil.nvl(map.get("RetraceNo8"), " ") + "' and nvl(pcq_retraceno9,' ')='" + StringUtil.nvl(map.get("RetraceNo9"), " ") + "' and nvl(pcq_retraceno10,' ')='" + StringUtil.nvl(map.get("RetraceNo10"), " ") + "'")){
+		if (baseDao.checkIf("ProdCCDQRCode",condition)){
 			return ApiResponse.successRsp("0","Success",requestId,"NG");
 		}else {
 			baseDao.execute("insert into ProdCCDQRCode (pcq_id,pcq_date,pcq_indate,pcq_qrcode,pcq_qrgrade,pcq_machineno,pcq_macode,pcq_retraceno1,pcq_retraceno2,pcq_retraceno3,pcq_retraceno4,pcq_retraceno5,pcq_retraceno6,pcq_retraceno7,pcq_retraceno8,pcq_retraceno9,pcq_retraceno10) " +
-					"values (ProdCCDQRCode_seq.nextval,sysdate,to_date('"+indate+"','yyyy-MM-dd HH24:mi:ss'),'"+QRCode+"','"+QRGrade+"','"+MachineNo+"','"+StringUtil.nvl(map.get("MaCode"), "")+"','"+StringUtil.nvl(map.get("RetraceNo1"), "")+"','"+StringUtil.nvl(map.get("RetraceNo2"), "")+"','"+StringUtil.nvl(map.get("RetraceNo3"), "")+"','"+StringUtil.nvl(map.get("RetraceNo4"), "")+"','"+StringUtil.nvl(map.get("RetraceNo5"), "")+"','"+StringUtil.nvl(map.get("RetraceNo6"), "")+"','"+StringUtil.nvl(map.get("RetraceNo7"), "")+"','"+StringUtil.nvl(map.get("RetraceNo8"), "")+"','"+StringUtil.nvl(map.get("RetraceNo9"), "")+"','"+StringUtil.nvl(map.get("RetraceNo10"), "")+"')");
+					"values (ProdCCDQRCode_seq.nextval,sysdate,to_date('"+indate+"','yyyy-MM-dd HH24:mi:ss'),'"+QRCode+"','"+QRGrade+"','"+MachineNo+"','"+MaCode+"','"+StringUtil.nvl(map.get("RetraceNo1"), "")+"','"+StringUtil.nvl(map.get("RetraceNo2"), "")+"','"+StringUtil.nvl(map.get("RetraceNo3"), "")+"','"+StringUtil.nvl(map.get("RetraceNo4"), "")+"','"+StringUtil.nvl(map.get("RetraceNo5"), "")+"','"+StringUtil.nvl(map.get("RetraceNo6"), "")+"','"+StringUtil.nvl(map.get("RetraceNo7"), "")+"','"+StringUtil.nvl(map.get("RetraceNo8"), "")+"','"+StringUtil.nvl(map.get("RetraceNo9"), "")+"','"+StringUtil.nvl(map.get("RetraceNo10"), "")+"')");
 			return ApiResponse.successRsp("0", "Success", requestId, "OK");
 		}
 	}