|
|
@@ -5,6 +5,7 @@ import com.uas.platform.b2b.constant.StringConstant;
|
|
|
import com.uas.platform.b2b.core.util.BoundedExecutor;
|
|
|
import com.uas.platform.b2b.core.util.SplitArray;
|
|
|
import com.uas.platform.b2b.dao.CommonDao;
|
|
|
+import com.uas.platform.b2b.dao.EnterpriseDao;
|
|
|
import com.uas.platform.b2b.dao.PurchaseApBillDao;
|
|
|
import com.uas.platform.b2b.dao.PurchaseApBillItemDao;
|
|
|
import com.uas.platform.b2b.dao.VendorDao;
|
|
|
@@ -12,6 +13,7 @@ import com.uas.platform.b2b.erp.model.ProdInOutRefreshPrice;
|
|
|
import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
|
|
|
import com.uas.platform.b2b.model.ApcheckKeyWord;
|
|
|
import com.uas.platform.b2b.model.DateFilter;
|
|
|
+import com.uas.platform.b2b.model.Enterprise;
|
|
|
import com.uas.platform.b2b.model.ErpProdIODetail;
|
|
|
import com.uas.platform.b2b.model.ErpProdIo;
|
|
|
import com.uas.platform.b2b.model.Product;
|
|
|
@@ -81,10 +83,12 @@ public class PurchaseApBillServiceImpl implements PurchaseApBillService {
|
|
|
private final ErpProdIODetailService erpProdIODetailService;
|
|
|
|
|
|
private final BoundedExecutor executor;
|
|
|
+
|
|
|
+ private final EnterpriseDao enterpriseDao;
|
|
|
@Autowired
|
|
|
private PurchaseApBillServiceImpl(PurchaseApBillDao purchaseApBillDao, PurchaseApBillItemDao purchaseApBillItemDao,
|
|
|
SearchService searchService, CommonDao commonDao, PurchaseApCheckService purchaseApCheckService,
|
|
|
- VendorDao vendorDao, ErpProdIODetailService erpProdIODetailService) {
|
|
|
+ VendorDao vendorDao, ErpProdIODetailService erpProdIODetailService, EnterpriseDao enterpriseDao) {
|
|
|
this.purchaseApBillDao = purchaseApBillDao;
|
|
|
this.purchaseApBillItemDao = purchaseApBillItemDao;
|
|
|
this.searchService = searchService;
|
|
|
@@ -92,6 +96,7 @@ public class PurchaseApBillServiceImpl implements PurchaseApBillService {
|
|
|
this.purchaseApCheckService = purchaseApCheckService;
|
|
|
this.vendorDao = vendorDao;
|
|
|
this.erpProdIODetailService = erpProdIODetailService;
|
|
|
+ this.enterpriseDao = enterpriseDao;
|
|
|
ExecutorService executorService = Executors.newCachedThreadPool();
|
|
|
executor = new BoundedExecutor(executorService, 1600);
|
|
|
|
|
|
@@ -354,6 +359,8 @@ public class PurchaseApBillServiceImpl implements PurchaseApBillService {
|
|
|
List<PurchaseApCheckItemInfo> apCheckList = erpProdIODetailService.findApCheckList(searchKeyWord.getVendorUU(), enUU, checkDate, fromDate, endDate, searchKeyWord);
|
|
|
List<ErpProdIODetail> detailList = erpProdIODetailService.covertApCheckToErpIo(apCheckList);
|
|
|
erpProdIo.getDetails().addAll(detailList);
|
|
|
+ Enterprise enterprise = enterpriseDao.findOne(searchKeyWord.getVendorUU());
|
|
|
+ erpProdIo.setVendorName(enterprise.getEnName());
|
|
|
}
|
|
|
return erpProdIo;
|
|
|
}
|