Просмотр исходного кода

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

administrator 11 лет назад
Родитель
Сommit
d5f86df43a

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

@@ -59,7 +59,7 @@ public class PurchaseController {
 	public List<PurchaseReply> getReply() {
 		return purchaseService.convertPurchaseOrderReply(purchaseOrderService.findNotUploadReply());
 	}
-	
+
 	/**
 	 * 平台的订单回复传到ERP之后,修改平台里面的回复记录的状态
 	 * 
@@ -68,7 +68,7 @@ public class PurchaseController {
 	@RequestMapping(value = "/reply", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplySuccess(@RequestParam("data") String data) {
-		
+		purchaseOrderService.onReplyUploadSuccess(data.split(","));
 	}
 
 }

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

@@ -82,4 +82,11 @@ public interface PurchaseOrderService {
 	 * @return
 	 */
 	public List<PurchaseOrderReply> findNotUploadReply();
+
+	/**
+	 * 回复记录成功传到ERP之后
+	 * 
+	 * @param idArray
+	 */
+	public void onReplyUploadSuccess(String[] idArray);
 }

+ 16 - 6
src/main/java/com/uas/platform/b2b/service/impl/PurchaseOrderServiceImpl.java

@@ -89,8 +89,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 		if (item.getReplyQty() > item.getQty())
 			throw new IllegalOperatorException("回复的数量合计超过了订单数量");
 		// 该行回复状态
-		item.setStatus((short) (Double.compare(item.getReplyQty(), item.getQty()) == 0 ? Status.REPLIED.value()
-				: Status.NOT_REPLY.value()));
+		item.setStatus((short) (Double.compare(item.getReplyQty(), item.getQty()) == 0 ? Status.REPLIED.value() : Status.NOT_REPLY.value()));
 		purchaseOrderReplyDao.save(reply);
 		purchaseOrderItemDao.save(item);
 		// 订单主记录状态
@@ -103,8 +102,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
 	@Override
 	public PurchaseOrderAll findByCode(String code) {
-		List<PurchaseOrderAll> purchaseOrderAlls = purchaseOrderAllDao.findByVendUUAndCode(SystemSession.getUser()
-				.getEnterprise().getUu(), code);
+		List<PurchaseOrderAll> purchaseOrderAlls = purchaseOrderAllDao.findByVendUUAndCode(SystemSession.getUser().getEnterprise().getUu(),
+				code);
 		if (purchaseOrderAlls.size() == 0)
 			throw new NotFoundException(code);
 		return purchaseOrderAlls.get(0);
@@ -142,8 +141,19 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
 	@Override
 	public List<PurchaseOrderReply> findNotUploadReply() {
-		return purchaseOrderReplyDao.findByEnUUAndStatus(SystemSession.getUser().getEnterprise().getUu(),
-				(short) Status.NOT_UPLOAD.value());
+		return purchaseOrderReplyDao
+				.findByEnUUAndStatus(SystemSession.getUser().getEnterprise().getUu(), (short) Status.NOT_UPLOAD.value());
+	}
+
+	@Override
+	public void onReplyUploadSuccess(String[] idArray) {
+		for (String id : idArray) {
+			PurchaseOrderReply reply = purchaseOrderReplyDao.findOne(Long.parseLong(id));
+			if (reply != null) {
+				reply.setStatus((short) Status.REPLIED.value());
+				purchaseOrderReplyDao.save(reply);
+			}
+		}
 	}
 
 }