优化回流逻辑

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

@@ -989,10 +989,10 @@ public class MESHelperServiceImpl implements MESHelperService {
 		ms_makecode=rs.getString("ms_makecode");
 		String ms_paststep=rs.getString("ms_paststep")==null?"":rs.getString("ms_paststep");
 		//只能回流到已执行工序
-		if(!ms_paststep.contains(iStepCode)){
-			rmap.put("oErrMessage","序列号"+iSN+"不允许回流到未执行工序");
-			return rmap;
-		}
+//		if(!ms_paststep.contains(iStepCode)){
+//			rmap.put("oErrMessage","序列号"+iSN+"不允许回流到未执行工序");
+//			return rmap;
+//		}
 		//已出货不允许回流
 		if("-1".equals(rs.getString("ms_outstatus"))){
 			rmap.put("oErrMessage","序列号"+iSN+"已出货不允许回流");
@@ -1006,15 +1006,15 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 
 		//取回流工序在工艺路线中的执行顺序,用于判断用料表需要拆解的项次
-		Object stepno=baseDao.getFieldDataByCondition(Master+".craft left join "+Master+".craftdetail on cr_id=cd_crid",
-				"cd_stepno","cr_code=(select ms_craftcode from "+Master+".makeserial where ms_id='"+ms_id+"') " +
-				"and cr_prodcode=(select ms_prodcode from "+Master+".makeserial where ms_id='"+ms_id+"') " +
-				"and cd_stepcode='"+iStepCode+"'");
-		String cd_stepno=stepno==null?"":stepno.toString();
-		if("".equals(cd_stepno)){
-			rmap.put("oErrMessage","工序"+iStepCode+"不在该SN的工艺路线中");
-			return rmap;
-		}
+//		Object stepno=baseDao.getFieldDataByCondition(Master+".craft left join "+Master+".craftdetail on cr_id=cd_crid",
+//				"cd_stepno","cr_code=(select ms_craftcode from "+Master+".makeserial where ms_id='"+ms_id+"') " +
+//				"and cr_prodcode=(select ms_prodcode from "+Master+".makeserial where ms_id='"+ms_id+"') " +
+//				"and cd_stepcode='"+iStepCode+"'");
+//		String cd_stepno=stepno==null?"":stepno.toString();
+//		if("".equals(cd_stepno)){
+//			rmap.put("oErrMessage","工序"+iStepCode+"不在该SN的工艺路线中");
+//			return rmap;
+//		}
 
 		//工序名称,用于返回与记录操作日志
 		Object stname=baseDao.getFieldDataByCondition(Master+".step","st_name","st_code='"+iStepCode+"'");
@@ -1047,8 +1047,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 		//重置makeserial:置为未激活并清空Key,ms_paststep截断到回流工序之前
 		sql.setLength(0);
-		sql.append("update "+Master+".makeserial set ms_status=1,ms_isactive=0,ms_outboxcode='',ms_keyid='',ms_printcount=0,ms_stepcode='',ms_nextstepcode='"+iStepCode+"',");
-		sql.append("ms_paststep=case when instr(ms_paststep,'"+iStepCode+"')>0 then substr(ms_paststep,0,instr(ms_paststep,'"+iStepCode+"')-2) else ms_paststep end ");
+		sql.append("update "+Master+".makeserial set ms_status=1,ms_isactive=0,ms_outboxcode='',ms_keyid='',ms_printcount=0 ");
 		sql.append("where ms_sncode='"+iSN+"' and ms_makecode='"+ms_makecode+"'");
 		sqls.add(sql.toString());
 		//当前工序回退到ms_paststep里的最后一道工序