Browse Source

采购变更单无需确认没有变更到采购单的问题处理

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@10008 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
dongbw 8 years ago
parent
commit
e41ecf58db

+ 3 - 2
src/main/java/com/uas/platform/b2b/service/impl/PurchaseOrderChangeServiceImpl.java

@@ -9,6 +9,7 @@ import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseOrderChangeService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.XingePusher;
+import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
@@ -67,7 +68,7 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
 			if (!orderId.contains(orderItem.getOrderChange().getId())) {
 				orderId.add(orderItem.getOrderChange().getId());
 				// 买家直接批准变更,无需卖家确认的情况下,直接变更平台的客户采购单
-				if (orderItem.getOrderChange().isAgreed())
+				if (orderItem.getOrderChange().isAgreed() || orderItem.getOrderChange().getUnNeedReply() == Constant.YES)
 					changeOrder(orderItem.getOrderChange());
 			}
 		}
@@ -98,7 +99,7 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
 	 * @param change
 	 */
 	private void changeOrder(PurchaseOrderChange change) {
-		if (change.isAgreed()) {
+		if (change.isAgreed() || change.getUnNeedReply() == Constant.YES) { // 同意或无需确认
 			purchaseOrderDao.save(convertOrder(change));
 			if (!CollectionUtils.isEmpty(change.getOrderChangeItems())) {
 				for (PurchaseOrderChangeItem changeItem : change.getOrderChangeItems())