【漳州万利达MES】【返工工单拆解部件逻辑调整，将所属SN无论转号前后上料记录统一拆解】

src/com/uas/mes/pm/service/impl/MakeBaseServiceImpl.java

@@ -1592,8 +1592,8 @@ public class MakeBaseServiceImpl implements MakeBaseService {
 						+ " where re_id=?  AND nvl(cm_status,0)=0  and cm_barcode=A.ms_sncode and cm_soncode=A.ms_prodcode  and NVL(A.MS_NEXTMACODE,' ')<>' ' AND A.MS_NEXTMACODE=cm_makecode) ",re_id);
 				baseDao.execute(" update craftmaterial set cm_status=-1,cm_dropcode=?,cm_dropman=?,"
 						+" cm_dropdate=sysdate where  exists (select 1  from rework inner join reworkdetail on "
-						+" rd_reid=re_id  inner join makeserial on ms_sncode=rd_sncode and ms_makecode=rd_scmacode inner join makesndecompose on msd_recode=re_code where re_id=? "
-						+" and msd_fsoncode=cm_fsoncode and msd_stepcode=cm_stepcode and cm_firstsn=ms_firstsn)  and  nvl(cm_status,0)=0 ",re_code,SystemSession.getUser().getEm_code(),re_id);
+						+" rd_reid=re_id  inner join makeserial on ms_sncode=rd_sncode or ms_code = rd_sncode inner join makesndecompose on msd_recode=re_code where re_id=? "
+						+" and msd_fsoncode=cm_fsoncode  and (cm_sncode=ms_firstsn or cm_sncode = ms_sncode))  and  nvl(cm_status,0)=0 ",re_code,SystemSession.getUser().getEm_code(),re_id);
 			}
 		}