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

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

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.uas.platform.b2b.erp.model.QuotationDown;
 import com.uas.platform.b2b.erp.service.QuotationDownService;
 import com.uas.platform.b2b.service.PurchaseInquiryService;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
 /**
  * 对卖家ERP的数据接口
@@ -22,7 +23,7 @@ import com.uas.platform.b2b.service.PurchaseInquiryService;
  * 
  */
 @Controller
-@RequestMapping("/erp/sale/quotation")
+@RequestMapping("/erp/sale/inquiry")
 public class QuotationDownController {
 
 	@Autowired
@@ -54,4 +55,19 @@ public class QuotationDownController {
 		purchaseInquiryService.onQuotationDownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
 	}
 
+	/**
+	 * 将卖家ERP的报价信息写到平台
+	 * 
+	 * @param data
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(value = "/reply", method = RequestMethod.POST)
+	@ResponseBody
+	public void saveQuotationReplies(@RequestParam("data") String data) throws UnsupportedEncodingException {
+		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		List<QuotationDown> downs = FlexJsonUtils.fromJsonArray(jsonStr, QuotationDown.class);
+		purchaseInquiryService.reply(downs);
+	}
+
 }

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

@@ -33,7 +33,7 @@ public class SaleDownChangeReply {
 	}
 
 	public Short getSc_agreed() {
-		return sc_agreed != null ? (short) Math.abs(sc_agreed) : sc_agreed;
+		return sc_agreed != null ? (short) Math.abs(sc_agreed) : null;
 	}
 
 	public void setSc_agreed(Short sc_agreed) {
@@ -47,6 +47,10 @@ public class SaleDownChangeReply {
 	public void setSc_replyremark(String sc_replyremark) {
 		this.sc_replyremark = sc_replyremark;
 	}
+	
+	public SaleDownChangeReply(){
+		
+	}
 
 	public SaleDownChangeReply(PurchaseOrderChange orderChange) {
 		this.b2b_pc_id = orderChange.getId();

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

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.service;
 
 import java.util.List;
 
+import com.uas.platform.b2b.erp.model.QuotationDown;
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
 import com.uas.platform.b2b.model.PurchaseInquiryReply;
 
@@ -51,4 +52,11 @@ public interface PurchaseInquiryService {
 	 */
 	public void onQuotationDownSuccess(String[] idArray);
 
+	/**
+	 * 来自供应商ERP端的报价
+	 * 
+	 * @param downs
+	 */
+	public void reply(List<QuotationDown> downs);
+
 }

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

@@ -9,6 +9,7 @@ import org.springframework.stereotype.Service;
 
 import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
 import com.uas.platform.b2b.dao.PurchaseInquiryReplyDao;
+import com.uas.platform.b2b.erp.model.QuotationDown;
 import com.uas.platform.b2b.model.PurchaseInquiry;
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
 import com.uas.platform.b2b.model.PurchaseInquiryReply;
@@ -88,4 +89,9 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		}
 	}
 
+	@Override
+	public void reply(List<QuotationDown> downs) {
+		
+	}
+
 }