Merge remote-tracking branch 'origin/feature-201806-suntg' into feature-201806-suntg

src/main/java/com/uas/platform/b2b/erp/service/QuotationService.java

@@ -16,7 +16,7 @@ public interface QuotationService {
 	 * @param quotations
 	 * @return map 包含要保存的信息和返回的信息
 	 */
-	Map<String, List<SaleQuotationItem>> convertQuotation(List<Quotation> quotations) throws Exception;
+	Map<String, List<SaleQuotationItem>> convertQuotation(List<Quotation> quotations);
 
 	/**
 	 * 平台的主动报价的采纳结果，转为卖家ERP的主动报价的采纳结果

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

@@ -37,7 +37,7 @@ public class QuotationServiceImpl implements QuotationService {
 	private VendorService vendorService;
 
 	@Override
-	public Map<String, List<SaleQuotationItem>> convertQuotation(List<Quotation> quotations) throws Exception {
+	public Map<String, List<SaleQuotationItem>> convertQuotation(List<Quotation> quotations) {
 		Map<String, List<SaleQuotationItem>> mapSaleQuotationItem = new HashMap<String, List<SaleQuotationItem>>();
 		List<SaleQuotationItem> saveItems = new ArrayList<SaleQuotationItem>();
 		List<SaleQuotationItem> resItems = new ArrayList<SaleQuotationItem>();

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

@@ -403,12 +403,12 @@ public class ProductUtils {
      * @param code 物料code
      * @return
      */
-    public static List<Product> findByEnUUAndCode(Long enUU, String code) throws Exception {
-        HashMap<String, Object> map = new HashMap<>(2);
-        map.put("enUU", enUU);
-        map.put("code", URLEncoder.encode(code, HTTP.UTF_8));
+    public static List<Product> findByEnUUAndCode(Long enUU, String code) {
         Response res = null;
         try {
+            HashMap<String, Object> map = new HashMap<>(2);
+            map.put("enUU", enUU);
+            map.put("code", URLEncoder.encode(code, HTTP.UTF_8));
             res = HttpUtil.sendGetRequest(PRODUCT_PUBLIC_SERVICE_URL + "/product/get/findByEnUUAndCode", map);
         } catch (Exception e) {
             e.printStackTrace();