|  | @@ -271,15 +271,23 @@ public class PurInquiryFormController {
 | 
											
												
													
														|  |                  }
 |  |                  }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |              }
 |  |              }
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +            Map<String,String> supplierMap = new HashMap<>();
 | 
											
												
													
														|  |              for (PurInquiryForm o : list) {
 |  |              for (PurInquiryForm o : list) {
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | 
 |  | +                String supplier = o.getInquirySuppiler();
 | 
											
												
													
														|  |                  List<PurInquiryFormProduct> productList = purInquiryFormProductService.selectByMainId(o.getId());
 |  |                  List<PurInquiryFormProduct> productList = purInquiryFormProductService.selectByMainId(o.getId());
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |                  for (PurInquiryFormProduct p : productList) {
 |  |                  for (PurInquiryFormProduct p : productList) {
 | 
											
												
													
														|  |                      String proId = p.getProductId();
 |  |                      String proId = p.getProductId();
 | 
											
												
													
														|  | -                    if (map.containsKey(proId)) {
 |  | 
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +                    String mapStr = supplierMap.get(proId);
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +                    if (map.containsKey(proId) && !mapStr.equals(supplier)) {
 | 
											
												
													
														|  |                          continue;
 |  |                          continue;
 | 
											
												
													
														|  |                      }
 |  |                      }
 | 
											
												
													
														|  | 
 |  | +                    supplierMap.put(proId,supplier);
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |                      map.put(proId, proId);
 |  |                      map.put(proId, proId);
 | 
											
												
													
														|  |                      p.setHeadCode(o.getBillCode());
 |  |                      p.setHeadCode(o.getBillCode());
 | 
											
												
													
														|  |                      p.setHeadCodes(headCodes);
 |  |                      p.setHeadCodes(headCodes);
 |