Browse Source

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

administrator 11 years ago
parent
commit
188feafc11

+ 7 - 4
src/main/java/com/uas/platform/b2b/erp/controller/PurchaseController.java

@@ -14,6 +14,7 @@ import com.uas.platform.b2b.erp.model.PurchaseReply;
 import com.uas.platform.b2b.erp.service.PurchaseService;
 import com.uas.platform.b2b.erp.service.PurchaseService;
 import com.uas.platform.b2b.model.PurchaseOrderAll;
 import com.uas.platform.b2b.model.PurchaseOrderAll;
 import com.uas.platform.b2b.service.PurchaseOrderService;
 import com.uas.platform.b2b.service.PurchaseOrderService;
+import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
 
 /**
 /**
@@ -41,9 +42,10 @@ public class PurchaseController {
 	 */
 	 */
 	@RequestMapping(method = RequestMethod.POST)
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	@ResponseBody
-	public List<PurchaseOrderAll> savePurchases(@RequestBody String json) {
+	public String savePurchases(@RequestBody String json) {
 		List<Purchase> purchases = FlexJsonUtils.fromJsonArray(json, Purchase.class);
 		List<Purchase> purchases = FlexJsonUtils.fromJsonArray(json, Purchase.class);
-		return purchaseOrderService.save(purchaseService.convertPurchase(purchases));
+		purchaseOrderService.save(purchaseService.convertPurchase(purchases));
+		return Constant.SUCCESS;
 	}
 	}
 
 
 	/**
 	/**
@@ -53,8 +55,9 @@ public class PurchaseController {
 	 */
 	 */
 	@RequestMapping(value = "/reply", method = RequestMethod.GET)
 	@RequestMapping(value = "/reply", method = RequestMethod.GET)
 	@ResponseBody
 	@ResponseBody
-	public List<PurchaseReply> getReply() {
-		return purchaseService.convertPurchaseOrderReply(purchaseOrderService.findNotUploadReply());
+	public String getReply() {
+		purchaseService.convertPurchaseOrderReply(purchaseOrderService.findNotUploadReply());
+		return Constant.SUCCESS;
 	}
 	}
 
 
 }
 }