Merge remote-tracking branch 'origin/dev' into dev

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/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/Product.java

@@ -308,7 +308,7 @@ public class Product {
 	 * 标准品牌uuid
 	 */
 	@Column(name = "pr_pbranduuid")
-	private Long pbrandUuid;
+	private String pbrandUuid;
 
 	/**
 	 * 包装方式
@@ -712,11 +712,11 @@ public class Product {
 		this.pbrandId = pbrandId;
 	}
 
-	public Long getPbrandUuid() {
+	public String getPbrandUuid() {
 		return pbrandUuid;
 	}
 
-	public void setPbrandUuid(Long pbrandUuid) {
+	public void setPbrandUuid(String pbrandUuid) {
 		this.pbrandUuid = pbrandUuid;
 	}
 

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)