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

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

@@ -26,13 +26,13 @@ import com.uas.platform.core.util.serializer.FlexJsonUtils;
 @Controller
 @RequestMapping("/erp/sale")
 public class SaleController {
-	
+
 	@Autowired
 	private SaleService saleService;
-	
+
 	@Autowired
 	private PurchaseOrderService purchaseOrderService;
-	
+
 	/**
 	 * 卖家ERP从平台获取未回复的订单
 	 * 
@@ -43,7 +43,18 @@ public class SaleController {
 	public List<SaleDown> getOrders() {
 		return saleService.convertPurchaseOrder(purchaseOrderService.findNotUploadOrder());
 	}
-	
+
+	/**
+	 * 平台的订单传到供应商ERP之后，修改平台里面的订单的上传状态
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/reply", method = RequestMethod.POST)
+	@ResponseBody
+	public void onSaleDownSuccess(@RequestParam("data") String data) {
+		purchaseOrderService.onReplyUploadSuccess(data.split(","));
+	}
+
 	/**
 	 * 将卖家ERP的订单回复写到平台
 	 * 

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

@@ -17,9 +17,10 @@ public class SaleDown {
 	private long b2b_pu_id;
 	private String sa_code;
 	private String sa_pocode;
-	private long cu_uu;
+	private long sa_customeruu;
 	private Date sa_date;
 	private Date sa_recorddate;
+	private String sa_payments;
 	private String sa_currency;
 	private String sa_shipby;
 	private List<SaleDownDetail> saleDownDetails;
@@ -48,12 +49,12 @@ public class SaleDown {
 		this.sa_pocode = sa_pocode;
 	}
 
-	public long getCu_uu() {
-		return cu_uu;
+	public long getSa_customeruu() {
+		return sa_customeruu;
 	}
 
-	public void setCu_uu(long cu_uu) {
-		this.cu_uu = cu_uu;
+	public void setSa_customeruu(long sa_customeruu) {
+		this.sa_customeruu = sa_customeruu;
 	}
 
 	public Date getSa_date() {
@@ -72,6 +73,14 @@ public class SaleDown {
 		this.sa_recorddate = sa_recorddate;
 	}
 
+	public String getSa_payments() {
+		return sa_payments;
+	}
+
+	public void setSa_payments(String sa_payments) {
+		this.sa_payments = sa_payments;
+	}
+
 	public String getSa_currency() {
 		return sa_currency;
 	}
@@ -108,7 +117,7 @@ public class SaleDown {
 	public SaleDown(PurchaseOrderAll order) {
 		this.b2b_pu_id = order.getId();
 		this.sa_code = order.getCode();
-		this.cu_uu = order.getEnUU();
+		this.sa_customeruu = order.getEnUU();
 		this.sa_currency = order.getCurrency();
 		this.sa_date = order.getDate();
 		this.sa_pocode = order.getCode();

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

@@ -103,4 +103,11 @@ public interface PurchaseOrderService {
 	 * @param idArray
 	 */
 	public void onReplyUploadSuccess(String[] idArray);
+	
+	/**
+	 * 平台的订单传到供应商ERP之后，修改平台里面的订单的上传状态
+	 * 
+	 * @param idArray
+	 */
+	public void onSaleDownSuccess(String[] idArray);
 }

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

@@ -180,4 +180,15 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 				(short) Status.NOT_UPLOAD.value());
 	}
 
+	@Override
+	public void onSaleDownSuccess(String[] idArray) {
+		for (String id : idArray) {
+			PurchaseOrder order = purchaseOrderDao.findOne(Long.parseLong(id));
+			if (order != null) {
+				order.setSendStatus((short) Status.DOWNLOADED.value());
+				purchaseOrderDao.save(order);
+			}
+		}
+	}
+
 }