取消发货提醒同一供应商给同一客户发货单号不能重复的限制。--因为有客户反应勾选多个，批量发货只产生一张单。

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

src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseChangeServiceImpl.java

@@ -1,27 +1,18 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import com.uas.platform.b2b.dao.ProductDao;
-import com.uas.platform.b2b.dao.PurchaseOrderChangeDao;
-import com.uas.platform.b2b.dao.PurchaseOrderChangeItemDao;
-import com.uas.platform.b2b.dao.PurchaseOrderDao;
-import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
+import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.PurchaseChange;
 import com.uas.platform.b2b.erp.model.PurchaseChangeReply;
 import com.uas.platform.b2b.erp.service.PurchaseChangeService;
-import com.uas.platform.b2b.model.Product;
-import com.uas.platform.b2b.model.PurchaseOrder;
-import com.uas.platform.b2b.model.PurchaseOrderChange;
-import com.uas.platform.b2b.model.PurchaseOrderChangeItem;
-import com.uas.platform.b2b.model.PurchaseOrderItem;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.support.SystemSession;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class PurchaseChangeServiceImpl implements PurchaseChangeService {

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

@@ -258,12 +258,12 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 	public SaleSend send(Long noticeId, SaleSend send) {
 		PurchaseNotice notice = purchaseNoticeDao.findOne(noticeId);
 		if (notice != null) {
-			//限制同一个供应商给同一个客户发货单号不可以重复，（避免一次发货产生多张单）
-			List<SaleSend> sends =
-					saleSendDao.findByEnUUAndCustUUAndCode(SystemSession.getUser().getEnterprise().getUu(),notice.getEnUU(), send.getCode());
-			if (sends.size() > 0) {
-				throw new IllegalOperatorException("发货单号重复，无法发货！提示：多个物料一起发货请选择批量发货。");
-			}
+//			//限制同一个供应商给同一个客户发货单号不可以重复，（避免一次发货产生多张单）
+//			List<SaleSend> sends =
+//					saleSendDao.findByEnUUAndCustUUAndCode(SystemSession.getUser().getEnterprise().getUu(),notice.getEnUU(), send.getCode());
+//			if (sends.size() > 0) {
+//				throw new IllegalOperatorException("发货单号重复，无法发货！提示：多个物料一起发货请选择批量发货。");
+//			}
 			if (notice.getEnd() != null && notice.getEnd() == Constant.YES)
 				throw new IllegalOperatorException("客户已经取消了本次送货提醒，请刷新重试！");
 			double thisQty = 0;
@@ -318,12 +318,12 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 	@Override
 	public SaleSend send(SaleSend saleSend) {
 		if (saleSend != null) {
-			 //限制同一个供应商给同一个客户发货单号不可以重复，（避免一次发货产生多张单）
-			 List<SaleSend> sends =
-			 	saleSendDao.findByEnUUAndCustUUAndCode(SystemSession.getUser().getEnterprise().getUu(),saleSend.getCustUU(), saleSend.getCode());
-			 if (sends.size() > 0) {
-				 throw new IllegalOperatorException("发货单号重复，无法发货！提示：多个物料一起发货请选择批量发货。");
-			 }
+//			 //限制同一个供应商给同一个客户发货单号不可以重复，（避免一次发货产生多张单）
+//			 List<SaleSend> sends =
+//			 	saleSendDao.findByEnUUAndCustUUAndCode(SystemSession.getUser().getEnterprise().getUu(),saleSend.getCustUU(), saleSend.getCode());
+//			 if (sends.size() > 0) {
+//				 throw new IllegalOperatorException("发货单号重复，无法发货！提示：多个物料一起发货请选择批量发货。");
+//			 }
 			saleSend.setBackStatus((short) Status.NOT_UPLOAD.value());
 			saleSend.setSendStatus((short) Status.NOT_UPLOAD.value());
 			saleSend.setEnUU(SystemSession.getUser().getEnterprise().getUu());