收料单检验上传

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

src/main/java/com/uas/platform/b2b/erp/service/PurchaseNotifyService.java

@@ -9,6 +9,7 @@ import com.uas.platform.b2b.erp.model.PurchaseNotify;
 import com.uas.platform.b2b.model.PurchaseNotice;
 import com.uas.platform.b2b.model.SaleSend;
 import com.uas.platform.b2b.model.SaleSendItem;
+import com.uas.platform.b2b.model.SaleSendItemVerify;
 
 public interface PurchaseNotifyService {
 
@@ -50,7 +51,7 @@ public interface PurchaseNotifyService {
 	 * @param confirms
 	 * @return
 	 */
-	List<SaleSendItem> convertAcceptNotifyVerify(List<AcceptNotifyVerify> verifies);
+	List<SaleSendItemVerify> convertAcceptNotifyVerify(List<AcceptNotifyVerify> verifies);
 
 	/**
 	 * 将买家ERP收料单反审核的信息，转为平台的发货单明细
@@ -58,6 +59,6 @@ public interface PurchaseNotifyService {
 	 * @param confirms
 	 * @return
 	 */
-	List<SaleSendItem> convertAcceptUnauditVerify(List<AcceptNotifyVerify> verifies);
+	List<SaleSendItemVerify> convertAcceptUnauditVerify(List<AcceptNotifyVerify> verifies);
 
 }

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

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import com.uas.platform.b2b.dao.PurchaseNoticeDao;
 import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
 import com.uas.platform.b2b.dao.SaleSendItemDao;
+import com.uas.platform.b2b.dao.SaleSendItemVerifyDao;
 import com.uas.platform.b2b.erp.model.AcceptNotify;
 import com.uas.platform.b2b.erp.model.AcceptNotifyConfirm;
 import com.uas.platform.b2b.erp.model.AcceptNotifyVerify;
@@ -20,6 +21,8 @@ import com.uas.platform.b2b.model.PurchaseNotice;
 import com.uas.platform.b2b.model.PurchaseOrderItem;
 import com.uas.platform.b2b.model.SaleSend;
 import com.uas.platform.b2b.model.SaleSendItem;
+import com.uas.platform.b2b.model.SaleSendItemVerify;
+import com.uas.platform.b2b.support.SystemSession;
 
 @Service
 public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
@@ -30,6 +33,8 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
 	private PurchaseNoticeDao purchaseNoticeDao;
 	@Autowired
 	private SaleSendItemDao saleSendItemDao;
+	@Autowired
+	private SaleSendItemVerifyDao saleSendItemVerifyDao;
 
 	@Override
 	public List<PurchaseNotice> convertPurchaseNotify(List<PurchaseNotify> notifies) {
@@ -98,41 +103,34 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
 	 * 转收料单，增加客户收料数量
 	 */
 	@Override
-	public List<SaleSendItem> convertAcceptNotifyVerify(List<AcceptNotifyVerify> verifies) {
-		System.out.println("convert : " + verifies.size());
-		List<SaleSendItem> sendItems = new ArrayList<SaleSendItem>();
+	public List<SaleSendItemVerify> convertAcceptNotifyVerify(List<AcceptNotifyVerify> verifies) {
+		List<SaleSendItemVerify> sendItemVerifies = new ArrayList<SaleSendItemVerify>();
 		for (AcceptNotifyVerify verify : verifies) {
+			SaleSendItemVerify sendItemVerify = verify.convert();
 			List<SaleSendItem> items = saleSendItemDao.findBySendAndNumber(verify.getB2b_ss_id(), verify.getAnd_detno());
 			if (items.size() > 0) {
-				SaleSendItem item = items.get(0);
-				Double verifyQty = (item.getVerifyQty() == null ? 0 : item.getVerifyQty()) + verify.getVad_qty();
-				if (verifyQty > item.getQty())
-					verifyQty = item.getQty();
-				item.setVerifyQty(verifyQty);
-				sendItems.add(item);
+				sendItemVerify.setSendItemId(items.get(0).getId());
+				sendItemVerifies.add(sendItemVerify);
 			}
 		}
-		return sendItems;
+		return sendItemVerifies;
 	}
 
 	/**
 	 * 收料单反审核，减少客户收料数量
 	 */
 	@Override
-	public List<SaleSendItem> convertAcceptUnauditVerify(List<AcceptNotifyVerify> verifies) {
-		List<SaleSendItem> sendItems = new ArrayList<SaleSendItem>();
+	public List<SaleSendItemVerify> convertAcceptUnauditVerify(List<AcceptNotifyVerify> verifies) {
+		List<SaleSendItemVerify> sendItemVerifies = new ArrayList<SaleSendItemVerify>();
 		for (AcceptNotifyVerify verify : verifies) {
-			List<SaleSendItem> items = saleSendItemDao.findBySendAndNumber(verify.getB2b_ss_id(), verify.getAnd_detno());
-			if (items.size() > 0) {
-				SaleSendItem item = items.get(0);
-				Double verifyQty = (item.getVerifyQty() == null ? 0 : item.getVerifyQty()) - verify.getVad_qty();
-				if (verifyQty < 0)
-					verifyQty = (double) 0;
-				item.setVerifyQty(verifyQty);
-				sendItems.add(item);
+			List<SaleSendItemVerify> itemVerifies = saleSendItemVerifyDao.findByCustUUAndSourceId(
+					SystemSession.getUser().getEnterprise().getUu(), verify.getVad_id());
+			if (itemVerifies.size() > 0) {
+				sendItemVerifies.add(itemVerifies.get(0));
 			}
 		}
-		return sendItems;
+		System.out.println(sendItemVerifies.size());
+		return sendItemVerifies;
 	}
 
 }

src/main/java/com/uas/platform/b2b/service/PurchaseNoticeService.java

@@ -9,6 +9,7 @@ import com.uas.platform.b2b.model.PurchaseNotice;
 import com.uas.platform.b2b.model.SaleSend;
 import com.uas.platform.b2b.model.SaleSendAll;
 import com.uas.platform.b2b.model.SaleSendItem;
+import com.uas.platform.b2b.model.SaleSendItemVerify;
 import com.uas.platform.core.model.PageInfo;
 
 public interface PurchaseNoticeService {
@@ -17,13 +18,13 @@ public interface PurchaseNoticeService {
 	 * 转收料单
 	 * @param saleSendItems
 	 */
-	public void onVerify(List<SaleSendItem> saleSendItems);
+	public void onVerify(List<SaleSendItemVerify> verifies);
 
 	/**
 	 * 反审核收料单
 	 * @param saleSendItems
 	 */
-	public void unVerify(List<SaleSendItem> saleSendItems);
+	public void unVerify(List<SaleSendItemVerify> verifies);
 
 	/**
 	 * 批量保存、修改客户送货提醒

src/main/java/com/uas/platform/b2b/service/UserService.java

@@ -111,5 +111,6 @@ public interface UserService {
 	 * @return
 	 */
 	public User updatePassword(User user, String password, String newPassword);
+	
 
 }

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

@@ -24,6 +24,7 @@ import com.uas.platform.b2b.dao.SaleSendAllDao;
 import com.uas.platform.b2b.dao.SaleSendDao;
 import com.uas.platform.b2b.dao.SaleSendIndexDao;
 import com.uas.platform.b2b.dao.SaleSendItemDao;
+import com.uas.platform.b2b.dao.SaleSendItemVerifyDao;
 import com.uas.platform.b2b.erp.model.PurchaseNotify;
 import com.uas.platform.b2b.event.PurchaseNoticeSaveEvent;
 import com.uas.platform.b2b.event.SaleSendSaveEvent;
@@ -32,6 +33,7 @@ import com.uas.platform.b2b.model.PurchaseOrder;
 import com.uas.platform.b2b.model.SaleSend;
 import com.uas.platform.b2b.model.SaleSendAll;
 import com.uas.platform.b2b.model.SaleSendItem;
+import com.uas.platform.b2b.model.SaleSendItemVerify;
 import com.uas.platform.b2b.service.PurchaseNoticeService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.XingePusher;
@@ -61,6 +63,9 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 	
 	@Autowired
 	private SaleSendIndexDao saleSendIndexDao;
+	
+	@Autowired
+	private SaleSendItemVerifyDao saleSendItemVerifyDao;
 
 	@Override
 	public void save(List<PurchaseNotice> notices) {
@@ -341,16 +346,20 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 
 	@Override
 	@Transactional
-	public void onVerify(List<SaleSendItem> saleSendItems) {
-		for (SaleSendItem item : saleSendItems) {
-			saleSendItemDao.updateByVerify(item.getId(), item.getVerifyQty());
+	public void onVerify(List<SaleSendItemVerify> verifies) {
+		saleSendItemVerifyDao.save(verifies);
+		for (SaleSendItemVerify verify : verifies) {
+			saleSendItemDao.updateByVerify(verify.getSendItemId());
 		}
 	}
 
 	@Override
 	@Transactional
-	public void unVerify(List<SaleSendItem> saleSendItems) {
-		saleSendItemDao.save(saleSendItems);
+	public void unVerify(List<SaleSendItemVerify> verifies) {
+		saleSendItemVerifyDao.delete(verifies);
+		for (SaleSendItemVerify verify : verifies) {
+			saleSendItemDao.updateByVerify(verify.getSendItemId());
+		}
 	}
 
 }