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

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

@@ -255,8 +255,8 @@ public class InquiryServiceImpl implements InquiryService {
                         }
                     }
                     // 产生消息
-					PurchaseInquiryItem inquiryItem = detail.convert();
-                    if (!codes.contains(detail.getIn_code())) {
+					PurchaseInquiryItem inquiryItem = purchaseInquiryItemDao.findByVendUUAndSourceId(detail.getVe_uu(), detail.getId_id());
+                    if (null != inquiryItem && !codes.contains(detail.getIn_code())) {
                     	codes.add(detail.getIn_code());
                     	items.add(inquiryItem);
 					}