|
|
@@ -1,20 +1,34 @@
|
|
|
package com.uas.platform.b2b.erp.service.impl;
|
|
|
|
|
|
-import com.uas.platform.b2b.dao.*;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.Date;
|
|
|
+import java.util.List;
|
|
|
+
|
|
|
+import org.apache.commons.collections.CollectionUtils;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.stereotype.Service;
|
|
|
+
|
|
|
+import com.uas.platform.b2b.dao.EnterpriseDao;
|
|
|
+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.SaleQuotationItemDao;
|
|
|
+import com.uas.platform.b2b.dao.UserDao;
|
|
|
+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;
|
|
|
import com.uas.platform.b2b.erp.service.InquiryService;
|
|
|
-import com.uas.platform.b2b.model.*;
|
|
|
+import com.uas.platform.b2b.model.Enterprise;
|
|
|
+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.SaleQuotationItem;
|
|
|
+import com.uas.platform.b2b.model.User;
|
|
|
+import com.uas.platform.b2b.model.Vendor;
|
|
|
import com.uas.platform.b2b.support.SystemSession;
|
|
|
import com.uas.platform.core.model.Status;
|
|
|
-import org.apache.commons.collections.CollectionUtils;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
-
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
|
|
|
@Service
|
|
|
public class InquiryServiceImpl implements InquiryService {
|
|
|
@@ -53,8 +67,7 @@ public class InquiryServiceImpl implements InquiryService {
|
|
|
for (PurchaseInquiryItem item : purchaseInquiry.getInquiryItems()) {
|
|
|
item.setErpDate(new Date());// 存储时间
|
|
|
Vendor vendor = null;
|
|
|
- List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(purchaseInquiry.getEnUU(),
|
|
|
- item.getVendUU());
|
|
|
+ List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(purchaseInquiry.getEnUU(), item.getVendUU());
|
|
|
if (vendors.size() > 0) {
|
|
|
vendor = vendors.get(0);
|
|
|
// 如果询价单明细行没有指定供应商联系人,取平台中供应商资料中的联系人
|
|
|
@@ -103,8 +116,8 @@ public class InquiryServiceImpl implements InquiryService {
|
|
|
if (!CollectionUtils.isEmpty(decides)) {
|
|
|
long enUU = SystemSession.getUser().getEnterprise().getUu();
|
|
|
for (InquiryDecide decide : decides) {
|
|
|
- List<PurchaseInquiryItem> items = purchaseInquiryItemDao.findByEnUUAndCodeAndNumber(enUU,
|
|
|
- decide.getIn_code(), decide.getId_detno());
|
|
|
+ List<PurchaseInquiryItem> items = purchaseInquiryItemDao.findByEnUUAndCodeAndNumber(enUU, decide.getIn_code(),
|
|
|
+ decide.getId_detno());
|
|
|
if (!CollectionUtils.isEmpty(items)) {
|
|
|
PurchaseInquiryItem item = items.get(0);
|
|
|
item.setAgreed(decide.getId_agreed());
|
|
|
@@ -132,8 +145,8 @@ public class InquiryServiceImpl implements InquiryService {
|
|
|
List<SaleQuotationItem> quotationItems = new ArrayList<SaleQuotationItem>();
|
|
|
if (!CollectionUtils.isEmpty(decides)) {
|
|
|
for (InquiryDecide decide : decides) {
|
|
|
- List<SaleQuotationItem> items = saleQuotationItemDao.findByQuotationIdAndNumber(decide.getB2b_qu_id(),
|
|
|
- decide.getId_detno());
|
|
|
+ List<SaleQuotationItem> items = saleQuotationItemDao
|
|
|
+ .findByQuotationIdAndNumber(decide.getB2b_qu_id(), decide.getId_detno());
|
|
|
if (!CollectionUtils.isEmpty(items)) {
|
|
|
SaleQuotationItem item = items.get(0);
|
|
|
item.setAgreed(decide.getId_agreed());
|