|  | @@ -1214,7 +1214,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 | 
											
												
													
														|  |  		boolean ycIsPush=true;
 |  |  		boolean ycIsPush=true;
 | 
											
												
													
														|  |  		if (main!=null){
 |  |  		if (main!=null){
 | 
											
												
													
														|  |  			Map<String, Order> mapSort=new HashMap<>();
 |  |  			Map<String, Order> mapSort=new HashMap<>();
 | 
											
												
													
														|  | -			String date2 = main.getTheFinalShippingDate().substring(0,10);//装柜日期
 |  | 
 | 
											
												
													
														|  | 
 |  | +			String date2 = main.getTheFinalShippingDate().substring(0,10);//最终船期
 | 
											
												
													
														|  |  			String createBy="进出口平台管理员";
 |  |  			String createBy="进出口平台管理员";
 | 
											
												
													
														|  |  			String istc=main.getSyPackingListFabricItem().get(0).getIsTc();
 |  |  			String istc=main.getSyPackingListFabricItem().get(0).getIsTc();
 | 
											
												
													
														|  |  			if (istc!=null&&istc.equals("1")){
 |  |  			if (istc!=null&&istc.equals("1")){
 |