| 
														
															@@ -1141,6 +1141,17 @@ public class SyPackingListFabricController implements Job { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 					 if(syOrderData.getFlag()==1){ 
														 | 
														
														 | 
														
															 					 if(syOrderData.getFlag()==1){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 						 message2="手工匹配订单不能推送"; 
														 | 
														
														 | 
														
															 						 message2="手工匹配订单不能推送"; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 					 } 
														 | 
														
														 | 
														
															 					 } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+					 Map<String,String> supperNames=new HashMap<>(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+					 for (SyPackingListFabricItem syPackingListFabricItem : items){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+						 if(supperNames.containsKey(syPackingListFabricItem.getSupplier())){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+							 supperNames.put(syPackingListFabricItem.getSupplier(),syPackingListFabricItem.getSupplier()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+						 }else{ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+							 supperNames.put(syPackingListFabricItem.getSupplier(),syPackingListFabricItem.getSupplier()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+						 } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+						 if(supperNames.size()>1){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+							 message2="供应商不一样,不能推送"; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+						 } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+					 } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 					 if(message2.length()>1){ 
														 | 
														
														 | 
														
															 					 if(message2.length()>1){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 						 main.setRecordingError(message2);//报错原因 
														 | 
														
														 | 
														
															 						 main.setRecordingError(message2);//报错原因 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 						 main.setPushState("2");//推送失败 
														 | 
														
														 | 
														
															 						 main.setPushState("2");//推送失败 
														 |