通过SN获取工单数据

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

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

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

@@ -97,6 +97,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 			case GoMo:
 				remap = GoMo(json);
 				break;
+			case GetMakeInfoBySN:
+				remap = GetMakeInfoBySN(json);
+				break;
 			default:
 				err = -1;
 				break;
@@ -779,12 +782,39 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 	}
 
+	private Boolean GetMakeInfoBySN(String iSN)
+	{
+		Map<Object, Object> rmap = new HashMap<Object, Object>();
+		String iSN=null;
+		String oErrMessage=null;
+		if(map.get("iSN")==null){
+			oErrMessage = "SN不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		iSN=map.get("iSN").toString();
+		SqlRowList rs=baseDao.queryForRowSet("select ma_remark1,ma_remark2,ma_remark3,ma_remark4,ma_remark5,ma_remark6 from  make  " +
+				"left join makeserial on ms_makecode=ma_code  where ms_sncode='"+iSN+"'");
+		if(rs.next()){
+			rmap.put("oMaremark1",rs.getString("ma_remark1"));
+			rmap.put("oMaremark2",rs.getString("ma_remark2"));
+			rmap.put("oMaremark3",rs.getString("ma_remark3"));
+			rmap.put("oMaremark4",rs.getString("ma_remark4"));
+			rmap.put("oMaremark5",rs.getString("ma_remark5"));
+			rmap.put("oMaremark6",rs.getString("ma_remark6"));
+		}else{
+			oErrMessage = "SN未查询到关联信息";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+	}
+
 	public Map<Object,Object> SetStepFinish(String iMakeCode, String iSourceCode, String iSN, String iMPKind, String iResult, String iUserCode, String iErrCode)
 	{
 		String oErrMessage = null;
 		Object StepCode = baseDao.getFieldDataByCondition("Makeserial", "ms_stepcode", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
 		String CurrentStep = GetStepCodeBySource(iSourceCode);
-		Object BgCode = baseDao.getFieldDataByCondition("step", "st_badgroupcode", "st_code='" + CurrentStep + "'");
+		Object BgCode = baseDao.getFieldDataByCondition("step", "nvl(st_badgroupcode,' ')", "st_code='" + CurrentStep + "'");
 		Map<Object, Object> rmap = new HashMap<>();
 		switch (iResult)
 		{
@@ -873,4 +903,6 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return AE_MASTER.toString();
 	}
 
+
+
 }