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

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

@@ -462,9 +462,9 @@ public class AppInquiryController {
      * @param id 询价单id
      * @return
      */
-    @RequestMapping(value = "/{id}/info", method = RequestMethod.GET)
-    public PurchaseInquiry getReceivedPurchaseOrderItemById(@PathVariable("id") Long id) {
-        return purchaseInquiryService.getPurcInquiryById(id);
+    @RequestMapping(value = "/{itemId}/info", method = RequestMethod.GET)
+    public PurchaseInquiryItem getReceivedPurchaseOrderItemById(@PathVariable("itemId") Long itemId) {
+        return purchaseInquiryService.getInquiryItemByItemId(itemId);
     }
 
     /**

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

@@ -6,6 +6,7 @@ import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
 import com.uas.platform.b2b.dao.PurchaseOrderDoneDao;
 import com.uas.platform.b2b.dao.PurchaseOrderTodoDao;
 import com.uas.platform.b2b.dao.PurchaseOrderWaitingDao;
+import com.uas.platform.b2b.mobile.model.OrderReply;
 import com.uas.platform.b2b.mobile.model.Purchase;
 import com.uas.platform.b2b.mobile.service.PurchaseService;
 import com.uas.platform.b2b.model.*;
@@ -26,6 +27,8 @@ import com.uas.search.b2b.model.MultiValue;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.util.SearchConstants;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
@@ -501,18 +504,20 @@ public class SaleController {
 	 * @param json   采购单回复实体json串
 	 * @return
 	 */
-	@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) {
+	@RequestMapping(value = "/reply")
+	public ResponseEntity<String> replyOrderItem(String json) throws UnsupportedEncodingException {
+		List<OrderReply> orderReplies = FlexJsonUtils.fromJsonArray(URLDecoder.decode(json, "utf-8"), OrderReply.class);
+		for (OrderReply orderReply : orderReplies) {
+			Long pdId = orderReply.getPdId();
+			PurchaseOrderReply reply = orderReply.convert();
             PurchaseOrderItem item = new PurchaseOrderItem();
-            item.setId(reply.getPdId());
+            item.setId(pdId);
             reply.setOrderItem(item);
             reply = purchaseOrderService.reply(reply);
             logger.log("客户采购单", "App回复单个客户采购单明细", reply.replyDescription(), reply.getOrderItem().getOrder().getCode(),
                     item.getId());
         }
-		return new ModelMap("success", "true");
+		return new ResponseEntity<String>(HttpStatus.OK);
 	}
 
 	/**
@@ -522,13 +527,13 @@ public class SaleController {
 	 * @return
 	 */
 	@RequestMapping(value = "/items/reply", method = RequestMethod.POST)
-	public ModelMap replyOrderItems(Long date, @RequestBody String idString) {
+	public ResponseEntity<String> replyOrderItems(Long date, @RequestBody String idString) {
 		List<PurchaseOrderReply> replies = purchaseOrderService.reply(idString.split(","), date);
 		for (PurchaseOrderReply reply : replies)
 			logger.log("客户采购单", "批量回复客户采购明细", reply.replyDescription(), reply.getOrderItem().getOrder().getCode(),
 					reply.getOrderItem().getId());
 //        purchaseOrderService.replyByBatch(idString, SystemSession.getUser().getUserName(), SystemSession.getUser().getIp(), SystemSession.getUser().getEnterprise().getUu(), SystemSession.getUser().getUserUU());
-		return new ModelMap("success", "true");
+		return new ResponseEntity<String>(HttpStatus.OK);
 	}
 
 	/**

src/main/java/com/uas/platform/b2b/mobile/model/OrderReply.java

@@ -0,0 +1,73 @@
+package com.uas.platform.b2b.mobile.model;
+
+import com.uas.platform.b2b.model.PurchaseOrderReply;
+
+import java.util.Date;
+
+/**
+ * 采购单回复实体（app回复采购单用）
+ * Created by dongbw
+ * 18/01/20 10:39.
+ */
+public class OrderReply {
+
+    /**
+     * 数量
+     */
+    private Double qty;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 交货日期
+     */
+    private Date delivery;
+
+    /**
+     * 采购单明细id
+     */
+    private Long pdId;
+
+    public Double getQty() {
+        return qty;
+    }
+
+    public void setQty(Double qty) {
+        this.qty = qty;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Date getDelivery() {
+        return delivery;
+    }
+
+    public void setDelivery(Date delivery) {
+        this.delivery = delivery;
+    }
+
+    public Long getPdId() {
+        return pdId;
+    }
+
+    public void setPdId(Long pdId) {
+        this.pdId = pdId;
+    }
+
+    public PurchaseOrderReply convert() {
+        PurchaseOrderReply reply = new PurchaseOrderReply();
+        reply.setDelivery(this.delivery);
+        reply.setQty(this.qty);
+        reply.setRemark(this.remark);
+        return reply;
+    }
+}

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

@@ -161,6 +161,12 @@ public class PurchaseOrderAll {
 	@Column(name = "pu_sendstatus")
 	private Short sendStatus;
 
+	/**
+	 * 1表示该采购单的明细至少有一条全部回复完的情况
+	 */
+	@Column(name = "pu_reply")
+	private Short reply;
+
 	/**
 	 * 采购单明细
 	 */
@@ -571,4 +577,12 @@ public class PurchaseOrderAll {
 	public void setTransport(String transport) {
 		this.transport = transport;
 	}
+
+	public Short getReply() {
+		return reply;
+	}
+
+	public void setReply(Short reply) {
+		this.reply = reply;
+	}
 }

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

@@ -49,17 +49,11 @@ 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", insertable = false, updatable = false)
+	@JoinColumn(name = "pr_pdid")
 	private PurchaseOrderItem orderItem;
 
 	/**
@@ -218,13 +212,7 @@ 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/PurchaseInquiryService.java

@@ -281,4 +281,11 @@ public interface PurchaseInquiryService {
 	 * @return
 	 */
     PurchaseInquiry getPurcInquiryById(Long id);
+
+	/**
+	 * 根据询价单明细id返回询价单明细
+	 * @param itemId 询价单明细id
+	 * @return
+	 */
+	PurchaseInquiryItem getInquiryItemByItemId(Long itemId);
 }

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

@@ -938,4 +938,15 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		inquiry.setInquiryItems(items);
 		return inquiry;
 	}
+
+    /**
+     * 根据询价单明细id返回询价单明细
+     *
+     * @param itemId 询价单明细id
+     * @return
+     */
+    @Override
+    public PurchaseInquiryItem getInquiryItemByItemId(Long itemId) {
+        return purchaseInquiryItemDao.findOne(itemId);
+    }
 }