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

src/main/java/com/uas/platform/b2b/dao/SaleSendItemDao.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
@@ -32,4 +33,11 @@ public interface SaleSendItemDao extends JpaSpecificationExecutor<SaleSendItem>,
 	@Query("select s from SaleSendItem s where s.send.id = :sendId and s.number = :number")
 	List<SaleSendItem> findBySendAndNumber(@Param("sendId") long sendId, @Param("number") short number);
 
+	/**
+	 * 按客户回复更新送货单明细数量
+	 */
+	@Modifying(clearAutomatically = true)
+	@Query("update SaleSendItem s set s.qty = :qty,s.replyRemark = :remark where s.id= :id")
+	public void updateByReply(@Param("id") long id, @Param("qty") double qty, @Param("remark") String remark);
+
 }

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

@@ -237,10 +237,12 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 			notice.setEndQty(endQty);
 			notice.setStatus((short) (endQty == notice.getQty() ? Status.REPLIED.value() : Status.NOT_REPLY.value()));
 			purchaseNoticeDao.save(notice);
-			XingePusher.pushSingleAccountAndroid(send.getCustUserUU().toString(), "供应商发货了", "供应商："
-					+ SystemSession.getUser().getEnterprise().getEnName(), null);
-			XingePusher.pushSingleAccountIOS(send.getCustUserUU().toString(), "供应商发货了" + "  供应商："
-					+ SystemSession.getUser().getEnterprise().getEnName());
+			if (send.getCustUserUU() != null) {
+				XingePusher.pushSingleAccountAndroid(send.getCustUserUU().toString(), "供应商发货了", "供应商："
+						+ SystemSession.getUser().getEnterprise().getEnName(), null);
+				XingePusher.pushSingleAccountIOS(send.getCustUserUU().toString(), "供应商发货了" + "  供应商："
+						+ SystemSession.getUser().getEnterprise().getEnName());
+			}
 		} else {
 			throw new IllegalOperatorException("请对有效的送货提醒发货！");
 		}
@@ -316,7 +318,7 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 	@Override
 	public void onSaleSendChange(List<SaleSendItem> sendItems) {
 		for (SaleSendItem item : sendItems) {
-			saleSendItemDao.save(item);
+			saleSendItemDao.updateByReply(item.getId(), item.getQty(), item.getReplyRemark());
 			if (item.getNoticeId() != null)
 				purchaseNoticeDao.updateBySend(item.getNoticeId());
 		}