分配行数不正确

src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveManager.java

@@ -74,12 +74,12 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 			allocateGZZ(waveDoc.getCode(), NewWaveFlag.LXQ, lx_codes,
 					(int) lx_sx.getTaskD(), getValueGzzNumber(lx_sx), lxCount,
 					maps);
-			allocateGZZ(waveDoc.getCode(), NewWaveFlag.HJQ, hj_codes,
+//			allocateGZZ(waveDoc.getCode(), NewWaveFlag.HJQ, hj_codes,
-					(int) hj_sx.getTaskD(), getValueGzzNumber(hj_sx), hjCount,
+//					(int) hj_sx.getTaskD(), getValueGzzNumber(hj_sx), hjCount,
-					maps);
+//					maps);
-			allocateGZZ(waveDoc.getCode(), NewWaveFlag.LKQ, lk_codes,
+//			allocateGZZ(waveDoc.getCode(), NewWaveFlag.LKQ, lk_codes,
-					(int) lk_sx.getTaskD(), getValueGzzNumber(lk_sx), lkCount,
+//					(int) lk_sx.getTaskD(), getValueGzzNumber(lk_sx), lkCount,
-					maps);
+//					maps);
 
 		}
 	}
@@ -133,6 +133,7 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 		sql += "group by pt.code,t.BILLCODE,item.id,item.code,item.BE_MARK_WEIGHT,loc.id,loc.code,ik.PROP_C1,ik.PROP_C2,ik.PROP_C3,ik.PROP_D1,ik.PROP_D2,item.ISBOM "
 				+ "order by min(t.skips ),max(loc.code) asc, item.id,pt.code,t.BILLCODE ";
 		LogPrint(log_sql, sql);
+	
 		Query query = session.createSQLQuery(sql);
 		List<Object[]> list = (List<Object[]>) query.list();
 		int GongDan_wuLiaoMingXiCout = list.size();
@@ -169,7 +170,6 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 				list_fenpei_wgzz.add(bean);
 			}
 		}
-
 		List<FenPei> list_fen = Paixu(list_fenpei, cfhs);
 		// 初始化 GongDan_WuLiao_Map 根据（工单号+物料类型+拆分组号）分组
 		Map<String, List<FenPei>> GongDan_WuLiao_Map = new HashMap<>();
@@ -202,7 +202,6 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 			GongDan_List.add(gdPaiXu);
 		}
 		Collections.sort(GongDan_List);
-
 		// 打印排序结果
 		PirntGongDanMingXiList(GongDan_List, "最终工单排序");
 
@@ -229,7 +228,7 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 						+ touwuliao_map.get(twlKey).get(0).list.get(0).chf_fz;
 				int currCount_in = touwuliao_map.get(twlKey).get(0).hangshu;
 				if (twl_in.equals(fenzu)
-						&& Math.abs(currCount - currCount_in) <= 4||Math.abs(currCount - currCount_in) >40) {
+						&& (Math.abs(currCount - currCount_in) <= 4||Math.abs(currCount - currCount_in) >40)) {
 					// 在分配好的数据中找到了相同的头物料 且 数量差小于4  头物料分组规则
 					List<GongDanMingXi> old = touwuliao_map.get(twlKey);
 					old.add(gdPaiXu);
@@ -247,6 +246,18 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 
 		}
 		
+		int hs=0;
+		for (String twlKey : touwuliao_map.keySet()) {
+			List<GongDanMingXi> GongDanList = touwuliao_map.get(twlKey);
+			for(GongDanMingXi gd:GongDanList){
+				hs+=gd.list.size();
+			}
+		}
+		LogPrint(true,"我来了,GongDanMingXi"+GongDan_List.size()+"行数："+hs);
+		if(1==1){
+			return;
+		}
+
 		// 打印头物料分组后的情况
 		PirntFirstTouwuLiaoMap(touwuliao_map, "最终头物料分组");
 
@@ -494,7 +505,6 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 				
 			}
 		}
-		
 		for (String key : gzzMap.keySet()) {
 			GongZuoZhan gongZuoZhan = gzzMap.get(key);
 			LogPrint(
@@ -508,8 +518,10 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 					"↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓");
 			for (FenPei fenPei : gongZuoZhan.renWuList) {
 				fenPeiCount = fenPeiCount + 1;
+				rwh++;
 				String[] ids = fenPei.tsakId.split(",");
 				for (int i = 0; i < ids.length; i++) {
+					task_count++;
 					Task task = this.commonDao.get(Task.class,
 							Long.parseLong(ids[i]));
 					String lx = "S";// 小件