Merge branch 'dev' into ps-product

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

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

@@ -159,12 +159,17 @@ public class PagingReleaseController {
      */
     @RequestMapping(value = "/info", method = RequestMethod.GET)
     @ResponseBody
-    public Page<MessageModel> getMessageByMessagePublicService(PageParams params, String searchFilter) throws Exception {
+    public Page<MessageModel> getMessageByMessagePublicService(PageParams params, String searchFilter) {
         JSONObject jsonObject = JSONObject.parseObject(searchFilter);
         String keyword = jsonObject.getString("keyword");
         logger.log("查看消息", "查看收到的消息");
         PageInfo pageInfo = new PageInfo(params);
-        return pagingReleaseService.getPublicMessage(keyword, pageInfo);
+        try {
+            return pagingReleaseService.getPublicMessage(keyword, pageInfo);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
     }
 
     /**

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

@@ -0,0 +1,23 @@
+package com.uas.platform.b2b.dao;
+
+import com.uas.platform.b2b.model.RouteSet;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 访问路径数据库操作
+ *
+ * Created by hejq on 2018-01-24.
+ */
+@Repository
+public interface RouteSetDao extends JpaSpecificationExecutor<RouteSet>, JpaRepository<RouteSet, Long> {
+
+    /**
+     * 通过编号查询相关信息
+     *
+     * @param code 服务编号
+     * @return
+     */
+    RouteSet findByCode(String code);
+}

src/main/java/com/uas/platform/b2b/erp/controller/ProdController.java

@@ -1,10 +1,16 @@
 package com.uas.platform.b2b.erp.controller;
 
+import com.uas.platform.b2b.erp.model.Prod;
+import com.uas.platform.b2b.erp.model.ProductSaler;
 import com.uas.platform.b2b.erp.service.ProdService;
 import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
+import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.service.ProductService;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
+import com.uas.platform.core.model.Status;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,13 +20,15 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 对ERP的数据接口<br>
  * 产品处理
- * 
+ *
  * @author yingp
- * @since 2018年1月24日 09:25:28 --UAS物料传输相关，调用产品传输公共服务接口，这里的方法除了禁用，其他都弃用 dongbw
+ *
  */
 @Controller
 @RequestMapping("/erp/product")
@@ -34,6 +42,71 @@ public class ProdController {
 
 	private final static ErpBufferedLogger logger = BufferedLoggerManager.getLogger(ErpBufferedLogger.class);
 
+	/**
+	 * 将ERP的产品资料写到平台
+	 *
+	 * @param data
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(method = RequestMethod.POST)
+	@ResponseBody
+	public void saveProducts(@RequestParam("data") String data) throws UnsupportedEncodingException {
+		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		List<Prod> prods = FlexJsonUtils.fromJsonArray(jsonStr, Prod.class);
+		productService.save(prodService.convertProduct(prods));
+		logger.log("物料资料", "上传物料资料", prods.size());
+	}
+
+	/**
+	 * 定时任务更新物料信息
+	 *
+	 * @param data
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(value = "/cycleupdate", method = RequestMethod.POST)
+	@ResponseBody
+	public void updateProducts(@RequestParam("data") String data) throws UnsupportedEncodingException {
+		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		List<Prod> prods = FlexJsonUtils.fromJsonArray(jsonStr, Prod.class);
+		productService.save(prodService.convertProduct(prods));
+		logger.log("物料资料", "定时任务更新物料资料", prods.size());
+	}
+
+	/**
+	 * 将平台更新的ERP的物料数据回传回ERP
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/backtouas", method = RequestMethod.GET)
+	@ResponseBody
+	public List<Prod> getProds() {
+		List<Prod> prods = new ArrayList<Prod>();
+		List<Product> products = productService.findBySourceAppAndDownloadstatus("ERP", Status.NOT_UPLOAD.value());
+		if (!CollectionUtils.isEmpty(products)) {
+			for (Product product : products) {
+				Prod prod = new Prod();
+				prod.setPr_uuid(product.getCmpUuId());
+				prod.setPr_id(product.getSourceId());
+				prod.setB2b_id(product.getId());
+				prods.add(prod);
+			}
+		}
+		return prods;
+	}
+
+	/**
+	 * 更新下载成功的状态
+	 *
+	 * @param data
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(value = "/refreshDownloadstatus", method = RequestMethod.POST)
+	@ResponseBody
+	public void refreshDownloadstatus(@RequestParam("data") String data) throws UnsupportedEncodingException {
+		productService.onProductDownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+	}
 
 	/**
 	 * UAS端禁用物料时调用此接口使B2B也禁用此物料
@@ -49,103 +122,37 @@ public class ProdController {
 		return productService.updateB2bEnabled(code, b2bDisabled);
 	}
 
-//	/**
-//	 * 将ERP的产品资料写到平台
-//	 *
-//	 * @param data
-//	 * @return
-//	 * @throws UnsupportedEncodingException
-//	 */
-//	@RequestMapping(method = RequestMethod.POST)
-//	@ResponseBody
-//	public void saveProducts(@RequestParam("data") String data) throws UnsupportedEncodingException {
-//		String jsonStr = URLDecoder.decode(data, "UTF-8");
-//		List<Prod> prods = FlexJsonUtils.fromJsonArray(jsonStr, Prod.class);
-//		productService.save(prodService.convertProduct(prods));
-//		logger.log("物料资料", "上传物料资料", prods.size());
-//	}
-//
-//	/**
-//	 * 定时任务更新物料信息
-//	 *
-//	 * @param data
-//	 * @return
-//	 * @throws UnsupportedEncodingException
-//	 */
-//	@RequestMapping(value = "/cycleupdate", method = RequestMethod.POST)
-//	@ResponseBody
-//	public void updateProducts(@RequestParam("data") String data) throws UnsupportedEncodingException {
-//		String jsonStr = URLDecoder.decode(data, "UTF-8");
-//		List<Prod> prods = FlexJsonUtils.fromJsonArray(jsonStr, Prod.class);
-//		productService.save(prodService.convertProduct(prods));
-//		logger.log("物料资料", "定时任务更新物料资料", prods.size());
-//	}
-//
-//	/**
-//	 * 将平台更新的ERP的物料数据回传回ERP
-//	 *
-//	 * @return
-//	 */
-//	@RequestMapping(value = "/backtouas", method = RequestMethod.GET)
-//	@ResponseBody
-//	public List<Prod> getProds() {
-//		List<Prod> prods = new ArrayList<Prod>();
-//		List<Product> products = productService.findBySourceAppAndDownloadstatus("ERP", Status.NOT_UPLOAD.value());
-//		if (!CollectionUtils.isEmpty(products)) {
-//			for (Product product : products) {
-//				Prod prod = new Prod();
-//				prod.setPr_uuid(product.getCmpUuId());
-//				prod.setPr_id(product.getSourceId());
-//				prod.setB2b_id(product.getId());
-//				prods.add(prod);
-//			}
-//		}
-//		return prods;
-//	}
-//
-//	/**
-//	 * 更新下载成功的状态
-//	 *
-//	 * @param data
-//	 * @throws UnsupportedEncodingException
-//	 */
-//	@RequestMapping(value = "/refreshDownloadstatus", method = RequestMethod.POST)
-//	@ResponseBody
-//	public void refreshDownloadstatus(@RequestParam("data") String data) throws UnsupportedEncodingException {
-//		productService.onProductDownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
-//	}
-//
-//	/**
-//	 * ERP个人物料同步到平台
-//	 *
-//	 * @author hejq
-//	 * @date 2018-01-12 19:11
-//	 * @param data
-//	 * @throws UnsupportedEncodingException
-//	 */
-//	@RequestMapping(value = "/produser", method = RequestMethod.POST)
-//	@ResponseBody
-//	public void updateProdSaler(@RequestParam("data") String data) throws UnsupportedEncodingException {
-//		String jsonStr = URLDecoder.decode(data, "UTF-8");
-//        List<ProductSaler> productSalers = FlexJsonUtils.fromJsonArray(jsonStr, ProductSaler.class);
-//        productService.updateProdSaler(productSalers);
-//        logger.log("物料资料", "上传个人物料资料", productSalers.size());
-//	}
-//
-//    /**
-//     * ERP个人物料删除同步状态到平台
-//     *
-//     * @author hejq
-//     * @date 2018-01-12 19:11
-//     * @param data
-//     * @throws UnsupportedEncodingException
-//     */
-//    @RequestMapping(value = "/produser/quit", method = RequestMethod.POST)
-//    @ResponseBody
-//    public void uploadProductSalerForCancel(@RequestParam("data") String data) throws UnsupportedEncodingException {
-//        String jsonStr = URLDecoder.decode(data, "UTF-8");
-//        List<ProductSaler> productSalers = FlexJsonUtils.fromJsonArray(jsonStr, ProductSaler.class);
-//        productService.quitProdSaler(productSalers);
-//        logger.log("物料资料", "ERP取消个人物料同步到平台", productSalers.size());
-//    }
+	/**
+	 * ERP个人物料同步到平台
+	 *
+	 * @author hejq
+	 * @date 2018-01-12 19:11
+	 * @param data
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(value = "/produser", method = RequestMethod.POST)
+	@ResponseBody
+	public void updateProdSaler(@RequestParam("data") String data) throws UnsupportedEncodingException {
+		String jsonStr = URLDecoder.decode(data, "UTF-8");
+        List<ProductSaler> productSalers = FlexJsonUtils.fromJsonArray(jsonStr, ProductSaler.class);
+        productService.updateProdSaler(productSalers);
+        logger.log("物料资料", "上传个人物料资料", productSalers.size());
+	}
+
+    /**
+     * ERP个人物料删除同步状态到平台
+     *
+     * @author hejq
+     * @date 2018-01-12 19:11
+     * @param data
+     * @throws UnsupportedEncodingException
+     */
+    @RequestMapping(value = "/produser/quit", method = RequestMethod.POST)
+    @ResponseBody
+    public void uploadProductSalerForCancel(@RequestParam("data") String data) throws UnsupportedEncodingException {
+        String jsonStr = URLDecoder.decode(data, "UTF-8");
+        List<ProductSaler> productSalers = FlexJsonUtils.fromJsonArray(jsonStr, ProductSaler.class);
+        productService.quitProdSaler(productSalers);
+        logger.log("物料资料", "ERP取消个人物料同步到平台", productSalers.size());
+    }
 }

src/main/java/com/uas/platform/b2b/model/PublicInquiryItem.java

@@ -60,6 +60,24 @@ public class PublicInquiryItem implements Serializable {
 	@Column(name = "id_useruu")
 	private Long userUU;
 
+    /**
+     * 联系人姓名
+     */
+    @Column(name = "id_username")
+    private String userName;
+
+    /**
+     * 联系人电话
+     */
+    @Column(name = "id_usertel")
+    private String userTel;
+
+    /**
+     * 联系人编号
+     */
+    @Column(name = "id_usercode")
+    private String userCode;
+
 	/**
 	 * 产品
 	 */
@@ -260,7 +278,7 @@ public class PublicInquiryItem implements Serializable {
 	 * 应用来源ERP、B2B
 	 */
 	@Column(name = "id_sourceapp")
-	private String sourceApp;
+	private String source;
 
     /**
      * 报价的应用
@@ -515,7 +533,31 @@ public class PublicInquiryItem implements Serializable {
 		this.userUU = userUU;
 	}
 
-	public String getBrand() {
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserTel() {
+        return userTel;
+    }
+
+    public void setUserTel(String userTel) {
+        this.userTel = userTel;
+    }
+
+    public String getUserCode() {
+        return userCode;
+    }
+
+    public void setUserCode(String userCode) {
+        this.userCode = userCode;
+    }
+
+    public String getBrand() {
 		return brand;
 	}
 
@@ -555,12 +597,12 @@ public class PublicInquiryItem implements Serializable {
 		this.date = date;
 	}
 
-	public String getSourceApp() {
-		return sourceApp;
+	public String getSource() {
+		return source;
 	}
 
-	public void setSourceApp(String sourceApp) {
-		this.sourceApp = sourceApp;
+	public void setSource(String source) {
+		this.source = source;
 	}
 
     public String getQutoApp() {

src/main/java/com/uas/platform/b2b/model/PurcInquiryItemInfo.java

@@ -197,6 +197,24 @@ public class PurcInquiryItemInfo {
 	@Column(name = "id_sourceid")
 	private Long sourceid;
 
+    /**
+     * 联系人编号
+     */
+	@Transient
+    private String userCode;
+
+    /**
+     * 联系人姓名
+     */
+	@Transient
+    private String userName;
+
+    /**
+     * 联系人电话
+     */
+	@Transient
+    private String userTel;
+
 	public Long getId() {
 		return id;
 	}
@@ -436,4 +454,28 @@ public class PurcInquiryItemInfo {
 	public void setSourceid(Long sourceid) {
 		this.sourceid = sourceid;
 	}
+
+    public String getUserCode() {
+        return userCode;
+    }
+
+    public void setUserCode(String userCode) {
+        this.userCode = userCode;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserTel() {
+        return userTel;
+    }
+
+    public void setUserTel(String userTel) {
+        this.userTel = userTel;
+    }
 }

src/main/java/com/uas/platform/b2b/model/PurchaseInquiryItem.java

@@ -51,6 +51,24 @@ public class PurchaseInquiryItem {
 	@Column(name = "id_useruu")
 	private Long userUU;
 
+	/**
+	 * 联系人姓名
+	 */
+	@Column(name = "id_username")
+	private String userName;
+
+	/**
+	 * 联系人电话
+	 */
+	@Column(name = "id_usertel")
+	private String userTel;
+
+	/**
+	 * 联系人编号
+	 */
+	@Column(name = "id_usercode")
+	private String userCode;
+
 	/**
 	 * 产品
 	 */
@@ -604,7 +622,31 @@ public class PurchaseInquiryItem {
 		this.kind = kind;
 	}
 
-	/**
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserTel() {
+        return userTel;
+    }
+
+    public void setUserTel(String userTel) {
+        this.userTel = userTel;
+    }
+
+    public String getUserCode() {
+        return userCode;
+    }
+
+    public void setUserCode(String userCode) {
+        this.userCode = userCode;
+    }
+
+    /**
 	 * 回复记录的描述
 	 * 
 	 * @return

src/main/java/com/uas/platform/b2b/model/PurchaseInquiryItemInfo.java

@@ -70,6 +70,24 @@ public class PurchaseInquiryItemInfo {
 	@Column(name = "id_useruu")
 	private Long userUU;
 
+	/**
+	 * 联系人姓名
+	 */
+	@Column(name = "id_username")
+	private String userName;
+
+	/**
+	 * 联系人电话
+	 */
+	@Column(name = "id_usertel")
+	private String userTel;
+
+	/**
+	 * 联系人编号
+	 */
+	@Column(name = "id_usercode")
+	private String userCode;
+
 	/**
 	 * 产品
 	 */
@@ -546,6 +564,30 @@ public class PurchaseInquiryItemInfo {
 		this.invalid = invalid;
 	}
 
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+	public String getUserTel() {
+		return userTel;
+	}
+
+	public void setUserTel(String userTel) {
+		this.userTel = userTel;
+	}
+
+	public String getUserCode() {
+		return userCode;
+	}
+
+	public void setUserCode(String userCode) {
+		this.userCode = userCode;
+	}
+
 	/**
 	 * 回复记录的描述
 	 * 

src/main/java/com/uas/platform/b2b/model/RouteSet.java

@@ -0,0 +1,78 @@
+package com.uas.platform.b2b.model;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * 各访问地址信息
+ *
+ * Created by hejq on 2018-01-24.
+ */
+@Table(name = "routeset")
+@Entity
+public class RouteSet implements Serializable {
+
+    /**
+     * 序列
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "routeset_gen")
+    @SequenceGenerator(name = "routeset_gen", sequenceName = "routeset_seq", allocationSize = 1)
+    @Column(name = "ro_id")
+    private Long id;
+
+    /**
+     * 编号
+     */
+    @Column(name = "ro_code")
+    private String code;
+
+    /**
+     * 说明
+     */
+    @Column(name = "ro_des")
+    private String des;
+
+    /**
+     * 访问地址
+     */
+    @Column(name = "ro_url")
+    private String url;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getDes() {
+        return des;
+    }
+
+    public void setDes(String des) {
+        this.des = des;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+}

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

@@ -3,47 +3,15 @@ package com.uas.platform.b2b.service.impl;
 import com.uas.account.entity.RequsetStatus;
 import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2b.core.util.ThreadTask;
-import com.uas.platform.b2b.dao.CommonDao;
-import com.uas.platform.b2b.dao.DistributeDao;
-import com.uas.platform.b2b.dao.EnterpriseDao;
-import com.uas.platform.b2b.dao.ProductDao;
-import com.uas.platform.b2b.dao.ProductMatchResultDao;
-import com.uas.platform.b2b.dao.ProductStatusDao;
-import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
-import com.uas.platform.b2b.dao.PurchaseOrderAllItemDao;
-import com.uas.platform.b2b.dao.RoleDao;
-import com.uas.platform.b2b.dao.UserBaseInfoDao;
-import com.uas.platform.b2b.dao.UserDao;
-import com.uas.platform.b2b.dao.UserOrderDao;
-import com.uas.platform.b2b.dao.VendorDao;
-import com.uas.platform.b2b.model.Attach;
-import com.uas.platform.b2b.model.Component;
-import com.uas.platform.b2b.model.Distribute;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.EnterpriseInfo;
-import com.uas.platform.b2b.model.FileUpload;
-import com.uas.platform.b2b.model.Product;
-import com.uas.platform.b2b.model.ProductStatus;
-import com.uas.platform.b2b.model.PurchaseOrderAll;
-import com.uas.platform.b2b.model.PurchaseOrderAllItem;
-import com.uas.platform.b2b.model.Role;
-import com.uas.platform.b2b.model.User;
-import com.uas.platform.b2b.model.UserBaseInfo;
-import com.uas.platform.b2b.model.UserOrders;
-import com.uas.platform.b2b.model.Vendor;
-import com.uas.platform.b2b.ps.ProductUtils;
+import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.BaseInfoService;
 import com.uas.platform.b2b.service.ComponentService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
-import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
-import com.uas.platform.b2b.temporary.model.NewPurcOrder;
-import com.uas.platform.b2b.temporary.model.OrderItems;
-import com.uas.platform.b2b.temporary.model.PartStatus;
-import com.uas.platform.b2b.temporary.model.ProdInfo;
-import com.uas.platform.b2b.temporary.model.UserSpaceDetail;
+import com.uas.platform.b2b.temporary.model.*;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
@@ -64,12 +32,7 @@ import org.springframework.ui.ModelMap;
 
 import javax.transaction.Transactional;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 @Service
 @Transactional
@@ -256,9 +219,9 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 			}
 			if (!CollectionUtils.isEmpty(products)) {
 				try {
-					List<Long> ids = ProductUtils.update(products);
+					products = productDao.save(products);
 //					saveUserOrders(products);
-					modelMap.put("success", ids != null ? ids.size() : 0);
+					modelMap.put("success", products.size());
 				} catch (Exception e) {
 					modelMap.put("error", "存在编号相同的产品");
 				}
@@ -342,7 +305,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 			prodInfo.setStandard(Constant.NO);
 		}
 		prodInfo.setErpDate(new Date());
-		ProductUtils.updateOne(prodInfo);
+		prodInfo = productDao.save(prodInfo);
 //		saveUserOrders(prodInfo);
 		map.put("success", "更新成功");
 		return map;
@@ -399,9 +362,9 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 			prodInfo.setEnUU(SystemSession.getUser().getEnterprise().getUu());
 			prodInfo.setSourceApp("B2B");
 			prodInfo.setErpDate(new Date());
-			Long id = ProductUtils.updateOne(prodInfo);
+			prodInfo = productDao.save(prodInfo);
 //			saveUserOrders(prodInfo);
-			map.put("id", id);
+			map.put("id", prodInfo.getId());
 			map.put("success", "物料添加成功");
 		}
 		return map;
@@ -431,26 +394,36 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 	public Product findById(Long id) {
 		Product product = productDao.findOne(id);
 		Integer num = productDao.findProductBusinessStatusById(id);
+//		if (num > 0) {
+//			product.setIsbusiness(Constant.YES);
+//		} else {
+//			product.setIsbusiness(Constant.NO);
+//		}
 		return product;
 	}
 
-	/**
-	 * 删除物料，设置成disabled
-	 * @param id 物料id
-	 */
 	@Override
 	public void deleteById(Long id) throws Exception {
-		Product product = productDao.findOne(id);
-		if (null != product) {
-			ProductUtils.deleteMatchResultAndProductUser(id);
-			// 物料禁用
-			ProductStatus productStatus = new ProductStatus();
-			productStatus.setProduct(product);
-			productStatus.setB2bDisabled(Constant.YES);
-			productStatusDao.save(productStatus);
+		if (productDao.exists(id)) {
+			// 先删除匹配结果的id
+			List<ProductMatchResult> results = productMatchResultDao.findByPrid(id);
+			if (!CollectionUtils.isEmpty(results)) {
+				productMatchResultDao.delete(results);
+			}
+			// 需要删除个人物料库的数据
+            deleteUserProduct(id);
+			productDao.delete(id);
 		}
 	}
 
+    /**
+     * 删除个人物料库的数据
+     * @param id
+     */
+    private void deleteUserProduct(Long id) {
+        commonDao.getJdbcTemplate().execute("delete product$users where pu_prid = " + id);
+    }
+
     @Override
 	public Vendor addCust(BasePartnersInfo partner) {
 		Enterprise enter = enterpriseDao.findEnterpriseByEnBussinessCode(partner.getVendUID());
@@ -828,8 +801,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 	}
 
 	@Override
-	public void switchPorduct(String status) throws Exception {
-		// sale or purc
+	public void switchPorduct(String status) {
 		String switchtype = "sale";
 		Integer switchstatus = 0;
 		Enterprise enter = SystemSession.getUser().getEnterprise();
@@ -842,8 +814,6 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		// TODO 这里之后要修改为只调用公共服务方法，B2B数据从公共服务同步
 		productDao.switchProductByEnuuAndTypeAndStatus(SystemSession.getUser().getEnterprise().getUu(), switchtype,
 				switchstatus);
-		ProductUtils.switchProductByEnuuAndTypeAndStatus(SystemSession.getUser().getEnterprise().getUu(), switchtype,
-				switchstatus);
 	}
 
 }

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

@@ -342,14 +342,7 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 	public List<DeputyOrder> findByDeputyuu(Long enuu) {
 		String entryStatus = "已提交";
 		String downloadStatus = "未下载";
-		List<Long> idList = new ArrayList<Long>();
-		idList.add(5351L);
-		idList.add(5349L);
-		idList.add(5347L);
-		idList.add(5346L);
-		idList.add(5343L);
-		return deputyOrderDao.findAll(idList);
-//		return deputyOrderDao.getByDeputyuuAndEntrystatusAndDownloadstatus(enuu, entryStatus, downloadStatus);
+		return deputyOrderDao.getByDeputyuuAndEntrystatusAndDownloadstatus(enuu, entryStatus, downloadStatus);
 	}
 
 	@Override

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

@@ -77,7 +77,7 @@ public class ProductServiceImpl implements ProductService {
     private ProductUsersDao productUsersDao;
 
 	@Autowired
-    private ProductStatusDao productStatusDao;
+	private ProductStatusDao productStatusDao;
 
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 

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

@@ -214,7 +214,7 @@ public class PubInquiryServiceImpl implements PubInquiryService {
                 item.setStatus((short) Status.NOT_REPLY.value());
                 item.setVendUU(enuu);
                 item.setVendUserUU(useruu);
-                item.setSourceApp(purcInquiryItem.getSource());
+                item.setSource(purcInquiryItem.getSource());
                 item.setCustLap(Constant.NO);
                 item.setSendStatus((short) Status.NOT_UPLOAD.value());
                 item.setSourceId(id);
@@ -268,7 +268,7 @@ public class PubInquiryServiceImpl implements PubInquiryService {
                         item.setProductId(purcInquiryItem.getProductId());
                         item.setVendUU(SystemSession.getUser().getEnterprise().getUu());
                         item.setVendUserUU(SystemSession.getUser().getUserUU());
-                        item.setSourceApp(purcInquiryItem.getSource());
+                        item.setSource(purcInquiryItem.getSource());
                         item.setStatus((short) Status.NOT_REPLY.value());
                         item.setCustLap(Constant.NO);
                         item.setSendStatus((short) Status.NOT_UPLOAD.value());

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

@@ -3,11 +3,56 @@ package com.uas.platform.b2b.service.impl;
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.core.util.SplitArray;
 import com.uas.platform.b2b.core.util.ThreadTask;
-import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.dao.CommonDao;
+import com.uas.platform.b2b.dao.DistributeDao;
+import com.uas.platform.b2b.dao.EnterpriseDao;
+import com.uas.platform.b2b.dao.PagingReleaseDao;
+import com.uas.platform.b2b.dao.PrintLogDao;
+import com.uas.platform.b2b.dao.PurcOrderInfoItemDao;
+import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
+import com.uas.platform.b2b.dao.PurchaseOrderAllItemDao;
+import com.uas.platform.b2b.dao.PurchaseOrderDao;
+import com.uas.platform.b2b.dao.PurchaseOrderDoneDao;
+import com.uas.platform.b2b.dao.PurchaseOrderEndDao;
+import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
+import com.uas.platform.b2b.dao.PurchaseOrderReceivedDao;
+import com.uas.platform.b2b.dao.PurchaseOrderReplyDao;
+import com.uas.platform.b2b.dao.PurchaseOrderTodoDao;
+import com.uas.platform.b2b.dao.PurchaseOrderWaitingDao;
+import com.uas.platform.b2b.dao.RoleDao;
+import com.uas.platform.b2b.dao.UserBaseInfoDao;
+import com.uas.platform.b2b.dao.UserDao;
+import com.uas.platform.b2b.dao.UserOrderDao;
+import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.event.PurchaseOrderEndReleaseEvent;
 import com.uas.platform.b2b.event.PurchaseOrderReplyReleaseEvent;
 import com.uas.platform.b2b.event.PurchaseOrderSaveReleaseEvent;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.Distribute;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.PrintLog;
+import com.uas.platform.b2b.model.PurcOrderInfoItem;
+import com.uas.platform.b2b.model.PurchaseOrder;
+import com.uas.platform.b2b.model.PurchaseOrderAll;
+import com.uas.platform.b2b.model.PurchaseOrderAllItem;
+import com.uas.platform.b2b.model.PurchaseOrderDone;
+import com.uas.platform.b2b.model.PurchaseOrderDoneItem;
+import com.uas.platform.b2b.model.PurchaseOrderEnd;
+import com.uas.platform.b2b.model.PurchaseOrderEndItem;
+import com.uas.platform.b2b.model.PurchaseOrderInfo;
+import com.uas.platform.b2b.model.PurchaseOrderItem;
+import com.uas.platform.b2b.model.PurchaseOrderReceived;
+import com.uas.platform.b2b.model.PurchaseOrderReceivedItem;
+import com.uas.platform.b2b.model.PurchaseOrderReply;
+import com.uas.platform.b2b.model.PurchaseOrderTodo;
+import com.uas.platform.b2b.model.PurchaseOrderTodoItem;
+import com.uas.platform.b2b.model.PurchaseOrderWaiting;
+import com.uas.platform.b2b.model.PurchaseOrderWaitingItem;
+import com.uas.platform.b2b.model.Role;
+import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.model.User;
+import com.uas.platform.b2b.model.UserBaseInfo;
+import com.uas.platform.b2b.model.UserOrders;
+import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.ProductUsersService;
 import com.uas.platform.b2b.service.PurchaseOrderService;
@@ -26,17 +71,26 @@ 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.jdbc.core.RowMapper;
 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.*;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.SetJoin;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 @Service
 @Transactional
@@ -888,6 +942,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 				}
 				pageInfo.expression(PredicateUtils.in("id", lists, false));
 			}
+			pageInfo.expression(PredicateUtils.ne("status", Status.UNAUDIT.value(), false));
 			if (filter.getFromDate() != null)
 				pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
 			if (filter.getEndDate() != null)

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

@@ -5528,7 +5528,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         // 转客户询价
         $scope.transtoInquiry = function (inquiryItem) {
             publicInquiry.quotationInfo({id: inquiryItem.id}, function(data) {
-                console.log(data);
                 if (data.inquiryItem) { //存在已报价的就不进行报价操作
                     toaster.pop('error', '该询价单已已经报价');
                 } else {
@@ -5557,12 +5556,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             window.open("#/sale/pubinquiry");
         }
 
-        var pageInfo = {
-            pageNumber: 1,
-            pageSize: 20
-        }
-
-
     }]);
 
     /**

src/main/webapp/resources/tpl/index/baseInfo/inquiryItem_detail.html

@@ -725,10 +725,10 @@ input[type="radio"], input[type="checkbox"] {
                 <span>询价企业</span><em ng-bind="::inquiryItem.inquiry.enterprise.enName"></em>
             </li>
             <li>
-                <span>联系人&nbsp;</span><em ng-bind="::inquiryItem.inquiry.recorder"></em>
+                <span>联系人&nbsp;</span><em ng-bind="::inquiryItem.userName"></em>
             </li>
             <li>
-                <span>联系电话</span><em ng-bind="::inquiryItem.inquiry.userBaseInfo.userTel"></em>
+                <span>联系电话</span><em ng-bind="::inquiryItem.userTel"></em>
             </li>
             <li>
                 <span>企业地址</span><em ng-bind="::inquiryItem.inquiry.ship"></em>

src/main/webapp/resources/tpl/index/baseInfo/modal/quotation_modal.html

@@ -181,7 +181,7 @@
             <div class="form-group">
                 <label for="inputEmail5" class="col-xs-4 control-label">供应商型号</label>
                 <div class="col-xs-8">
-                    <input type="text" class="form-control" id="inputEmail5" placeholder="1000">
+                    <input type="text" class="form-control" id="inputEmail5" placeholder="1000" ng-model="inquiryItem.vendorprodcode">
                 </div>
             </div>
         </div>

src/main/webapp/resources/tpl/index/sale/pubinquiry.html

@@ -349,7 +349,7 @@
 						<a title="查看详情"
 						   class="text-num order-detail"
 						   ng-bind="::inquiryItem.inquiry.code"
-						   ui-sref="sale.pubinquiry_detail({id:inquiryItem.inquiry.id})"
+						   ui-sref="sale.pubinquiry_detail({id:inquiryItem.id})"
 						   target="_self"
 						   ng-click="setOrdersRead(inquiryItem.id)"></a>
 					</span>