| 
					
				 | 
			
			
				@@ -2107,11 +2107,11 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				String istc2=item.getIsTc(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				if (istc2!=null&&istc2.equals("1")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					if(item.getMemo()!=null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-						item.setMemo(item.getMemo()+"TC证书"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					}else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//					if(item.getMemo()!=null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//						item.setMemo(item.getMemo()+"TC证书"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//					}else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						item.setMemo("TC证书"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//					} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				jsonObject.put("CBMEMO",item.getMemo());//备注 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2310,11 +2310,11 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //				System.out.println("cFree2\t"+jsonObject.get("cFree2")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				String istc2=item.getIsTc(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				if (istc2!=null&&istc2.equals("1")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					if(item.getMemo()!=null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-						item.setMemo(item.getMemo()+"TC证书"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					}else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//					if(item.getMemo()!=null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//						item.setMemo(item.getMemo()+"TC证书"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//					}else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						item.setMemo("TC证书"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					//} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				jsonObject.put("CBMEMO",item.getMemo());//备注 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				for (Map<String,Object> map : invoices){ 
			 |