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 79047aa..e376ecb 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
@@ -462,7 +462,11 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 				String[] ids=fenPei.tsakId.split(",");
 				for(int i=0;i<ids.length;i++){
 					Task task=this.commonDao.get(Task.class, Long.parseLong(ids[i]));
-					task.setBillCode(fenPei.gdh+"-"+fenPei.chf_fz);
+					String lx="S";
+					if("big".equals(fenPei.wllx)){
+						lx="B";
+					}
+					task.setBillCode(fenPei.gdh+"-"+lx+"-"+fenPei.chf_fz);
 					task.setEndRegion(gongZuoZhan.code);
 					this.commonDao.store(task);
 					logger.info("one:"+task.getBillCode()+"---"+task.getEndRegion()+"--two:-"+task.getOldGzz()+"---"+task.getOldZrw()+"--three:-"+fenPei.gdh+"-"+fenPei.chf_fz+"-----"+gongZuoZhan.code);
@@ -685,17 +689,53 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 		List<FenPei> list_new =new ArrayList<>();
 		for (String twlKey : touwuliao_map.keySet()) {
 			List<GongDanMingXi> list_show = touwuliao_map.get(twlKey);
-			for (GongDanMingXi gdPaiXu : list_show) {
-				List<FenPei> list_fen=gdPaiXu.list;
-				
-				for (int i = 0; i < list_fen.size(); i++) {
-					FenPei fenPei=list_fen.get(i);
-					fenPei.chf_fz=(i)/cfhs+1;
-					fenPei.chf=(i+1)+"";
-					fenPei.twl_fz=twlKey;
-					list_new.add(fenPei);
+			int max_len=0;
+			//得出最大列数
+			if(list_show.size()>0){
+				for (GongDanMingXi gdPaiXu : list_show) {
+					if(max_len<gdPaiXu.list.size()){
+						max_len=gdPaiXu.list.size();
+					}
+				}
+			}
+		
+			Map<String, Integer> rq_last_show = new HashMap<>();
+			for(int i=0;i<max_len;i++){
+				//循环每列数据
+				Map<String, Integer> rq_last_show2 = new HashMap<>();
+				for(int gd_index=0;gd_index<list_show.size();gd_index++){
+					//循环每个工单
+					GongDanMingXi gdPaiXu =list_show.get(gd_index);
+					List<FenPei> list_fen=gdPaiXu.list;
+					if(i<gdPaiXu.list.size()){
+						FenPei fenPei=list_fen.get(i);
+						
+						rq_last_show2.put(fenPei.rqh, 1);
+						 if((i+1)%cfhs==1){
+							//第一列
+							 if(rq_last_show.containsKey(fenPei.rqh)){
+									fenPei.chf_fz=(i)/cfhs;
+									fenPei.chf=(i+1)+"";
+									fenPei.twl_fz=twlKey;
+									list_new.add(fenPei);
+							 }else{
+									fenPei.chf_fz=(i)/cfhs+1;
+									fenPei.chf=(i+1)+"";
+									fenPei.twl_fz=twlKey;
+									list_new.add(fenPei);
+							 }
+						
+						}else{
+							//其他列
+							fenPei.chf_fz=(i)/cfhs+1;
+							fenPei.chf=(i+1)+"";
+							fenPei.twl_fz=twlKey;
+							list_new.add(fenPei);
+						}
+					}
 					
 				}
+				rq_last_show=rq_last_show2;
 			}
 		}