处理物料相关的接口，将物料获取的方法，调用公共物料服务的接口方法

src/main/java/com/uas/platform/b2b/controller/BaseInfoController.java

@@ -5,6 +5,7 @@ import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.FileUpload;
 import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.model.Vendor;
+import com.uas.platform.b2b.ps.ProductUtils;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.BaseInfoService;
 import com.uas.platform.b2b.service.ProductService;
@@ -310,7 +311,7 @@ public class BaseInfoController {
 		pageInfo.filter("isSale", Constant.YES);
 		ModelAndView modelAndView = new ModelAndView();
 		PageParams params = new PageParams(pageInfo);
-		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? productService.findAllByPageInfo(pageInfo, keyword).getContent()
+		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? ProductUtils.findByPageInfo(pageInfo, keyword).getContent()
 				: getAllProductInfo(params, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/baseInfo/baseInfo", "全部物料资料表"));
 		logger.log("物料资料", "导出Excel列表", "导出全部可卖产品Excel列表");
@@ -332,7 +333,7 @@ public class BaseInfoController {
 		pageInfo.filter("standard", Constant.YES);
 		ModelAndView modelAndView = new ModelAndView();
 		PageParams params = new PageParams(pageInfo);
-		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? productService.findAllByPageInfo(pageInfo, keyword).getContent()
+		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? ProductUtils.findByPageInfo(pageInfo, keyword).getContent()
 				: getStandardProductInfo(params, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/baseInfo/baseInfo", "标准物料资料表"));
 		logger.log("物料资料", "导出Excel列表", "导出标准可卖产品Excel列表");
@@ -354,7 +355,7 @@ public class BaseInfoController {
 		pageInfo.filter("standard", Constant.NO);
 		ModelAndView modelAndView = new ModelAndView();
 		PageParams params = new PageParams(pageInfo);
-		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? productService.findAllByPageInfo(pageInfo, keyword).getContent()
+		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? ProductUtils.findByPageInfo(pageInfo, keyword).getContent()
 				: getNonStandardProductInfo(params, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/baseInfo/baseInfo", "非标准物料资料表"));
 		logger.log("物料资料", "导出Excel列表", "导出非标准可卖产品Excel列表");

src/main/java/com/uas/platform/b2b/controller/ProductController.java

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.controller;
 
 import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.model.ProductMatchResult;
+import com.uas.platform.b2b.ps.ProductUtils;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.ProductService;
 import com.uas.platform.b2b.support.JxlsExcelView;
@@ -19,7 +20,6 @@ import com.uas.search.b2b.model.Sort.Type;
 import com.uas.search.b2b.util.SearchConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -295,7 +295,7 @@ public class ProductController {
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		ModelAndView modelAndView = new ModelAndView();
 		PageParams params = new PageParams(pageInfo);
-		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? productService.findAllByPageInfo(pageInfo, keyword).getContent()
+		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? ProductUtils.findByPageInfo(pageInfo, keyword).getContent()
 				: getAllProductInfo(params, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/baseInfo/baseInfo", "全部物料资料表"));
 		logger.log("物料资料", "导出Excel列表", "导出全部Excel列表");
@@ -316,7 +316,7 @@ public class ProductController {
 		pageInfo.filter("standard", Constant.YES);
 		ModelAndView modelAndView = new ModelAndView();
 		PageParams params = new PageParams(pageInfo);
-		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? productService.findAllByPageInfo(pageInfo, keyword).getContent()
+		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? ProductUtils.findByPageInfo(pageInfo, keyword).getContent()
 				: getStandardProductInfo(params, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/baseInfo/baseInfo", "标准物料资料表"));
 		logger.log("物料资料", "导出Excel列表", "导出标准Excel列表");
@@ -337,7 +337,7 @@ public class ProductController {
 		pageInfo.filter("standard", Constant.NO);
 		ModelAndView modelAndView = new ModelAndView();
 		PageParams params = new PageParams(pageInfo);
-		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? productService.findAllByPageInfo(pageInfo, keyword).getContent()
+		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? ProductUtils.findByPageInfo(pageInfo, keyword).getContent()
 				:getNonStandardProductInfo(params, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/baseInfo/baseInfo", "非标准物料资料表"));
 		logger.log("物料资料", "导出Excel列表", "导出非标准Excel列表");
@@ -382,18 +382,6 @@ public class ProductController {
 		return productService.findB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
 	}
 
-	/**
-	 * 更新物料
-	 * 
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/refreshproduct/{id}", method = RequestMethod.POST)
-	@ResponseBody
-	public ModelMap refreshproduct(@PathVariable Long id) {
-		return productService.refreshproduct(id);
-	}
-
 	/**
 	 * 单个匹配
 	 * 

src/main/java/com/uas/platform/b2b/controller/PurcProductController.java

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.FileUpload;
 import com.uas.platform.b2b.model.Product;
+import com.uas.platform.b2b.ps.ProductUtils;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.BaseInfoService;
 import com.uas.platform.b2b.service.ProductService;
@@ -96,7 +97,7 @@ public class PurcProductController {
 		pageInfo.filter("isPurchase", Constant.YES);
 		ModelAndView modelAndView = new ModelAndView();
 		PageParams params = new PageParams(pageInfo);
-		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? productService.findAllByPageInfo(pageInfo, keyword).getContent()
+		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? ProductUtils.findByPageInfo(pageInfo, keyword).getContent()
 				: getAllProductInfo(params, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/baseInfo/baseInfo", "全部物料资料表"));
 		logger.log("物料资料", "导出Excel列表", "导出可买物料Excel列表");
@@ -118,7 +119,7 @@ public class PurcProductController {
 		pageInfo.filter("standard", Constant.YES);
 		ModelAndView modelAndView = new ModelAndView();
 		PageParams params = new PageParams(pageInfo);
-		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? productService.findAllByPageInfo(pageInfo, keyword).getContent()
+		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? ProductUtils.findByPageInfo(pageInfo, keyword).getContent()
 				: getStandardProductInfo(params, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/baseInfo/baseInfo", "标准物料资料表"));
 		logger.log("物料资料", "导出Excel列表", "导出可买物料Excel列表");
@@ -140,7 +141,7 @@ public class PurcProductController {
 		pageInfo.filter("standard", Constant.NO);
 		ModelAndView modelAndView = new ModelAndView();
 		PageParams params = new PageParams(pageInfo);
-		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? productService.findAllByPageInfo(pageInfo, keyword).getContent()
+		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? ProductUtils.findByPageInfo(pageInfo, keyword).getContent()
 				:getNonStandardProductInfo(params, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/baseInfo/baseInfo", "非标准物料资料表"));
 		logger.log("物料资料", "导出Excel列表", "导出可买物料Excel列表");

src/main/java/com/uas/platform/b2b/dao/ProductDao.java

@@ -37,22 +37,4 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
      * @return
      */
     List<Product> findByTitleAndPcmpcodeAndPbrandAndEnUU(String title, String cmpcode, String brand, Long enUU);
-
-	/**
-	 * 通过型号和品牌查询物料是否存在
-	 * 
-	 * @param enuu
-	 * @param pcmpcoe
-	 * @param brand
-	 * @return
-	 */
-	List<Product> findByEnUUAndPcmpcodeAndPbrand(Long enuu, String pcmpcoe, String brand);
-
-	/**
-	 * 通过企业UU号查询物料上传数量
-	 *
-	 * @param enUU 企业UU
-	 * @return
-	 */
-	Long countByEnUU(Long enUU);
 }

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

@@ -1,7 +1,10 @@
 package com.uas.platform.b2b.erp.service.impl;
 
 import com.alibaba.dubbo.common.utils.CollectionUtils;
-import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.dao.EnterpriseDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryMouldDao;
+import com.uas.platform.b2b.dao.UserDao;
+import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.erp.model.InquiryMould;
 import com.uas.platform.b2b.erp.model.InquiryMouldDecide;
 import com.uas.platform.b2b.erp.service.InquiryMouldService;
@@ -32,9 +35,6 @@ public class InquiryMouldServiceImpl implements InquiryMouldService {
 	@Autowired
 	private VendorDao vendorDao;
 
-	@Autowired
-	private ProductDao productDao;
-
 	@Autowired
 	private UserDao userDao;
 

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

@@ -39,9 +39,6 @@ import java.util.*;
 @Service
 public class InquiryServiceImpl implements InquiryService {
 
-	@Autowired
-	private ProductDao productDao;
-
 	@Autowired
 	private VendorDao vendorDao;
 

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

@@ -1,7 +1,10 @@
 package com.uas.platform.b2b.erp.service.impl;
 
 import com.uas.platform.b2b.core.util.StringUtil;
-import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.dao.PurchaseOrderChangeDao;
+import com.uas.platform.b2b.dao.PurchaseOrderChangeItemDao;
+import com.uas.platform.b2b.dao.PurchaseOrderDao;
+import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
 import com.uas.platform.b2b.erp.exception.ExceptionNote;
 import com.uas.platform.b2b.erp.model.PurchaseChange;
 import com.uas.platform.b2b.erp.model.PurchaseChangeReply;
@@ -35,9 +38,6 @@ public class PurchaseChangeServiceImpl implements PurchaseChangeService {
 	@Autowired
 	private PurchaseOrderItemDao purchaseOrderItemDao;
 
-	@Autowired
-	private ProductDao productDao;
-
 	@Autowired
 	private PurchaseOrderChangeDao purchaseOrderChangeDao;
 

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

@@ -31,9 +31,6 @@ import java.util.*;
 @Service
 public class PurchaseServiceImpl implements PurchaseService {
 
-	@Autowired
-	private ProductDao productDao;
-
 	@Autowired
 	private VendorDao vendorDao;
 

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

@@ -1,6 +1,9 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.dao.EnterpriseDao;
+import com.uas.platform.b2b.dao.SaleQuotationDao;
+import com.uas.platform.b2b.dao.UserDao;
+import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.erp.model.Quotation;
 import com.uas.platform.b2b.erp.model.QuotationDecide;
 import com.uas.platform.b2b.erp.service.QuotationService;
@@ -18,9 +21,6 @@ import java.util.*;
 @Service
 public class QuotationServiceImpl implements QuotationService {
 
-	@Autowired
-	private ProductDao productDao;
-
 	@Autowired
 	private VendorDao vendorDao;
 

src/main/java/com/uas/platform/b2b/ps/ProductUtils.java

@@ -518,4 +518,50 @@ public class ProductUtils {
         }
         return null;
     }
+
+    /**
+     * 通过enUU查询企业物料信息
+     *
+     * @param enUU 企业UU
+     * @return
+     */
+    public static Long countByEnUU(Long enUU) {
+        Response res = null;
+        try {
+            HashMap<String, Object> map = new HashMap<>(1);
+            map.put("enUU", enUU);
+            res = HttpUtil.sendGetRequest(PRODUCT_PUBLIC_SERVICE_URL + "/product/get/countByEnUU", map);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (HttpStatus.OK.value() == res.getStatusCode()) {
+            return JSONObject.parseObject(res.getResponseText(), Long.class);
+        } else {
+            logger.error("countByEnUU http response status error: " + res.getStatusCode());
+        }
+        return null;
+    }
+
+    /**
+     * 通过id查询物料信息
+     *
+     * @param id 物料id
+     * @return
+     */
+    public static Product findById(Long id) {
+        Response res = null;
+        try {
+            HashMap<String, Object> map = new HashMap<>(1);
+            map.put("id", id);
+            res = HttpUtil.sendGetRequest(PRODUCT_PUBLIC_SERVICE_URL + "/product/get/findById", map);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (HttpStatus.OK.value() == res.getStatusCode()) {
+            return JSONObject.parseObject(res.getResponseText(), Product.class);
+        } else {
+            logger.error("findById http response status error: " + res.getStatusCode());
+        }
+        return null;
+    }
 }

src/main/java/com/uas/platform/b2b/search/SearchServiceImpl.java

@@ -141,9 +141,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	@Autowired
 	private PurchaseInquiryMouldInfoDao purchaseInquiryMouldInfoDao;
 
-	@Autowired
-	private ProductDao productDao;
-
 	@Autowired
 	private EnterpriseDao enterpriseDao;
 
@@ -781,7 +778,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 				content.addAll(products);
 			}
 		} else {
-			content = productDao.findAll(idsPage.getContent());
+			content = ProductUtils.findByIds(idsPage.getContent());
 		}
 		sortByProperty(content, Product.class, "id", idsPage.getContent());
 		return toSPage(idsPage, content);
@@ -790,7 +787,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	@Override
 	public SPage<Product> searchProductsStandardCheckIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PRODUCTS_STANDARD, pageParams);
-		List<Product> content = productDao.findAll(idsPage.getContent());
+		List<Product> content = ProductUtils.findByIds(idsPage.getContent());
 		sortByProperty(content, Product.class, "id", idsPage.getContent());
 		return toSPage(idsPage, content);
 	}
@@ -798,7 +795,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	@Override
 	public SPage<Product> searchProductsNonStandardCheckIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PRODUCTS_NONSTANDARD, pageParams);
-		List<Product> content = productDao.findAll(idsPage.getContent());
+		List<Product> content = ProductUtils.findByIds(idsPage.getContent());
 		sortByProperty(content, Product.class, "id", idsPage.getContent());
 		return toSPage(idsPage, content);
 	}

src/main/java/com/uas/platform/b2b/service/ProductService.java

@@ -4,8 +4,6 @@ import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.model.ProductMatchResult;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.search.b2b.model.SPage;
-import org.springframework.data.domain.Page;
-import org.springframework.ui.ModelMap;
 
 import java.util.List;
 
@@ -25,16 +23,6 @@ public interface ProductService {
 	 */
 	public void save(List<Product> products) throws Exception;
 
-	/**
-	 * 分页查找客户物料（全部）
-	 * 
-	 * @param pageInfo
-	 * @param keyword
-	 *            查找关键词
-	 * @return
-	 */
-	public Page<Product> findAllByPageInfo(PageInfo pageInfo, String keyword);
-
 	/**
 	 * 开启物料销售
 	 * 
@@ -63,14 +51,6 @@ public interface ProductService {
 	 */
 	public void lockPurc(Long id);
 
-	/**
-	 * 通过id更新物料
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public ModelMap refreshproduct(Long id);
-
 	/**
 	 * 单个匹配
 	 * 

src/main/java/com/uas/platform/b2b/service/impl/BaseInfoServiceImpl.java

@@ -47,9 +47,6 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
-	@Autowired
-	private ProductDao productDao;
-
 	@Autowired
 	private ComponentService componentService;
 
@@ -71,9 +68,6 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 	@Autowired
 	private SearchService searchService;
 
-	@Autowired
-	private ProductMatchResultDao productMatchResultDao;
-
 	@Autowired
 	private UserOrderDao userOrderDao;
 
@@ -109,7 +103,6 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 	 */
 	@Override
 	public ModelMap releaseByWorkbook(Workbook workbook) {
-        long start = System.currentTimeMillis();
         ModelMap modelMap = new ModelMap();
         List<ProductTemp> temps = new ArrayList<>();
         Long enUU = SystemSession.getUser().getEnterprise().getUu();
@@ -413,7 +406,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 
 	@Override
 	public Product findById(Long id) {
-		Product product = productDao.findOne(id);
+		Product product = ProductUtils.findById(id);
 		return product;
 	}
 
@@ -423,7 +416,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 	 */
 	@Override
 	public void deleteById(Long id) throws Exception {
-		Product product = productDao.findOne(id);
+		Product product = ProductUtils.findById(id);
 		if (null != product) {
 			ProductUtils.deleteMatchResultAndProductUser(id);
 			// 物料禁用
@@ -598,7 +591,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 					orderDetail.setQty(Double.valueOf(orderitem.getQty()));
 					// 新增的物料，id取值方法
 					if (orderitem.getPrid() != null) {
-                        Product product = productDao.findOne(orderitem.getPrid());
+                        Product product = ProductUtils.findById(orderitem.getPrid());
                         ProductInfo productInfo = new ProductInfo();
                         BeanUtils.copyProperties(product, productInfo, ProductInfo.class);
 						orderDetail.setProduct(productInfo);

src/main/java/com/uas/platform/b2b/service/impl/InvitationRecordServiceImpl.java

@@ -4,12 +4,12 @@ import com.uas.message.mail.service.MailService;
 import com.uas.platform.b2b.core.util.ThreadUtils;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.InvitationRecordDao;
-import com.uas.platform.b2b.dao.ProductDao;
 import com.uas.platform.b2b.dao.UserDao;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.EnterpriseBaseInfo;
 import com.uas.platform.b2b.model.InvitationRecord;
 import com.uas.platform.b2b.model.User;
+import com.uas.platform.b2b.ps.ProductUtils;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.InvitationRecordService;
 import com.uas.platform.b2b.support.MessageConf;
@@ -55,9 +55,6 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
 	@Autowired
 	private UserDao userDao;
 
-	@Autowired
-    private ProductDao productDao;
-
 	@Autowired
     private SysConf sysConf;
 
@@ -84,7 +81,7 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
 				useruu = record.getUseruu();
 			}
 		}
-		// 企业信息也一样
+		// 企业存在才设置进去，不然数据库会报错
 		if (record.getEnuu() != null) {
 			Enterprise enterprise = enterpriseDao.findOne(record.getEnuu());
 			if (enterprise != null) {
@@ -280,7 +277,7 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
      * @return
      */
     private InvitationRecord covert(InvitationRecord record, Enterprise e) {
-        record.setProductNum(productDao.countByEnUU(record.getVenduu()));
+        record.setProductNum(ProductUtils.countByEnUU(record.getVenduu()));
         if (null != e.getInviteUU()) {
             Enterprise inviteEn = enterpriseDao.findOne(e.getInviteUU());
             record.setInviteEnName(inviteEn != null ? inviteEn.getEnName() : null);

src/main/java/com/uas/platform/b2b/service/impl/ProductServiceImpl.java

@@ -1,37 +1,23 @@
 package com.uas.platform.b2b.service.impl;
 
-import com.uas.platform.b2b.dao.*;
-import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
+import com.uas.platform.b2b.dao.UserOrderDao;
 import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.model.ProductMatchResult;
-import com.uas.platform.b2b.model.ProductStatus;
 import com.uas.platform.b2b.ps.ProductUtils;
-import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.ProductService;
 import com.uas.platform.b2b.support.SPageUtils;
 import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.support.UsageBufferedLogger;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.search.b2b.model.SPage;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -41,57 +27,18 @@ import java.util.List;
 @Service
 public class ProductServiceImpl implements ProductService {
 
-	@Autowired
-	private ProductDao productDao;
-
-	@Autowired
-	private SearchService searchService;
-
-	@Autowired
-	private CommonDao commonDao;
-
-	@Autowired
-	private ProductMatchResultDao productMatchResultDao;
-
 	@Autowired
 	private UserOrderDao userOrderDao;
 
-	@Autowired
-	private ProductStatusDao productStatusDao;
-
-	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
-	private final static ErpBufferedLogger erpLogger = BufferedLoggerManager.getLogger(ErpBufferedLogger.class);
-
 	@Override
 	public void save(List<Product> products) throws Exception {
 		ProductUtils.paginationUpdate(products);
 	}
 
-	@Override
-	public Page<Product> findAllByPageInfo(final PageInfo pageInfo, final String keyword) {
-		return productDao.findAll(new Specification<Product>() {
-
-			@Override
-			public Predicate toPredicate(Root<Product> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-				if (StringUtils.hasText(keyword)) {
-					List<Object> lists = new ArrayList<>();
-					List<Product> prodList = searchService.searchProductsCheckIds(keyword, null).getContent();
-					for (Product list : prodList) {
-						lists.add(list.getId());
-					}
-					pageInfo.expression(PredicateUtils.in("id", lists, false));
-				}
-				query.where(pageInfo.getPredicates(root, query, builder));
-				return null;
-			}
-		}, pageInfo);
-	}
-
 	@Override
 	public void unlock(Long id) {
 		try {
-            Product prod = productDao.findOne(id);
+            Product prod = ProductUtils.findById(id);
             prod.setIsSale(Constant.YES);
             ProductUtils.switchProduct(id, "sale", Constant.YES);
 		} catch (Exception e) {
@@ -103,7 +50,7 @@ public class ProductServiceImpl implements ProductService {
 	@Override
 	public void lock(Long id) {
 		try {
-            Product prod = productDao.findOne(id);
+            Product prod = ProductUtils.findById(id);
             prod.setIsSale(Constant.YES);
             ProductUtils.switchProduct(id, "sale", Constant.NO);
 		} catch (Exception e) {
@@ -114,7 +61,7 @@ public class ProductServiceImpl implements ProductService {
 	@Override
 	public void unlockPurc(Long id) {
 		try {
-			Product prod = productDao.findOne(id);
+			Product prod = ProductUtils.findById(id);
 			prod.setIsPurchase(Constant.YES);
             ProductUtils.switchProduct(id, "purc", Constant.YES);
 		} catch (Exception e) {
@@ -125,7 +72,7 @@ public class ProductServiceImpl implements ProductService {
 	@Override
 	public void lockPurc(Long id) {
 		try {
-			Product prod = productDao.findOne(id);
+			Product prod = ProductUtils.findById(id);
 			prod.setIsPurchase(Constant.NO);
             ProductUtils.switchProduct(id, "purc", Constant.NO);
 		} catch (Exception e) {
@@ -133,43 +80,6 @@ public class ProductServiceImpl implements ProductService {
 		}
 	}
 
-	@Override
-	public ModelMap refreshproduct(Long id) {
-		ModelMap map = new ModelMap();
-		ProductMatchResult re = productMatchResultDao.findOne(id);
-		if (null != re) {
-			Product prod = productDao.findOne(re.getPrid());
-			prod.setPbrand(re.getBrandcn());
-			prod.setPbranden(re.getBranden());
-			prod.setPcmpcode(re.getCmpcode());
-			prod.setKind(re.getKindcn());
-			prod.setKinden(re.getKinden());
-			prod.setCmpUuId(re.getUuid());
-			prod.setImg(re.getImg());
-			prod.setEncapsulation(re.getEncapsulation());
-			prod.setStandard(Constant.YES);
-			prod.setMatchstatus(Status.FINISH.value());
-			prod.setTostandard(new Date());
-			List<Product> prods = productDao.findByEnUUAndPcmpcodeAndPbrand(
-					SystemSession.getUser().getEnterprise().getUu(), prod.getPcmpcode(), prod.getPbrand());
-			// 新增物料状态
-            ProductStatus productStatus = new ProductStatus(prod.getId(), Constant.NO);
-			if (prods.size() == 0) {
-                productStatus.setB2bDisabled(Constant.YES);
-			}
-			try {
-				// 保存物料禁用状态信息
-				productStatusDao.save(productStatus);
-				ProductUtils.updateOne(prod);
-			} catch (Exception e) {
-				map.put("error", "更新失败");
-				e.printStackTrace();
-			}
-		}
-		map.put("success", "更新成功");
-		return map;
-	}
-
 	@Override
 	public List<ProductMatchResult> matchaone(Long id) throws Exception {
 		List<Long> ids = new ArrayList<>();

src/main/java/com/uas/platform/b2b/service/impl/ProductUsersServiceImpl.java

@@ -82,6 +82,7 @@ public class ProductUsersServiceImpl implements ProductUsersService {
 
     private Page<ProductUsers> findAllProudctByPageInfo(final PageInfo pageInfo) {
         return productUsersDao.findAll(new Specification<ProductUsers>() {
+            @Override
             public Predicate toPredicate(Root<ProductUsers> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
                 pageInfo.filter("enuu", SystemSession.getUser().getEnterprise().getUu());
                 pageInfo.filter("useruu", SystemSession.getUser().getUserUU());

src/main/java/com/uas/platform/b2b/service/impl/PurcOrderServiceImpl.java

@@ -1,7 +1,6 @@
 package com.uas.platform.b2b.service.impl;
 
 import com.uas.platform.b2b.dao.EnterpriseDao;
-import com.uas.platform.b2b.dao.ProductDao;
 import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
 import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.model.*;
@@ -36,9 +35,6 @@ public class PurcOrderServiceImpl implements PurcOrderService {
 	@Autowired
 	private EnterpriseDao enterpriseDao;
 
-	@Autowired
-	private ProductDao productDao;
-
 	@Autowired
 	private PurchaseOrderAllDao purchaseOrderAllDao;
 
@@ -53,7 +49,7 @@ public class PurcOrderServiceImpl implements PurcOrderService {
 
 	@Override
 	public Product getProductInfoById(Long id) {
-		return productDao.findOne(id);
+		return ProductUtils.findById(id);
 	}
 
 	@Override

src/main/java/com/uas/platform/b2b/service/impl/PurcProductServiceImpl.java

@@ -3,8 +3,6 @@ package com.uas.platform.b2b.service.impl;
 import com.uas.platform.b2b.core.util.DateUtils;
 import com.uas.platform.b2b.core.util.StringUtil;
 import com.uas.platform.b2b.dao.EnterpriseDao;
-import com.uas.platform.b2b.dao.ProductDao;
-import com.uas.platform.b2b.dao.ProductStatusDao;
 import com.uas.platform.b2b.dao.ProductTempDao;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.Product;
@@ -30,15 +28,9 @@ import java.util.List;
 @Service
 public class PurcProductServiceImpl implements PurcProductService {
 
-	@Autowired
-	private ProductDao productDao;
-
 	@Autowired
 	private EnterpriseDao enterpriseDao;
 
-	@Autowired
-	private ProductStatusDao productStatusDao;
-
 	@Autowired
     private ProductTempDao productTempDao;
 

src/main/java/com/uas/platform/b2b/service/impl/PurchaseApBillServiceImpl.java

@@ -1,6 +1,9 @@
 package com.uas.platform.b2b.service.impl;
 
-import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.dao.CommonDao;
+import com.uas.platform.b2b.dao.PagingReleaseCountDao;
+import com.uas.platform.b2b.dao.PurchaseApBillDao;
+import com.uas.platform.b2b.dao.PurchaseApBillItemDao;
 import com.uas.platform.b2b.erp.model.ProdInOutRefreshPrice;
 import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
 import com.uas.platform.b2b.model.Product;
@@ -33,6 +36,12 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * 采购发票
+ * 
+ * @author hejq
+ * @date 2018-07-30 10:43
+ */
 @Service
 public class PurchaseApBillServiceImpl implements PurchaseApBillService {
 
@@ -51,14 +60,11 @@ public class PurchaseApBillServiceImpl implements PurchaseApBillService {
 	@Autowired
 	private CommonDao commonDao;
 
-	@Autowired
-	private ProductDao productDao;
-
 	private final static ErpBufferedLogger logger = BufferedLoggerManager.getLogger(ErpBufferedLogger.class);
 
 	@Override
 	public void save(List<PurchaseApBillItem> apBillItems) {
-		List<PurchaseApBillItem> newApBillItems = purchaseApBillItemDao.save(apBillItems);
+		purchaseApBillItemDao.save(apBillItems);
 	}
 
 	@Override

src/main/java/com/uas/platform/b2b/service/impl/PurchaseInquiryServiceImpl.java

@@ -80,9 +80,6 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 	@Autowired
 	private CommonDao commonDao;
 
-	@Autowired
-	private ProductDao productDao;
-
 	@Autowired
 	private UserOrderDao userOrderDao;
 
@@ -184,7 +181,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 	@Override
 	public ModelMap getRecentPrice(Long prid) {
 		// 先找到对应的当前企业的物料信息
-		Product originProduct = productDao.findOne(prid);
+		Product originProduct = ProductUtils.findById(prid);
 		if (null != originProduct && null != originProduct.getCode()) {
 		    Long enUU = SystemSession.getUser().getEnterprise().getUu();
 			List<Product> productList = ProductUtils.findByEnUUAndCode(enUU, originProduct.getCode());

src/main/java/com/uas/platform/b2b/service/impl/PurchaseTenderServiceImpl.java

@@ -67,9 +67,6 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
     @Autowired
     private AttachDao attachDao;
 
-    @Autowired
-    private ProductDao productDao;
-
     @Autowired
     private AttachService attachService;
 

src/main/java/com/uas/platform/b2b/service/impl/SaleOrderItemServiceImpl.java

@@ -1,7 +1,6 @@
 package com.uas.platform.b2b.service.impl;
 
 import com.uas.platform.b2b.core.util.StringUtil;
-import com.uas.platform.b2b.dao.ProductDao;
 import com.uas.platform.b2b.dao.PurchaseOrderDao;
 import com.uas.platform.b2b.dao.SaleOrderItemDao;
 import com.uas.platform.b2b.erp.exception.ExceptionNote;
@@ -38,9 +37,6 @@ public class SaleOrderItemServiceImpl implements SaleOrderItemService {
     @Autowired
     private PurchaseOrderDao orderDao;
 
-    @Autowired
-    private ProductDao productDao;
-
     @Autowired
     private NotExistProductService notExistProductService;
 

src/main/java/com/uas/platform/b2b/service/impl/VendorsServiceImpl.java

@@ -45,15 +45,9 @@ public class VendorsServiceImpl implements VendorService {
 	@Autowired
 	private UserOrderDao userOrderDao;
 
-	@Autowired
-	private ProductDao productDao;
-
 	@Autowired
 	private CommonDao commonDao;
 
-	@Autowired
-	private UserDao userDao;
-
 	@Autowired
 	private com.uas.platform.b2b.erp.service.VendorService vendorService;
 

src/main/webapp/resources/js/index/app.js

@@ -13869,20 +13869,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         }
         // 联想词 end
 
-        //更新为标准器件
-        $scope.updateone = function (id) {
-            $scope.loading = true;
-            Products.updateone({id: id}, {}, function (data) {
-                if (data.success) {
-                    toaster.pop('success', '提示', data.success);
-                    window.location.reload();
-                }
-                $scope.loading = false;
-            }, function (response) {
-                toaster.pop('error', '提示', response.data);
-            });
-        }
-
         // 选择类目
         $scope.selectKind = function (cmpcode) {
             if (cmpcode == null) {
@@ -22318,18 +22304,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         }
         // 联想词 end
 
-        //更新为标准器件
-        $scope.updateone = function (id) {
-            Products.updateone({id: id}, {}, function (data) {
-                if (data.success) {
-                    toaster.pop('success', '提示', data.success);
-                    window.location.reload();
-                }
-            }, function (response) {
-                toaster.pop('error', '提示', response.data);
-            });
-        }
-
         // 选择类目
         $scope.selectKind = function (cmpcode) {
             if (cmpcode == null) {

src/main/webapp/resources/js/index/services/Product.js

@@ -57,10 +57,6 @@ define([ 'ngResource'], function() {
 				method: 'GET',
 				isArray: true
 			},
-			updateone: {
-				url: 'product/refreshproduct/:id',
-				method: 'POST'
-			},
 			matchResult: {
 				url: 'product/matchResult',
 				method: 'GET',