增加报价、发货前的限制

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

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

@@ -34,6 +34,7 @@ import com.uas.platform.b2b.model.PurchaseInquiryReply;
 import com.uas.platform.b2b.service.PurchaseInquiryService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.XingePusher;
+import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.exception.IllegalStatusException;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
@@ -228,6 +229,8 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		if (item.getStatus() == Status.REPLIED.value()
 				|| (item.getReplySendStatus() != null && item.getReplySendStatus() == Status.DOWNLOADED.value()))
 			throw new IllegalStatusException("该询价单已经报价，不允许再次报价");
+		if ((item.getInquiry().getCheck() != null && item.getInquiry().getCheck() == Constant.YES) || (item.getAgreed() != null))
+			throw new IllegalOperatorException("客户正在审核您的上次报价，当前不允许再次报价");
 		inquiryItem.setStatus((short) Status.REPLIED.value());
 		inquiryItem.setBackStatus((short) Status.NOT_UPLOAD.value());
 		inquiryItem.setReplySendStatus((short) Status.NOT_UPLOAD.value());

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

@@ -208,6 +208,8 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 		// if (saleSend.size() > 0)
 		// throw new IllegalOperatorException("发货单号重复，无法发货！提示：多个物料一起发货请选择批量发货。");
 		if (notice != null) {
+			if (notice.getEnd() != null && notice.getEnd() == Constant.YES)
+				throw new IllegalOperatorException("客户已经取消了本次送货提醒，请刷新重试！");
 			double thisQty = 0;
 			for (SaleSendItem item : send.getSendItems())
 				thisQty += item.getQty();