[华研EIS]SN不良判定插入不良记录逻辑优化

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

@@ -836,7 +836,6 @@ public class MESHelperServiceImpl implements MESHelperService {
 		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", "nvl(st_badgroupcode,' ')", "st_code='" + CurrentStep + "'");
 		Map<Object, Object> rmap = new HashMap<>();
 		switch (iResult)
 		{
@@ -861,12 +860,14 @@ public class MESHelperServiceImpl implements MESHelperService {
 							rmap.put("oErrMessage",oErrMessage);
 							return rmap;
 						}
+						Object BgCode = baseDao.getFieldDataByCondition("badcode", "nvl(bc_groupcode,' ')", "bc_code='" + BadCode[i] + "'");
+						Object BgName= baseDao.getFieldDataByCondition("badcode", "nvl(bc_groupname,' ')", "bc_code='" + BadCode[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(",mb_sourcecode,mb_badcode,mb_badtable,mb_bgcode,mb_bgname,mb_soncode,mb_status) select '" + mb_id + "'");
 						sql.append(",ma_code,ms_code,ms_sncode,'" + iUserCode + "',sysdate,'" + CurrentStep + "','" + iSourceCode + "','" + BadCode[i] + "','',");
-						sql.append("'" + BgCode + "',sp_soncode,'0' from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
+						sql.append("'" + BgCode + "','"+BgName+"',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());
 					}