【功能完善】【CCD校验】

src/main/java/com/uas/eis/controller/MESDataController.java

@@ -167,5 +167,16 @@ public class MESDataController {
         return mesDataService.DCRLogExcel(accessKey, requestId, data);
     }
 
+    /**
+     * CCD 条码校验记录
+     * @param data
+     * @return
+     */
+    @RequestMapping("/api/mes/checkCCDQRCode")
+    public ApiResult<String> checkCCDQRCode(HttpServletRequest request,@RequestBody String data){
+        String accessKey = request.getHeader("AccessKey");
+        String requestId = request.getHeader("RequestId");
+        return mesDataService.checkCCDQRCode(accessKey, requestId, data);
+    }
 
 }

src/main/java/com/uas/eis/service/MESDataService.java

@@ -33,4 +33,6 @@ public interface MESDataService {
 
 	ApiResult<String>DCRLogExcel(String accessKey, String requestId, String data);
 
+	ApiResult<String> checkCCDQRCode(String accessKey, String requestId, String data);
+
 }

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

@@ -417,6 +417,36 @@ public class MESDataServiceImpl implements MESDataService {
 		}
 	}
 
+	@Override
+	public ApiResult<String> checkCCDQRCode(String accessKey, String requestId, String data) {
+		String AE_MASTER = checkAccessKey(accessKey, requestId);
+		SpObserver.putSp(AE_MASTER);
+		Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data);
+		String QRCode = StringUtil.nvl(map.get("QRCode"), "");
+		if ("".equals(QRCode)){
+			return ApiResponse.failRsp("10031","条码不能为空！");
+		}
+		String QRGrade = StringUtil.nvl(map.get("QRGrade"), "");
+		if ("".equals(QRGrade)){
+			return ApiResponse.failRsp("10032","条码等级不能为空！");
+		}
+		String MachineNo = StringUtil.nvl(map.get("MachineNo"), "");
+		if ("".equals(MachineNo)){
+			return ApiResponse.failRsp("10033","机台号不能为空！");
+		}
+		String indate = StringUtil.nvl(map.get("indate"), "");
+		if ("".equals(indate)){
+			return ApiResponse.failRsp("10034","请确认拍照时间！");
+		}
+		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"), " ") + "'")){
+			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"), "")+"')");
+			return ApiResponse.successRsp("0", "Success", requestId, "OK");
+		}
+	}
+
 	private String saveFile(MultipartFile file) throws IOException {
 	   String path = "/dcr";
 	   File filep = new File(path);