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

src/main/java/com/uas/platform/b2b/controller/SaleNoticeController.java

@@ -0,0 +1,16 @@
+package com.uas.platform.b2b.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 卖家对送货提醒的操作
+ * 
+ * @author yingp
+ * 
+ */
+@Controller
+@RequestMapping("/sale/notice")
+public class SaleNoticeController {
+
+}

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

@@ -22,6 +22,16 @@ public interface PurchaseInquiryItemDao extends JpaSpecificationExecutor<Purchas
 	 */
 	List<PurchaseInquiryItem> findByVendUUAndSendStatus(long vendUU, short sendStatus);
 
+	/**
+	 * 按买家企业ID和明细传报价状态查找询价明细
+	 * 
+	 * @param enUU
+	 * @param backStatus
+	 * @return
+	 */
+	@Query("from PurchaseInquiryItem d where d.inquiry.enUU = :enUU and d.backStatus = :backStatus")
+	List<PurchaseInquiryItem> findByEnUUAndBackStatus(@Param("enUU") long enUU, @Param("backStatus") short backStatus);
+
 	/**
 	 * 按买家企业ID、单号和序号查找询价单明细
 	 * 
@@ -32,7 +42,7 @@ public interface PurchaseInquiryItemDao extends JpaSpecificationExecutor<Purchas
 	 */
 	@Query("from PurchaseInquiryItem d where d.inquiry.enUU = :enUU and d.inquiry.code = :code and d.number = :number")
 	List<PurchaseInquiryItem> findByEnUUAndCodeAndNumber(@Param("enUU") long enUU, @Param("code") String code, @Param("number") short number);
-	
+
 	/**
 	 * 按卖家企业ID和询价明细的报价信息传到卖家ERP的状态查找询价明细
 	 * 
@@ -41,7 +51,7 @@ public interface PurchaseInquiryItemDao extends JpaSpecificationExecutor<Purchas
 	 * @return
 	 */
 	List<PurchaseInquiryItem> findByVendUUAndReplySendStatus(long vendUU, short replySendStatus);
-	
+
 	/**
 	 * 按卖家企业ID和询价明细的报价信息的采纳结果传到卖家ERP的状态查找询价明细
 	 * 

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

@@ -1,11 +1,7 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import com.uas.platform.b2b.model.PurchaseInquiryReply;
@@ -13,23 +9,4 @@ import com.uas.platform.b2b.model.PurchaseInquiryReply;
 @Repository
 public interface PurchaseInquiryReplyDao extends JpaSpecificationExecutor<PurchaseInquiryReply>, JpaRepository<PurchaseInquiryReply, Long> {
 
-	/**
-	 * 按询价方企业ID和询价明细状态查找关联的报价信息
-	 * 
-	 * @param enUU
-	 * @param status
-	 * @return
-	 */
-	@Query("from PurchaseInquiryReply r where r.inquiryItem.inquiry.enUU = :enUU and r.inquiryItem.status = :status")
-	List<PurchaseInquiryReply> findByEnUUAndItemStatus(@Param("enUU") long enUU, @Param("status") short status);
-
-	/**
-	 * 按询价明细ID查找分段报价信息
-	 * 
-	 * @param itemId
-	 * @return
-	 */
-	@Query("from PurchaseInquiryReply r where r.inquiryItem.id = :itemId")
-	List<PurchaseInquiryReply> findByItemId(@Param("itemId") long itemId);
-
 }

src/main/java/com/uas/platform/b2b/erp/controller/InquiryController.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.uas.platform.b2b.erp.model.Inquiry;
 import com.uas.platform.b2b.erp.model.InquiryDecide;
-import com.uas.platform.b2b.erp.model.InquiryDetailDet;
+import com.uas.platform.b2b.erp.model.InquiryDetail;
 import com.uas.platform.b2b.erp.service.InquiryService;
 import com.uas.platform.b2b.service.PurchaseInquiryService;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
@@ -57,7 +57,7 @@ public class InquiryController {
 	 */
 	@RequestMapping(value = "/reply", method = RequestMethod.GET)
 	@ResponseBody
-	public List<InquiryDetailDet> getReply() {
+	public List<InquiryDetail> getReply() {
 		return inquiryService.convertPurchaseInquiryReply(purchaseInquiryService.findNotUploadReply());
 	}
 

src/main/java/com/uas/platform/b2b/erp/controller/SaleNotifyDownController.java

@@ -1,7 +1,21 @@
 package com.uas.platform.b2b.erp.controller;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.uas.platform.b2b.erp.model.SaleNotifyDown;
+import com.uas.platform.b2b.erp.model.SaleOut;
+import com.uas.platform.b2b.erp.service.SaleNotifyDownService;
+import com.uas.platform.b2b.service.PurchaseNoticeService;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
 /**
  * 对卖家ERP的数据接口<br>
@@ -14,6 +28,71 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @RequestMapping("/erp/sale/notice")
 public class SaleNotifyDownController {
 
-	
-	
+	@Autowired
+	private SaleNotifyDownService saleNotifyDownService;
+
+	@Autowired
+	private PurchaseNoticeService purchaseNoticeService;
+
+	/**
+	 * 卖家ERP从平台获取客户送货提醒
+	 * 
+	 * @return
+	 */
+	@RequestMapping(method = RequestMethod.GET)
+	@ResponseBody
+	public List<SaleNotifyDown> getNotices() {
+		return saleNotifyDownService.convertPurchaseNotice(purchaseNoticeService.findNotUploadNotice());
+	}
+
+	/**
+	 * 平台的送货提醒传到供应商ERP之后，修改平台里面的送货提醒的上传状态
+	 * 
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(method = RequestMethod.POST)
+	@ResponseBody
+	public void onSaleNotifyDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
+		purchaseNoticeService.onNoticeDownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+	}
+
+	/**
+	 * 将卖家ERP的发货单写到平台
+	 * 
+	 * @param data
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(value = "/send", method = RequestMethod.POST)
+	@ResponseBody
+	public void saveReplies(@RequestParam("data") String data) throws UnsupportedEncodingException {
+		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		List<SaleOut> outs = FlexJsonUtils.fromJsonArray(jsonStr, SaleOut.class);
+		purchaseNoticeService.send(saleNotifyDownService.convertSaleOut(outs));
+	}
+
+	/**
+	 * 卖家ERP从平台获取在平台维护的发货单
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/send", method = RequestMethod.GET)
+	@ResponseBody
+	public List<SaleOut> getSaleOut() {
+		return saleNotifyDownService.convertSaleSend(purchaseNoticeService.findNotSendSend());
+	}
+
+	/**
+	 * 平台的发货单传到供应商ERP之后，修改平台里面的发货单的上传状态
+	 * 
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(value = "/send/back", method = RequestMethod.POST)
+	@ResponseBody
+	public void onReplyDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
+		purchaseNoticeService.onSendDownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+	}
+
 }

src/main/java/com/uas/platform/b2b/erp/model/InquiryDetail.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.erp.model;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -21,6 +22,7 @@ import com.uas.platform.core.model.Status;
  */
 public class InquiryDetail {
 
+	private Long b2b_id_id;
 	private short id_detno;
 	private String id_prodcode;
 	private String id_currency;
@@ -38,6 +40,14 @@ public class InquiryDetail {
 	private Double id_minqty;
 	private List<InquiryDetailDet> dets;
 
+	public Long getB2b_id_id() {
+		return b2b_id_id;
+	}
+
+	public void setB2b_id_id(Long b2b_id_id) {
+		this.b2b_id_id = b2b_id_id;
+	}
+
 	public short getId_detno() {
 		return id_detno;
 	}
@@ -185,7 +195,7 @@ public class InquiryDetail {
 		inquiryItem.setProduct(product);
 		inquiryItem.setSourceId(this.id_id);
 		inquiryItem.setStatus((short) Status.NOT_REPLY.value());
-		inquiryItem.setSendStatus((short)Status.NOT_UPLOAD.value());
+		inquiryItem.setSendStatus((short) Status.NOT_UPLOAD.value());
 		if (!CollectionUtils.isEmpty(this.dets)) {
 			Set<PurchaseInquiryReply> replies = new HashSet<PurchaseInquiryReply>();
 			for (InquiryDetailDet det : this.dets) {
@@ -196,4 +206,24 @@ public class InquiryDetail {
 		return inquiryItem;
 	}
 
+	public InquiryDetail() {
+
+	}
+
+	public InquiryDetail(PurchaseInquiryItem item) {
+		this.b2b_id_id = item.getId();
+		this.id_minbuyqty = item.getMinOrderQty();
+		this.id_minqty = item.getMinPackQty();
+		this.id_fromdate = item.getVendFromDate();
+		this.id_todate = item.getVendToDate();
+		this.id_id = item.getSourceId();
+		this.id_detno = item.getNumber();
+		if (!CollectionUtils.isEmpty(item.getReplies())) {
+			dets = new ArrayList<InquiryDetailDet>();
+			for (PurchaseInquiryReply reply : item.getReplies()) {
+				dets.add(new InquiryDetailDet(item, reply));
+			}
+		}
+	}
+
 }

src/main/java/com/uas/platform/b2b/erp/model/InquiryDetailDet.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.erp.model;
 
+import com.uas.platform.b2b.model.PurchaseInquiryItem;
 import com.uas.platform.b2b.model.PurchaseInquiryReply;
 
 /**
@@ -10,27 +11,9 @@ import com.uas.platform.b2b.model.PurchaseInquiryReply;
  */
 public class InquiryDetailDet {
 
-	private Long b2b_id_id;
-	private Long idd_idid;
 	private Double idd_lapqty;
 	private Double idd_price;
 
-	public Long getB2b_id_id() {
-		return b2b_id_id;
-	}
-
-	public void setB2b_id_id(Long b2b_id_id) {
-		this.b2b_id_id = b2b_id_id;
-	}
-
-	public Long getIdd_idid() {
-		return idd_idid;
-	}
-
-	public void setIdd_idid(Long idd_idid) {
-		this.idd_idid = idd_idid;
-	}
-
 	public Double getIdd_lapqty() {
 		return idd_lapqty;
 	}
@@ -67,9 +50,7 @@ public class InquiryDetailDet {
 	 * 
 	 * @param reply
 	 */
-	public InquiryDetailDet(PurchaseInquiryReply reply) {
-		this.b2b_id_id = reply.getInquiryItem().getId();
-		this.idd_idid = reply.getInquiryItem().getSourceId();
+	public InquiryDetailDet(PurchaseInquiryItem item, PurchaseInquiryReply reply) {
 		this.idd_lapqty = reply.getLapQty();
 		this.idd_price = reply.getPrice();
 	}

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

@@ -4,9 +4,8 @@ import java.util.List;
 
 import com.uas.platform.b2b.erp.model.Inquiry;
 import com.uas.platform.b2b.erp.model.InquiryDecide;
-import com.uas.platform.b2b.erp.model.InquiryDetailDet;
+import com.uas.platform.b2b.erp.model.InquiryDetail;
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
-import com.uas.platform.b2b.model.PurchaseInquiryReply;
 
 public interface InquiryService {
 
@@ -16,15 +15,15 @@ public interface InquiryService {
 	 * @param inquiries
 	 * @return
 	 */
-	List<PurchaseInquiryReply> convertInquiry(List<Inquiry> inquiries);
+	List<PurchaseInquiryItem> convertInquiry(List<Inquiry> inquiries);
 
 	/**
 	 * 将平台的报价信息，转为买家ERP的报价信息
 	 * 
-	 * @param inquiryReplies
+	 * @param inquiryItems
 	 * @return
 	 */
-	List<InquiryDetailDet> convertPurchaseInquiryReply(List<PurchaseInquiryReply> inquiryReplies);
+	List<InquiryDetail> convertPurchaseInquiryReply(List<PurchaseInquiryItem> inquiryItems);
 
 	/**
 	 * 将买家ERP对报价信息的采纳结果，转到平台的询价明细里面

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

@@ -24,5 +24,13 @@ public interface SaleNotifyDownService {
 	 * @return
 	 */
 	List<SaleSend> convertSaleOut(List<SaleOut> outs);
+	
+	/**
+	 * 将平台的发货单，转为卖家ERP的发货单
+	 * 
+	 * @param outs
+	 * @return
+	 */
+	List<SaleOut> convertSaleSend(List<SaleSend> sends);
 
 }

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

@@ -12,12 +12,11 @@ import com.uas.platform.b2b.dao.PurchaseInquiryDao;
 import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
 import com.uas.platform.b2b.erp.model.Inquiry;
 import com.uas.platform.b2b.erp.model.InquiryDecide;
-import com.uas.platform.b2b.erp.model.InquiryDetailDet;
+import com.uas.platform.b2b.erp.model.InquiryDetail;
 import com.uas.platform.b2b.erp.service.InquiryService;
 import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.model.PurchaseInquiry;
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
-import com.uas.platform.b2b.model.PurchaseInquiryReply;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Status;
 
@@ -34,8 +33,8 @@ public class InquiryServiceImpl implements InquiryService {
 	private PurchaseInquiryItemDao purchaseInquiryItemDao;
 
 	@Override
-	public List<PurchaseInquiryReply> convertInquiry(List<Inquiry> inquiries) {
-		List<PurchaseInquiryReply> inquiryReplies = new ArrayList<PurchaseInquiryReply>();
+	public List<PurchaseInquiryItem> convertInquiry(List<Inquiry> inquiries) {
+		List<PurchaseInquiryItem> inquiryItems = new ArrayList<PurchaseInquiryItem>();
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
 		for (Inquiry inquiry : inquiries) {
 			// 先查看是否已存在
@@ -52,27 +51,23 @@ public class InquiryServiceImpl implements InquiryService {
 							item.setProduct(products.get(0));
 							item.setProductId(products.get(0).getId());
 						}
-						if (!CollectionUtils.isEmpty(item.getReplies())) {
-							for (PurchaseInquiryReply reply : item.getReplies()) {
-								reply.setInquiryItem(item);
-							}
-							inquiryReplies.addAll(item.getReplies());
-						}
 					}
+					inquiryItems.addAll(purchaseInquiry.getInquiryItems());
 				}
 			}
 		}
-		return inquiryReplies;
+		return inquiryItems;
 	}
 
 	@Override
-	public List<InquiryDetailDet> convertPurchaseInquiryReply(List<PurchaseInquiryReply> inquiryReplies) {
-		List<InquiryDetailDet> dets = new ArrayList<InquiryDetailDet>();
-		if (!CollectionUtils.isEmpty(inquiryReplies)) {
-			for (PurchaseInquiryReply reply : inquiryReplies)
-				dets.add(new InquiryDetailDet(reply));
+	public List<InquiryDetail> convertPurchaseInquiryReply(List<PurchaseInquiryItem> inquiryItems) {
+		List<InquiryDetail> details = new ArrayList<InquiryDetail>();
+		if (!CollectionUtils.isEmpty(inquiryItems)) {
+			for (PurchaseInquiryItem item : inquiryItems) {
+				details.add(new InquiryDetail(item));
+			}
 		}
-		return dets;
+		return details;
 	}
 
 	@Override

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

@@ -25,4 +25,10 @@ public class SaleNotifyDownServiceImpl implements SaleNotifyDownService{
 		return null;
 	}
 
+	@Override
+	public List<SaleOut> convertSaleSend(List<SaleSend> sends) {
+		// TODO
+		return null;
+	}
+
 }

src/main/java/com/uas/platform/b2b/model/PurchaseInquiryItem.java

@@ -134,8 +134,9 @@ public class PurchaseInquiryItem {
 	/**
 	 * 分段报价明细
 	 */
-	@OneToMany(mappedBy = "inquiryItem", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch = FetchType.EAGER)
-	@OrderBy("price")
+	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+	@JoinColumn(name = "ir_idid")
+	@OrderBy("lapQty")
 	private Set<PurchaseInquiryReply> replies;
 
 	/**

src/main/java/com/uas/platform/b2b/model/PurchaseInquiryReply.java

@@ -2,19 +2,14 @@ package com.uas.platform.b2b.model;
 
 import java.io.Serializable;
 
-import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
-
 /**
  * 采购询价单明细的报价记录
  * 
@@ -36,13 +31,6 @@ public class PurchaseInquiryReply implements Serializable {
 	@Column(name = "ir_id")
 	private Long id;
 
-	/**
-	 * 采购询价单明细
-	 */
-	@ManyToOne(cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.MERGE }, optional = true)
-	@JoinColumn(name = "ir_idid", nullable = true)
-	private PurchaseInquiryItem inquiryItem;
-
 	/**
 	 * （买家或卖家定义的）分段数量
 	 */
@@ -63,15 +51,6 @@ public class PurchaseInquiryReply implements Serializable {
 		this.id = id;
 	}
 
-	@JsonIgnore
-	public PurchaseInquiryItem getInquiryItem() {
-		return inquiryItem;
-	}
-
-	public void setInquiryItem(PurchaseInquiryItem inquiryItem) {
-		this.inquiryItem = inquiryItem;
-	}
-
 	public Double getLapQty() {
 		return lapQty;
 	}

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

@@ -7,7 +7,6 @@ import org.springframework.data.domain.Page;
 import com.uas.platform.b2b.erp.model.QuotationDown;
 import com.uas.platform.b2b.model.PurchaseInquiry;
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
-import com.uas.platform.b2b.model.PurchaseInquiryReply;
 import com.uas.platform.core.model.PageInfo;
 
 public interface PurchaseInquiryService {
@@ -15,11 +14,11 @@ public interface PurchaseInquiryService {
 	/**
 	 * 批量保存、修改采购询价
 	 * 
-	 * @param inquiryReplies
-	 *            询价明细分段报价明细
+	 * @param inquiryItems
+	 *            询价明细
 	 * @return
 	 */
-	public void save(List<PurchaseInquiryReply> inquiryReplies);
+	public void save(List<PurchaseInquiryItem> inquiryItems);
 
 	/**
 	 * 分页查找询价单
@@ -28,7 +27,7 @@ public interface PurchaseInquiryService {
 	 * @return
 	 */
 	public Page<PurchaseInquiryItem> findAllByPageInfo(PageInfo pageInfo);
-	
+
 	/**
 	 * 用询价单ID查找询价单
 	 * 
@@ -36,7 +35,7 @@ public interface PurchaseInquiryService {
 	 * @return
 	 */
 	public PurchaseInquiry findById(Long id);
-	
+
 	/**
 	 * 用询价单明细ID查找询价单明细
 	 * 
@@ -50,7 +49,7 @@ public interface PurchaseInquiryService {
 	 * 
 	 * @return
 	 */
-	List<PurchaseInquiryReply> findNotUploadReply();
+	List<PurchaseInquiryItem> findNotUploadReply();
 
 	/**
 	 * 报价信息成功传到买家ERP之后

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

@@ -1,12 +0,0 @@
-package com.uas.platform.b2b.service;
-
-import org.springframework.data.domain.Page;
-
-import com.uas.platform.b2b.model.SaleOrder;
-import com.uas.platform.core.model.PageInfo;
-
-public interface SaleOrderService {
-
-	public Page<SaleOrder> findAllByPageInfo(PageInfo pageInfo);
-
-}

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

@@ -9,11 +9,11 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import com.uas.platform.b2b.dao.PurchaseInquiryDao;
 import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
@@ -42,30 +42,25 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 	private PurchaseInquiryDao purchaseInquiryDao;
 
 	@Override
-	public void save(List<PurchaseInquiryReply> inquiryReplies) {
-		purchaseInquiryReplyDao.save(inquiryReplies);
+	public void save(List<PurchaseInquiryItem> inquiryItems) {
+		purchaseInquiryItemDao.save(inquiryItems);
 		// 将询价信息推送通知供应商联系人UU号
-		Set<Long> itemId = new HashSet<Long>();
-		for (PurchaseInquiryReply reply : inquiryReplies) {
-			if (!itemId.contains(reply.getInquiryItem().getId())) {
-				PurchaseInquiryItem inquiryItem = reply.getInquiryItem();
-				PurchaseInquiry inquiry = inquiryItem.getInquiry();
-				if (inquiryItem.getVendUserUU() != null) {
-					// Android
-					XingePusher.pushSingleAccountAndroid(inquiryItem.getVendUserUU().toString(), "新增一条客户询价-", "单号:" + inquiry.getCode()
-							+ ",客户:" + inquiry.getEnterprise().getEnName(), "com.sas.mobile.activity.PurchaseChangeActivity");
-					// IOS
-					XingePusher.pushSingleAccountIOS(inquiryItem.getVendUserUU().toString(), "新增一条客户询价-" + "单号:" + inquiry.getCode()
-							+ ",客户:" + inquiry.getEnterprise().getEnName());
-				}
-				itemId.add(inquiryItem.getId());
+		for (PurchaseInquiryItem item : inquiryItems) {
+			PurchaseInquiry inquiry = item.getInquiry();
+			if (item.getVendUserUU() != null) {
+				// Android
+				XingePusher.pushSingleAccountAndroid(item.getVendUserUU().toString(), "新增一条客户询价-", "单号:" + inquiry.getCode() + ",客户:"
+						+ inquiry.getEnterprise().getEnName(), "com.sas.mobile.activity.PurchaseChangeActivity");
+				// IOS
+				XingePusher.pushSingleAccountIOS(item.getVendUserUU().toString(), "新增一条客户询价-" + "单号:" + inquiry.getCode() + ",客户:"
+						+ inquiry.getEnterprise().getEnName());
 			}
 		}
 	}
 
 	@Override
-	public List<PurchaseInquiryReply> findNotUploadReply() {
-		return purchaseInquiryReplyDao.findByEnUUAndItemStatus(SystemSession.getUser().getEnterprise().getUu(),
+	public List<PurchaseInquiryItem> findNotUploadReply() {
+		return purchaseInquiryItemDao.findByEnUUAndBackStatus(SystemSession.getUser().getEnterprise().getUu(),
 				(short) Status.NOT_UPLOAD.value());
 	}
 
@@ -74,7 +69,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		for (String id : idArray) {
 			PurchaseInquiryItem item = purchaseInquiryItemDao.findOne(Long.parseLong(id));
 			if (item != null) {
-				item.setStatus((short) Status.DOWNLOADED.value());
+				item.setBackStatus((short) Status.DOWNLOADED.value());
 				purchaseInquiryItemDao.save(item);
 			}
 		}
@@ -113,17 +108,16 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 				item.setVendToDate(down.getQu_todate());
 				item.setBackStatus((short) Status.NOT_UPLOAD.value());
 				item.setReplySendStatus((short) Status.DOWNLOADED.value());
+				item.setRemark(String.valueOf(System.currentTimeMillis()));
 				if (!CollectionUtils.isEmpty(down.getDetails())) {
 					purchaseInquiryReplyDao.delete(item.getReplies());
 					Set<PurchaseInquiryReply> replies = new HashSet<PurchaseInquiryReply>();
 					for (QuotationDownDetail detail : down.getDetails()) {
-						PurchaseInquiryReply reply = detail.convert();
-						reply.setInquiryItem(item);
 						replies.add(detail.convert());
 					}
 					item.setReplies(replies);
-					purchaseInquiryItemDao.save(item);
 				}
+				purchaseInquiryItemDao.save(item);
 			}
 		}
 	}

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

@@ -1,33 +0,0 @@
-package com.uas.platform.b2b.service.impl;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-
-import com.uas.platform.b2b.dao.SaleOrderDao;
-import com.uas.platform.b2b.model.SaleOrder;
-import com.uas.platform.b2b.service.SaleOrderService;
-import com.uas.platform.core.model.PageInfo;
-
-@Service
-public class SaleOrderServiceImpl implements SaleOrderService{
-
-	@Autowired
-	private SaleOrderDao saleOrderDao;
-	
-	public Page<SaleOrder> findAllByPageInfo(PageInfo pageInfo) {
-		return saleOrderDao.findAll(new Specification<SaleOrder>() {
-
-			public Predicate toPredicate(Root<SaleOrder> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-				return null;
-			}
-		}, pageInfo);
-	}
-
-}