删除物料无效字段；修改采购单回复接口

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

@@ -532,25 +532,25 @@ public class BaseInfoController {
 		return new ModelMap("content", list);
 	}
 
-	/**
-	 * 统计未阅读单据各个状态数量
-	 *
-	 * @return
-	 * @author wangmh
-	 */
-	@RequestMapping(value = "/unread", method = RequestMethod.GET, headers = "Accept=application/json")
-	@ResponseBody
-	@ResponseStatus(value = HttpStatus.OK)
-	public ModelMap getOrderUnreadCount() {
-		final ModelMap modelMap = new ModelMap();
-		List<Object[]> list = productService.getProductCount("sale");
-		int all = 0;
-		int value;
-		for(Object[] objects : list){
-			value = Integer.valueOf(objects[0].toString());
-			all = all + value;
-		}
-		modelMap.put("all", all);
-		return modelMap;
-	}
+//	/**
+//	 * 统计未阅读单据各个状态数量
+//	 *
+//	 * @return
+//	 * @author wangmh
+//	 */
+//	@RequestMapping(value = "/unread", method = RequestMethod.GET, headers = "Accept=application/json")
+//	@ResponseBody
+//	@ResponseStatus(value = HttpStatus.OK)
+//	public ModelMap getOrderUnreadCount() {
+//		final ModelMap modelMap = new ModelMap();
+//		List<Object[]> list = productService.getProductCount("sale");
+//		int all = 0;
+//		int value;
+//		for(Object[] objects : list){
+//			value = Integer.valueOf(objects[0].toString());
+//			all = all + value;
+//		}
+//		modelMap.put("all", all);
+//		return modelMap;
+//	}
 }

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

@@ -230,14 +230,14 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
 	@Procedure(procedureName = "PRODUCT$BUSINESSSTATUS")
 	public Integer findProductBusinessStatusById(Long id);
 
-	/**
-	 * 获得每种单据状态的数量
-	 *
-	 * @param ids 单据id
-	 * @return
-	 */
-	@Query("select count(p), p.status from Product p where p.id in :ids group by p.status")
-	public List<Object[]> getUnreadCountEveryStatus(@Param("ids") List<Long> ids);
+//	/**
+//	 * 获得每种单据状态的数量
+//	 *
+//	 * @param ids 单据id
+//	 * @return
+//	 */
+//	@Query("select count(p), p.status from Product p where p.id in :ids group by p.status")
+//	public List<Object[]> getUnreadCountEveryStatus(@Param("ids") List<Long> ids);
 
 	/**
 	 * 通过型号和品牌查询物料是否存在

src/main/java/com/uas/platform/b2b/erp/model/Prod.java

@@ -277,9 +277,9 @@ public class Prod {
 		product.setBrand(this.pr_brand);
 		if (this.pr_status != null) {
 			if (this.pr_status.equals(Status.DISABLED.getPhrase())) {
-				product.setB2benabled(Constant.YES);
+				product.getProductStatus().setB2bDisabled(Constant.YES);
 			} else {
-				product.setB2benabled(null);
+				product.getProductStatus().setB2bDisabled(null);
 			}
 
 //			if (this.pr_status.equals(Status.AUDITED.getPhrase())) {

src/main/java/com/uas/platform/b2b/mobile/controller/SaleController.java

@@ -498,19 +498,20 @@ public class SaleController {
 	/**
 	 * 作为卖家，回复收到的采购订单
 	 *
-	 * @param json
-	 * @param orderItemId
+	 * @param json   采购单回复实体json串
 	 * @return
 	 */
-	@RequestMapping(value = "/items/{orderItemId}/reply", method = RequestMethod.POST)
-	public ModelMap replyOrderItem(@RequestParam String json, @PathVariable("orderItemId") Long orderItemId) throws UnsupportedEncodingException {
-		PurchaseOrderReply reply = FlexJsonUtils.fromJson(URLDecoder.decode(json, "utf-8"), PurchaseOrderReply.class);
-		PurchaseOrderItem orderItem = new PurchaseOrderItem();
-		orderItem.setId(orderItemId);
-		reply.setOrderItem(orderItem);
-		reply = purchaseOrderService.reply(reply);
-		logger.log("客户采购单", "App单个回复客户采购明细", reply.replyDescription(), reply.getOrderItem().getOrder().getCode(),
-				orderItemId);
+	@RequestMapping(value = "/reply", method = RequestMethod.POST)
+	public ModelMap replyOrderItem(String json) throws UnsupportedEncodingException {
+		List<PurchaseOrderReply> replies = FlexJsonUtils.fromJsonArray(URLDecoder.decode(json, "utf-8"), PurchaseOrderReply.class);
+		for (PurchaseOrderReply reply : replies) {
+            PurchaseOrderItem item = new PurchaseOrderItem();
+            item.setId(reply.getPdId());
+            reply.setOrderItem(item);
+            reply = purchaseOrderService.reply(reply);
+            logger.log("客户采购单", "App回复单个客户采购单明细", reply.replyDescription(), reply.getOrderItem().getOrder().getCode(),
+                    item.getId());
+        }
 		return new ModelMap("success", "true");
 	}
 

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

@@ -250,12 +250,6 @@ public class Product {
 	@Column(name = "pr_cmpimg")
 	private String img;
 
-	/**
-	 * 封装
-	 */
-	@Column(name = "pr_encapsulation")
-	private String encapsulation;
-
 	/**
 	 * 匹配成标准的日期
 	 */
@@ -632,14 +626,6 @@ public class Product {
 		this.img = img;
 	}
 
-	public String getEncapsulation() {
-		return encapsulation;
-	}
-
-	public void setEncapsulation(String encapsulation) {
-		this.encapsulation = encapsulation;
-	}
-
 	public Date getTostandard() {
 		return tostandard;
 	}

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

@@ -49,11 +49,17 @@ public class PurchaseOrderReply implements Serializable {
 	@OrderBy
 	private Date date;
 
+	/**
+	 * 采购订单明细id
+	 */
+	@Column(name = "pr_pdid")
+	private Long pdId;
+
 	/**
 	 * 采购订单明细
 	 */
 	@ManyToOne(cascade = { CascadeType.REFRESH, CascadeType.MERGE })
-	@JoinColumn(name = "pr_pdid")
+	@JoinColumn(name = "pr_pdid", insertable = false, updatable = false)
 	private PurchaseOrderItem orderItem;
 
 	/**
@@ -212,6 +218,14 @@ public class PurchaseOrderReply implements Serializable {
 		this.erpDate = erpDate;
 	}
 
+	public Long getPdId() {
+		return pdId;
+	}
+
+	public void setPdId(Long pdId) {
+		this.pdId = pdId;
+	}
+
 	/**
 	 * 回复详情
 	 * 

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

@@ -187,7 +187,7 @@ public interface ProductService {
 
 	void setReadByOrder(String category, Long[] sourceId);
 
-	List<Object[]> getProductCount(String category);
+//	List<Object[]> getProductCount(String category);
 
 	/**
 	 * 禁用物料

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

@@ -483,14 +483,14 @@ public class ProductServiceImpl implements ProductService {
 	 * return map; }
 	 */
 
-	@Override
-	public List<Object[]> getProductCount(String category) {
-		List<Long> ids = getUnreadIds(category);
-		if (CollectionUtils.isEmpty(ids)){
-			return new ArrayList<>();
-		}
-		return productDao.getUnreadCountEveryStatus(ids);
-	}
+//	@Override
+//	public List<Object[]> getProductCount(String category) {
+//		List<Long> ids = getUnreadIds(category);
+//		if (CollectionUtils.isEmpty(ids)){
+//			return new ArrayList<>();
+//		}
+//		return productDao.getUnreadCountEveryStatus(ids);
+//	}
 
 	@Override
 	public List<Long> getUnreadIds(String category) {