|
|
@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
|
|
|
import com.uas.platform.b2b.dao.ProductDao;
|
|
|
import com.uas.platform.b2b.dao.PurchaseInquiryDao;
|
|
|
import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
|
|
|
+import com.uas.platform.b2b.dao.VendorDao;
|
|
|
import com.uas.platform.b2b.erp.model.Inquiry;
|
|
|
import com.uas.platform.b2b.erp.model.InquiryDecide;
|
|
|
import com.uas.platform.b2b.erp.model.InquiryDetail;
|
|
|
@@ -18,6 +19,7 @@ import com.uas.platform.b2b.model.Product;
|
|
|
import com.uas.platform.b2b.model.PurchaseInquiry;
|
|
|
import com.uas.platform.b2b.model.PurchaseInquiryItem;
|
|
|
import com.uas.platform.b2b.model.SaleQuotation;
|
|
|
+import com.uas.platform.b2b.model.Vendor;
|
|
|
import com.uas.platform.b2b.support.SystemSession;
|
|
|
import com.uas.platform.core.model.Status;
|
|
|
|
|
|
@@ -26,6 +28,9 @@ public class InquiryServiceImpl implements InquiryService {
|
|
|
|
|
|
@Autowired
|
|
|
private ProductDao productDao;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private VendorDao vendorDao;
|
|
|
|
|
|
@Autowired
|
|
|
private PurchaseInquiryDao purchaseInquiryDao;
|
|
|
@@ -40,10 +45,16 @@ public class InquiryServiceImpl implements InquiryService {
|
|
|
for (Inquiry inquiry : inquiries) {
|
|
|
// 先查看是否已存在
|
|
|
List<PurchaseInquiry> inquiries2 = purchaseInquiryDao.findByEnUUAndCode(enUU, inquiry.getIn_code());
|
|
|
- if (inquiries2.size() == 0) {
|
|
|
+ if (inquiries2.size() == 0) {//不存在才继续,存在不作操作
|
|
|
PurchaseInquiry purchaseInquiry = inquiry.convert();
|
|
|
if (!CollectionUtils.isEmpty(purchaseInquiry.getInquiryItems())) {
|
|
|
for (PurchaseInquiryItem item : purchaseInquiry.getInquiryItems()) {
|
|
|
+ //如果询价单明细行没有指定供应商联系人,取平台中供应商资料中的联系人
|
|
|
+ if(item.getVendUserUU() == null || item.getVendUserUU() == 0) {
|
|
|
+ List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(purchaseInquiry.getEnUU(), item.getVendUU());
|
|
|
+ if(vendors.size() > 0)
|
|
|
+ item.setVendUserUU(vendors.get(0).getVendUserUU());
|
|
|
+ }
|
|
|
item.setInquiry(purchaseInquiry);
|
|
|
// 取平台的产品ID
|
|
|
Product product = item.getProduct();
|