Просмотр исходного кода

返工工单下放的时候更新SN号(包装不更新)

callm 3 лет назад
Родитель
Сommit
8175a3a559
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      src/com/uas/mes/pm/service/impl/MakeBaseServiceImpl.java

+ 1 - 1
src/com/uas/mes/pm/service/impl/MakeBaseServiceImpl.java

@@ -1604,7 +1604,7 @@ public class MakeBaseServiceImpl implements MakeBaseService {
 					+" end;",ma_code);
 		baseDao.execute("update makecraftdetail set (mcd_nextstepcode,mcd_nextstepname)="
 					+" (select max(mcd_stepcode),max(mcd_stepname) from makeCraftdetail a where a.mcd_maid=? and a.mcd_detno=makeCraftdetail.mcd_detno+1) where mcd_maid=?",ma_id,ma_id);
-		if("返工".equals(baseDao.getFieldDataByCondition("Make","ma_kind","ma_code='"+ma_code+"'").toString())){
+		if("返工".equals(baseDao.getFieldDataByCondition("Make","ma_kind","ma_code='"+ma_code+"'").toString())&&"组装".equals(baseDao.getFieldDataByCondition("Make","ma_wccode","ma_code='"+ma_code+"'").toString())){
 			baseDao.execute("update makeserial set ms_sncode=ms_firstsn where ms_makecode=?",ma_code);
 		}
 		//下放制造单