Przeglądaj źródła

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

administrator 11 lat temu
rodzic
commit
47e4a8145f

+ 18 - 4
src/main/java/com/uas/platform/b2b/service/impl/PurchaseOrderChangeServiceImpl.java

@@ -102,7 +102,7 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
 				orderChange.setAgreed(reply.getSc_agreed());
 				orderChange.setReplyRemark(reply.getSc_replyremark());
 				orderChange.setReplySendStatus((short) Status.DOWNLOADED.value());
-				reply(orderChange);
+				reply(orderChange, false);
 			}
 		}
 	}
@@ -137,10 +137,24 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
 
 	@Override
 	public void reply(PurchaseOrderChange change) {
-		change.setStatus((short) Status.REPLIED.value());
-		purchaseOrderChangeDao.save(change);
+		reply(change, true);
+	}
+
+	/**
+	 * @param change
+	 * @param isB2b
+	 *            是否在平台操作
+	 */
+	private void reply(PurchaseOrderChange change, boolean isB2b) {
+		PurchaseOrderChange orderChange = purchaseOrderChangeDao.findOne(change.getId());
+		orderChange.setStatus((short) Status.REPLIED.value());
+		orderChange.setAgreed(change.getAgreed());
+		orderChange.setReplyRemark(change.getReplyRemark());
+		if (isB2b)
+			orderChange.setReplySendStatus((short) Status.NOT_UPLOAD.value());
+		purchaseOrderChangeDao.save(orderChange);
 		// 将回复信息推送给采购企业采购员(或管理员)
-		PurchaseOrder order = change.getOrder();
+		PurchaseOrder order = orderChange.getOrder();
 		if (order.getUserUU() != null) {
 			// Android
 			XingePusher.pushSingleAccountAndroid(order.getUserUU().toString(), "新增采购单回复", "单号:" + order.getCode() + ",供应商:"