diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveManager.java
index 507c26c..2468626 100644
--- a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveManager.java
+++ b/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,
-//					(int) hj_sx.getTaskD(), getValueGzzNumber(hj_sx), hjCount,
-//					maps);
-//			allocateGZZ(waveDoc.getCode(), NewWaveFlag.LKQ, lk_codes,
-//					(int) lk_sx.getTaskD(), getValueGzzNumber(lk_sx), lkCount,
-//					maps);
+			allocateGZZ(waveDoc.getCode(), NewWaveFlag.HJQ, hj_codes,
+					(int) hj_sx.getTaskD(), getValueGzzNumber(hj_sx), hjCount,
+					maps);
+			allocateGZZ(waveDoc.getCode(), NewWaveFlag.LKQ, lk_codes,
+					(int) lk_sx.getTaskD(), getValueGzzNumber(lk_sx), lkCount,
+					maps);
 
 		}
 	}
@@ -123,6 +123,7 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 				+ "left join STOCK s1 on s1.id=loc.stock "
 				+ "left join WAVE_DOC wd on wd.id=t.WAVE_DOC_ID  "
 				+ "where 1=1 and pt.BILL_TYPE_ID=1094   "
+//				+ " and pt.code='1100406979B' "
 				// + "and t.agv_status in (0,-1) "
 				+ "and wd.code='" + waveDocCode
 				+ "' and t.WAVE_DOC_ID is not null";
@@ -222,13 +223,15 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 			// LogPrint("---gdh:"+gdh+"		currCount:"+currCount);
 			// 在touwuliao_map中进行匹配
 			boolean isFind = false;
+			LogPrint(true, gdPaiXu.gdh+"工单号行数"+gdPaiXu.hangshu+"==="+gdPaiXu.list.size());
 			for (String twlKey : touwuliao_map.keySet()) {
 				String twl_in = touwuliao_map.get(twlKey).get(0).list.get(0).twl_fz
 						+ "_"
 						+ 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);
@@ -245,18 +248,6 @@ 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, "最终头物料分组");