Browse Source

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@383 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

administrator 11 years ago
parent
commit
c37d7b2d2f

+ 24 - 0
src/main/java/com/uas/platform/b2b/erp/controller/InquiryController.java

@@ -59,5 +59,29 @@ public class InquiryController {
 	public List<InquiryDetailDet> getReply() {
 	public List<InquiryDetailDet> getReply() {
 		return inquiryService.convertPurchaseInquiryReply(purchaseInquiryService.findNotUploadReply());
 		return inquiryService.convertPurchaseInquiryReply(purchaseInquiryService.findNotUploadReply());
 	}
 	}
+	
+	/**
+	 * 平台的报价信息传到买家ERP之后,修改平台里面的询价单明细的上传状态
+	 * 
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(value = "/reply/back", method = RequestMethod.POST)
+	@ResponseBody
+	public void onReplySuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
+		purchaseInquiryService.onReplyUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+	}
+	
+	/**
+	 * 买家ERP(不)采纳了价格之后,修改平台里面的报价信息的状态
+	 * 
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(value = "/reply/decide", method = RequestMethod.POST)
+	@ResponseBody
+	public void onReplyDecide(@RequestParam("data") String data) throws UnsupportedEncodingException {
+		
+	}
 
 
 }
 }

+ 43 - 1
src/main/java/com/uas/platform/b2b/model/PurchaseInquiryReply.java

@@ -109,9 +109,27 @@ public class PurchaseInquiryReply implements Serializable {
 	/**
 	/**
 	 * 报价人
 	 * 报价人
 	 */
 	 */
-	@Column(name = "pr_recorder")
+	@Column(name = "ir_recorder")
 	private String recorder;
 	private String recorder;
 
 
+	/**
+	 * 是否采纳
+	 */
+	@Column(name = "ir_agreed")
+	private Short agreed;
+
+	/**
+	 * (针对买家的)传输状态{待上传、已下载}
+	 */
+	@Column(name = "ir_status")
+	private Short status;
+
+	/**
+	 * (针对卖家的)传输状态{待上传、已下载}
+	 */
+	@Column(name = "ir_sendstatus")
+	private Short sendStatus;
+
 	public Long getId() {
 	public Long getId() {
 		return id;
 		return id;
 	}
 	}
@@ -218,4 +236,28 @@ public class PurchaseInquiryReply implements Serializable {
 		this.recorder = recorder;
 		this.recorder = recorder;
 	}
 	}
 
 
+	public Short getAgreed() {
+		return agreed;
+	}
+
+	public void setAgreed(Short agreed) {
+		this.agreed = agreed;
+	}
+
+	public Short getStatus() {
+		return status;
+	}
+
+	public void setStatus(Short status) {
+		this.status = status;
+	}
+
+	public Short getSendStatus() {
+		return sendStatus;
+	}
+
+	public void setSendStatus(Short sendStatus) {
+		this.sendStatus = sendStatus;
+	}
+
 }
 }

+ 7 - 0
src/main/java/com/uas/platform/b2b/service/PurchaseInquiryService.java

@@ -21,5 +21,12 @@ public interface PurchaseInquiryService {
 	 * @return
 	 * @return
 	 */
 	 */
 	List<PurchaseInquiryReply> findNotUploadReply();
 	List<PurchaseInquiryReply> findNotUploadReply();
+	
+	/**
+	 * 报价信息成功传到买家ERP之后
+	 * 
+	 * @param idArray
+	 */
+	public void onReplyUploadSuccess(String[] idArray);
 
 
 }
 }

+ 5 - 0
src/main/java/com/uas/platform/b2b/service/impl/PurchaseInquiryServiceImpl.java

@@ -48,4 +48,9 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		return null;
 		return null;
 	}
 	}
 
 
+	@Override
+	public void onReplyUploadSuccess(String[] idArray) {
+		
+	}
+
 }
 }