Explorar el Código

返工料号限制取消

callm hace 3 años
padre
commit
29ccd663a0
Se han modificado 1 ficheros con 2 adiciones y 2 borrados
  1. 2 2
      src/com/uas/mes/pm/service/impl/ReworkServiceImpl.java

+ 2 - 2
src/com/uas/mes/pm/service/impl/ReworkServiceImpl.java

@@ -393,8 +393,8 @@ public class ReworkServiceImpl implements ReworkService {
 	private void updateScmacode(int re_id){
 		baseDao.execute("update reworkdetail set rd_scmacode=(select ms_makecode from ( "
 					+" select ms_makecode,ms_sncode,rank()over(partition by ms_sncode order by ms_id) n  from "
-					+" reworkdetail left join makeserial on ms_sncode=rd_sncode "
-					+" where rd_reid=? order by ms_id desc)where rownum=1 and ms_sncode=rd_sncode) "
+					+" reworkdetail left join rework on re_id=rd_reid left join makeserial on ms_sncode=rd_sncode "
+					+" and instr(re_combineprod,ms_prodcode)>0 where rd_reid=? order by ms_id desc)where rownum=1 and ms_sncode=rd_sncode) "
 					+" where  rd_reid =?",re_id,re_id);
 	   baseDao.execute("update  rework set re_sourcemo = (select wm_concat(distinct rd_scmacode) from reworkdetail where rd_reid = ?) "
 			   		+ " where re_id = ? ",re_id,re_id);