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

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

@@ -14,7 +14,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.uas.platform.b2b.erp.model.Inquiry;
 import com.uas.platform.b2b.erp.model.InquiryDecide;
 import com.uas.platform.b2b.erp.service.InquiryService;
+import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
 import com.uas.platform.b2b.service.SaleQuotationService;
+import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
 /**
@@ -34,6 +36,8 @@ public class InquiryDownController {
 	@Autowired
 	private SaleQuotationService saleQuotationService;
 
+	private final static ErpBufferedLogger logger = BufferedLoggerManager.getLogger(ErpBufferedLogger.class);
+
 	/**
 	 * 买家ERP从平台获取主动报价
 	 * 
@@ -42,7 +46,9 @@ public class InquiryDownController {
 	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
 	public List<Inquiry> getInquiries() {
-		return inquiryService.convertSaleQuotation(saleQuotationService.findNotUploadQuotation());
+		List<Inquiry> inquiries = inquiryService.convertSaleQuotation(saleQuotationService.findNotUploadQuotation());
+		logger.log("下载来自供应商的主动报价", inquiries.size());
+		return inquiries;
 	}
 
 	/**

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

@@ -14,7 +14,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.uas.platform.b2b.erp.model.PurchaseChange;
 import com.uas.platform.b2b.erp.model.PurchaseChangeReply;
 import com.uas.platform.b2b.erp.service.PurchaseChangeService;
+import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
 import com.uas.platform.b2b.service.PurchaseOrderChangeService;
+import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
 /**
@@ -33,6 +35,8 @@ public class PurchaseChangeController {
 
 	@Autowired
 	private PurchaseOrderChangeService purchaseOrderChangeService;
+	
+	private final static ErpBufferedLogger logger = BufferedLoggerManager.getLogger(ErpBufferedLogger.class);
 
 	/**
 	 * 将ERP的采购变更单写到平台
@@ -47,6 +51,7 @@ public class PurchaseChangeController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<PurchaseChange> changes = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseChange.class);
 		purchaseOrderChangeService.save(purchaseChangeService.convertPurchaseChange(changes));
+		logger.log("上传采购变更单", changes.size());
 	}
 
 	/**
@@ -57,7 +62,9 @@ public class PurchaseChangeController {
 	@RequestMapping(value = "/reply", method = RequestMethod.GET)
 	@ResponseBody
 	public List<PurchaseChangeReply> getReply() {
-		return purchaseChangeService.convertPurchaseOrderChangeReply(purchaseOrderChangeService.findNotUploadReply());
+		List<PurchaseChangeReply> replies = purchaseChangeService.convertPurchaseOrderChangeReply(purchaseOrderChangeService.findNotUploadReply());
+		logger.log("下载采购变更单回复信息", replies.size());
+		return replies;
 	}
 
 	/**

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

@@ -63,7 +63,8 @@ public class PurchaseController {
 	@RequestMapping(value = "/reply", method = RequestMethod.GET)
 	@ResponseBody
 	public List<PurchaseReply> getReply() {
-		List<PurchaseReply> replies = purchaseService.convertPurchaseOrderReply(purchaseOrderService.findNotUploadReply());
+		List<PurchaseReply> replies = purchaseService.convertPurchaseOrderReply(purchaseOrderService
+				.findNotUploadReply());
 		logger.log("下载采购单回复记录", replies.size());
 		return replies;
 	}

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

@@ -14,7 +14,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.uas.platform.b2b.erp.model.AcceptNotify;
 import com.uas.platform.b2b.erp.model.PurchaseNotify;
 import com.uas.platform.b2b.erp.service.PurchaseNotifyService;
+import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
 import com.uas.platform.b2b.service.PurchaseNoticeService;
+import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
 /**
@@ -34,6 +36,8 @@ public class PurchaseNotifyController {
 	@Autowired
 	private PurchaseNoticeService purchaseNoticeService;
 
+	private final static ErpBufferedLogger logger = BufferedLoggerManager.getLogger(ErpBufferedLogger.class);
+	
 	/**
 	 * 将ERP的送货提醒写到平台
 	 * 
@@ -47,6 +51,7 @@ public class PurchaseNotifyController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<PurchaseNotify> notifies = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseNotify.class);
 		purchaseNoticeService.save(purchaseNotifyService.convertPurchaseNotify(notifies));
+		logger.log("上传送货提醒", notifies.size());
 	}
 
 	/**
@@ -57,7 +62,9 @@ public class PurchaseNotifyController {
 	@RequestMapping(value = "/accept", method = RequestMethod.GET)
 	@ResponseBody
 	public List<AcceptNotify> getAcceptNotify() {
-		return purchaseNotifyService.convertSaleSend(purchaseNoticeService.findNotUploadSend());
+		List<AcceptNotify> notifies = purchaseNotifyService.convertSaleSend(purchaseNoticeService.findNotUploadSend());
+		logger.log("下载来自供应商的发货单", notifies.size());
+		return notifies;
 	}
 
 	/**
@@ -85,6 +92,7 @@ public class PurchaseNotifyController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<AcceptNotify> accepts = FlexJsonUtils.fromJsonArray(jsonStr, AcceptNotify.class);
 		purchaseNoticeService.send(purchaseNotifyService.convertAcceptNotify(accepts));
+		logger.log("上传主动收料通知单", accepts.size());
 	}
 
 	/**
@@ -99,6 +107,7 @@ public class PurchaseNotifyController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<PurchaseNotify> ends = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseNotify.class);
 		purchaseNoticeService.end(ends);
+		logger.log("上传结案送货提醒", ends.size());
 	}
 
 }

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

@@ -14,7 +14,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.uas.platform.b2b.erp.model.Quotation;
 import com.uas.platform.b2b.erp.model.QuotationDecide;
 import com.uas.platform.b2b.erp.service.QuotationService;
+import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
 import com.uas.platform.b2b.service.SaleQuotationService;
+import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
 /**
@@ -33,6 +35,8 @@ public class QuotationController {
 
 	@Autowired
 	private SaleQuotationService saleQuotationService;
+	
+	private final static ErpBufferedLogger logger = BufferedLoggerManager.getLogger(ErpBufferedLogger.class);
 
 	/**
 	 * 将卖家ERP的主动报价写到平台
@@ -47,6 +51,7 @@ public class QuotationController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<Quotation> quotations = FlexJsonUtils.fromJsonArray(jsonStr, Quotation.class);
 		saleQuotationService.save(quotationService.convertQuotation(quotations));
+		logger.log("上传主动报价", quotations.size());
 	}
 
 	/**
@@ -57,7 +62,9 @@ public class QuotationController {
 	@RequestMapping(value = "/decide", method = RequestMethod.GET)
 	@ResponseBody
 	public List<QuotationDecide> getQuotationDecide() {
-		return quotationService.convertQuotationDecide(saleQuotationService.findNotUploadQuotationDecide());
+		List<QuotationDecide> decides = quotationService.convertQuotationDecide(saleQuotationService.findNotUploadQuotationDecide());
+		logger.log("下载客户对报价单的采纳结果", decides.size());
+		return decides;
 	}
 
 	/**

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

@@ -14,7 +14,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.uas.platform.b2b.erp.model.QuotationDown;
 import com.uas.platform.b2b.erp.model.QuotationDownDecide;
 import com.uas.platform.b2b.erp.service.QuotationDownService;
+import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
 import com.uas.platform.b2b.service.PurchaseInquiryService;
+import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
 /**
@@ -33,6 +35,8 @@ public class QuotationDownController {
 
 	@Autowired
 	private PurchaseInquiryService purchaseInquiryService;
+	
+	private final static ErpBufferedLogger logger = BufferedLoggerManager.getLogger(ErpBufferedLogger.class);
 
 	/**
 	 * 卖家ERP从平台获取未报价的询价明细
@@ -42,7 +46,9 @@ public class QuotationDownController {
 	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
 	public List<QuotationDown> getQuotations() {
-		return quotationDownService.convertPurchaseInquiry(purchaseInquiryService.findNotUploadInquiry());
+		List<QuotationDown> downs = quotationDownService.convertPurchaseInquiry(purchaseInquiryService.findNotUploadInquiry());
+		logger.log("下载客户采购询价单", downs.size());
+		return downs;
 	}
 
 	/**
@@ -70,6 +76,7 @@ public class QuotationDownController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<QuotationDown> downs = FlexJsonUtils.fromJsonArray(jsonStr, QuotationDown.class);
 		purchaseInquiryService.reply(downs);
+		logger.log("上传客户询价单的报价信息", downs.size());
 	}
 
 	/**
@@ -80,7 +87,9 @@ public class QuotationDownController {
 	@RequestMapping(value = "/reply", method = RequestMethod.GET)
 	@ResponseBody
 	public List<QuotationDown> getReply() {
-		return quotationDownService.convertInquiryReply(purchaseInquiryService.findNotUploadInquiryReply());
+		List<QuotationDown> downs = quotationDownService.convertInquiryReply(purchaseInquiryService.findNotUploadInquiryReply());
+		logger.log("下载在平台报价的客户询价单报价信息", downs.size());
+		return downs;
 	}
 
 	/**
@@ -103,7 +112,9 @@ public class QuotationDownController {
 	@RequestMapping(value = "/reply/decide", method = RequestMethod.GET)
 	@ResponseBody
 	public List<QuotationDownDecide> getReplyDecide() {
-		return quotationDownService.convertInquiryReplyDecide(purchaseInquiryService.findNotUploadInquiryReplyDecide());
+		List<QuotationDownDecide> decides = quotationDownService.convertInquiryReplyDecide(purchaseInquiryService.findNotUploadInquiryReplyDecide());
+		logger.log("下载客户对客户询价单报价信息的采纳结果", decides.size());
+		return decides;
 	}
 
 	/**

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

@@ -14,7 +14,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.uas.platform.b2b.erp.model.SaleDownChange;
 import com.uas.platform.b2b.erp.model.SaleDownChangeReply;
 import com.uas.platform.b2b.erp.service.SaleDownChangeService;
+import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
 import com.uas.platform.b2b.service.PurchaseOrderChangeService;
+import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
 /**
@@ -32,6 +34,8 @@ public class SaleDownChangeController {
 
 	@Autowired
 	private SaleDownChangeService saleDownChangeService;
+	
+	private final static ErpBufferedLogger logger = BufferedLoggerManager.getLogger(ErpBufferedLogger.class);
 
 	/**
 	 * 卖家ERP从平台获取未回复的采购变更单
@@ -41,7 +45,9 @@ public class SaleDownChangeController {
 	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
 	public List<SaleDownChange> getOrderChanges() {
-		return saleDownChangeService.convertPurchaseOrderChange(purchaseOrderChangeService.findNotUploadOrderChange());
+		List<SaleDownChange> changes = saleDownChangeService.convertPurchaseOrderChange(purchaseOrderChangeService.findNotUploadOrderChange());
+		logger.log("下载客户采购变更单", changes.size());
+		return changes;
 	}
 
 	/**
@@ -69,6 +75,7 @@ public class SaleDownChangeController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<SaleDownChangeReply> replies = FlexJsonUtils.fromJsonArray(jsonStr, SaleDownChangeReply.class);
 		purchaseOrderChangeService.reply(replies);
+		logger.log("上传客户采购变更单的回复信息", replies.size());
 	}
 
 	/**
@@ -79,7 +86,9 @@ public class SaleDownChangeController {
 	@RequestMapping(value = "/reply", method = RequestMethod.GET)
 	@ResponseBody
 	public List<SaleDownChangeReply> getChangeReply() {
-		return saleDownChangeService.convertOrderChangeReply(purchaseOrderChangeService.findNotSendReply());
+		List<SaleDownChangeReply> replies = saleDownChangeService.convertOrderChangeReply(purchaseOrderChangeService.findNotSendReply());
+		logger.log("下載在平台回复的客户采购变更单回复信息", replies.size());
+		return replies;
 	}
 
 	/**

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

@@ -15,7 +15,9 @@ import com.uas.platform.b2b.erp.model.SaleDown;
 import com.uas.platform.b2b.erp.model.SaleDownDetailEnd;
 import com.uas.platform.b2b.erp.model.SaleReply;
 import com.uas.platform.b2b.erp.service.SaleDownService;
+import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
 import com.uas.platform.b2b.service.PurchaseOrderService;
+import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
 /**
@@ -33,6 +35,8 @@ public class SaleDownController {
 
 	@Autowired
 	private PurchaseOrderService purchaseOrderService;
+	
+	private final static ErpBufferedLogger logger = BufferedLoggerManager.getLogger(ErpBufferedLogger.class);
 
 	/**
 	 * 卖家ERP从平台获取未回复的订单
@@ -42,7 +46,9 @@ public class SaleDownController {
 	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
 	public List<SaleDown> getOrders() {
-		return saleDownService.convertPurchaseOrder(purchaseOrderService.findNotUploadOrder());
+		List<SaleDown> downs = saleDownService.convertPurchaseOrder(purchaseOrderService.findNotUploadOrder());
+		logger.log("下载客户采购订单", downs.size());
+		return downs;
 	}
 
 	/**
@@ -70,6 +76,7 @@ public class SaleDownController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<SaleReply> replies = FlexJsonUtils.fromJsonArray(jsonStr, SaleReply.class);
 		purchaseOrderService.reply(saleDownService.convertSaleReply(replies));
+		logger.log("上传客户采购单回复信息", replies.size());
 	}
 
 	/**
@@ -80,7 +87,9 @@ public class SaleDownController {
 	@RequestMapping(value = "/reply", method = RequestMethod.GET)
 	@ResponseBody
 	public List<SaleReply> getReply() {
-		return saleDownService.convertOrderReply(purchaseOrderService.findNotSendReply());
+		List<SaleReply> replies = saleDownService.convertOrderReply(purchaseOrderService.findNotSendReply());
+		logger.log("下载直接在平台回复的客户采购单回复信息", replies.size());
+		return replies;
 	}
 
 	/**
@@ -103,7 +112,9 @@ public class SaleDownController {
 	@RequestMapping(value = "/end", method = RequestMethod.GET)
 	@ResponseBody
 	public List<SaleDownDetailEnd> getSaleEnd() {
-		return saleDownService.convertOrderItemEnd(purchaseOrderService.findNotSendEnd());
+		List<SaleDownDetailEnd> ends = saleDownService.convertOrderItemEnd(purchaseOrderService.findNotSendEnd());
+		logger.log("下载结案、反结案的客户采购单", ends.size());
+		return ends;
 	}
 
 	/**

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

@@ -15,7 +15,9 @@ import com.uas.platform.b2b.erp.model.SaleNotifyDown;
 import com.uas.platform.b2b.erp.model.SaleNotifyDownEnd;
 import com.uas.platform.b2b.erp.model.SaleOut;
 import com.uas.platform.b2b.erp.service.SaleNotifyDownService;
+import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
 import com.uas.platform.b2b.service.PurchaseNoticeService;
+import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
 /**
@@ -34,6 +36,8 @@ public class SaleNotifyDownController {
 
 	@Autowired
 	private PurchaseNoticeService purchaseNoticeService;
+	
+	private final static ErpBufferedLogger logger = BufferedLoggerManager.getLogger(ErpBufferedLogger.class);
 
 	/**
 	 * 卖家ERP从平台获取客户送货提醒
@@ -43,7 +47,9 @@ public class SaleNotifyDownController {
 	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
 	public List<SaleNotifyDown> getNotices() {
-		return saleNotifyDownService.convertPurchaseNotice(purchaseNoticeService.findNotUploadNotice());
+		List<SaleNotifyDown> downs = saleNotifyDownService.convertPurchaseNotice(purchaseNoticeService.findNotUploadNotice());
+		logger.log("下载客户送货提醒", downs.size());
+		return downs;
 	}
 
 	/**
@@ -71,6 +77,7 @@ public class SaleNotifyDownController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<SaleOut> outs = FlexJsonUtils.fromJsonArray(jsonStr, SaleOut.class);
 		purchaseNoticeService.send(saleNotifyDownService.convertSaleOut(outs));
+		logger.log("上传发货单", outs.size());
 	}
 
 	/**
@@ -81,7 +88,9 @@ public class SaleNotifyDownController {
 	@RequestMapping(value = "/send", method = RequestMethod.GET)
 	@ResponseBody
 	public List<SaleOut> getSaleOut() {
-		return saleNotifyDownService.convertSaleSend(purchaseNoticeService.findNotSendSend());
+		List<SaleOut> outs = saleNotifyDownService.convertSaleSend(purchaseNoticeService.findNotSendSend());
+		logger.log("下载直接在平台发货的发货单", outs.size());
+		return outs;
 	}
 
 	/**
@@ -104,7 +113,9 @@ public class SaleNotifyDownController {
 	@RequestMapping(value = "/end", method = RequestMethod.GET)
 	@ResponseBody
 	public List<SaleNotifyDownEnd> getSaleNotifyEnd() {
-		return saleNotifyDownService.convertPurchaseNoticeEnd(purchaseNoticeService.findNotSendEnd());
+		List<SaleNotifyDownEnd> ends = saleNotifyDownService.convertPurchaseNoticeEnd(purchaseNoticeService.findNotSendEnd());
+		logger.log("下载结案客户送货提醒", ends.size());
+		return ends;
 	}
 
 	/**