Merge remote-tracking branch 'origin/dev' into authority

src/main/java/com/uas/platform/b2b/erp/service/impl/InquiryServiceImpl.java

@@ -256,8 +256,9 @@ public class InquiryServiceImpl implements InquiryService {
                     }
                     // 产生消息
 					PurchaseInquiryItem inquiryItem = purchaseInquiryItemDao.findByVendUUAndSourceId(detail.getVe_uu(), detail.getId_id());
-                    if (null != inquiryItem && !codes.contains(detail.getIn_code())) {
-                    	codes.add(detail.getIn_code());
+                    if (null != inquiryItem && !codes.contains(detail.getIn_code() + detail.getVe_uu())) {
+                    	// 可能存在一个单里两个企业都是注册了之后，同时传输明细的情况，所以需要enuu 和code 一起判断
+                    	codes.add(detail.getIn_code() + detail.getVe_uu());
                     	items.add(inquiryItem);
 					}
                 }