添加录入不良接口

src/main/java/com/uas/eis/entity/HelperType.java

@@ -18,6 +18,7 @@ public enum HelperType {
     SetIMEIInfo("SetIMEIInfo","设置IMEI信息") ,//设置IMEI信息
     SetTestDetail("SetTestDetail","设置测试结果") ,//设置测试结果
     SetPcbaData("SetPcbaData","检测XXX") ,//设置测试结果
+    SetPcbaData_NG("SetPcbaData_NG","检测XXX") ,//设置测试结果
     GoMo("GoMo","检测XXX") ,//序列号归属工单
     GetInfoByMaterial("GetInfoByMaterial","根据上料信息获取到SN相关信息"),
     GetMakeInfoBySN("GetMakeInfoBySN","根据SN获取工单相关信息"),

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

@@ -98,6 +98,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 			case SetPcbaData:
 				remap = SetPcbaData(json);
 				break;
+			case SetPcbaData_NG:
+				remap = SetPcbaData_NG(json);
+				break;
 			case GetInfoByMaterial:
 				remap = GetInfoByMaterial(json);
 				break;
@@ -949,6 +952,52 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
+	private Map<Object,Object> SetPcbaData_NG(JSONObject map){
+		String iErrCode="";
+		String iSN="";
+		Map<Object, Object> rmap = new HashMap<Object, Object>();
+		String oErrMessage;
+		if(map.get("iErrCode")!=null){
+			iErrCode=map.get("iErrCode").toString();
+		}
+		if(map.get("iSN")!=null){
+			iSN=map.get("iSN").toString();
+		}
+		SqlRowList rs=baseDao.queryForRowSet("select ms_sncode,ms_makecode,ms_status from makeserial where ms_sncode='"+iSN+"' order by ms_id desc");
+		if(rs.next()){
+
+			String ms_status=rs.getString("ms_status");
+			String iMakeCode=rs.getString("ms_makecode");
+			if(!ms_status.equals("2")){
+				oErrMessage = "SN未完工，不允许采集";
+				rmap.put("oErrMessage",oErrMessage);
+				return rmap;
+			}
+			//实际业务数据
+			String[] BadCode = iErrCode.split(",");
+			StringBuffer sql=new StringBuffer();
+			for (int i = 0; i < BadCode.length; i++)
+			{
+				int mb_id = baseDao.getSeqId("makebad_seq");
+				sql.setLength(0);
+				sql.append("insert into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,mb_indate,mb_stepcode");
+				sql.append(",mb_sourcecode,mb_badcode,mb_badtable,mb_bgcode,mb_soncode,mb_status) select '" + mb_id + "'");
+				sql.append(",ma_code,ms_code,ms_sncode,'',sysdate,'','','" + BadCode[i] + "','',");
+				sql.append("'',sp_soncode,'0' from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
+				sql.append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
+				baseDao.execute(sql.toString());
+			}
+			//将不良的序列号的状态码设为3
+			baseDao.execute("update makeserial set ms_status='3',ms_outboxcode='' where ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
+			baseDao.execute("delete from packagedetail where pd_barcode='"+iSN+"' and pd_makecode='"+iMakeCode+"'");
+		}else {
+			oErrMessage = "SN不存在";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		return rmap;
+	}
+
 	/// <summary>
 	/// 获取步骤代码
 	/// </summary>