同一时段工单版面计划可以排多条

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

@@ -217,16 +217,16 @@ public class MakePlanServiceImpl implements MakePlanService {
 				BaseUtil.showErrorOnSuccess("已经存在计划号"+rs.getString("mp_code")+"排产类型+线别+时间相同");
 			}
 		}
-		rs = baseDao.queryForRowSet("select  mpd_linecode ,mpd_datenum,mpd_machinetype,mpd_makecode  from ( select mpd_linecode,mpd_machinetype,mpd_makecode,mpd_prodcode,mpd_datenum,count(1)n "+
+		rs = baseDao.queryForRowSet("select  mpd_linecode ,mpd_datenum,mpd_machinetype,mpd_makecode,mpd_prodab_user  from ( select mpd_linecode,mpd_machinetype,mpd_makecode,mpd_prodcode,mpd_datenum,mpd_prodab_user,count(1)n "+
 				" from MakePlan a inner join MakePlanDetail b on mp_id=mpd_mpid "+
-				" where  mp_id=? group by mpd_linecode,mpd_machinetype,mpd_makecode,mpd_prodcode,mpd_datenum) where n >1",mp_id);
-		/*if(rs.next()){
+				" where  mp_id=? group by mpd_linecode,mpd_machinetype,mpd_makecode,mpd_prodcode,mpd_datenum,mpd_prodab_user) where n >1",mp_id);
+		if(rs.next()){
 			if(submit){
-				BaseUtil.showError("线体:"+rs.getString("mpd_linecode")+"排产时间:"+rs.getString("mpd_datenum")+",机型:"+rs.getString("mpd_machinetype")+"+工单,存在重复排产");
+				BaseUtil.showError("线体:"+rs.getString("mpd_linecode")+"排产时间:"+rs.getString("mpd_datenum")+",机型:"+rs.getString("mpd_machinetype")+"+工单,版面"+rs.getString("mpd_prodab_user")+",存在重复排产");
 			}else{				
-				BaseUtil.showErrorOnSuccess("线体:"+rs.getString("mpd_linecode")+"排产时间:"+rs.getString("mpd_datenum")+",机型:"+rs.getString("mpd_machinetype")+"+工单,存在重复排产");
+				BaseUtil.showErrorOnSuccess("线体:"+rs.getString("mpd_linecode")+"排产时间:"+rs.getString("mpd_datenum")+",机型:"+rs.getString("mpd_machinetype")+",版面"+rs.getString("mpd_prodab_user")+"+工单,存在重复排产");
 			}
-		}*/
+		}
 	}
 
 	@Override