修改平台询价录入时的上传状态，轮询应用来源

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

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

@@ -41,7 +41,7 @@ public interface PurchaseInquiryItemDao
 	 * @param backStatus
 	 * @return
 	 */
-	@Query("from PurchaseInquiryItem d where d.inquiry.enUU = :enUU and d.backStatus = :backStatus and d.sourceApp is null")
+	@Query("from PurchaseInquiryItem d where d.inquiry.enUU = :enUU and d.backStatus = :backStatus")
 	List<PurchaseInquiryItem> findByEnUUAndBackStatus(@Param("enUU") long enUU, @Param("backStatus") short backStatus);
 
 	/**

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

@@ -46,6 +46,7 @@ public class InquiryDetail {
 	private Long id_leadtime;//供应商交互周期
 	private List<InquiryDetailDet> dets;
 	private Long ve_buyeruu;
+	private String sourceApp;
 
 	public Long getB2b_id_id() {
 		return b2b_id_id;
@@ -215,6 +216,14 @@ public class InquiryDetail {
 		this.id_leadtime = id_leadtime;
 	}
 
+	public String getSourceApp() {
+		return sourceApp;
+	}
+
+	public void setSourceApp(String sourceApp) {
+		this.sourceApp = sourceApp;
+	}
+
 	/**
 	 * 转为平台的采购询价明细
 	 * 
@@ -264,6 +273,7 @@ public class InquiryDetail {
 		this.id_brand = item.getBrand();
 		this.id_vendorprodcode = item.getVendorprodcode();
 		this.id_leadtime = item.getLeadtime();
+		this.sourceApp = item.getSourceApp();
 		if (!CollectionUtils.isEmpty(item.getReplies())) {
 			dets = new ArrayList<InquiryDetailDet>();
 			for (PurchaseInquiryReply reply : item.getReplies()) {

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

@@ -228,7 +228,7 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 							saleItem.setToDate(item.getToDate());
 							saleItem.setFromDate(new Date());
 							saleItem.setStatus((short) Status.NOT_REPLY.value());
-							saleItem.setSendStatus((short) Status.REPLIED.value());
+							saleItem.setSendStatus((short) Status.NOT_UPLOAD.value());
 							saleItem.setCustLap((short) 0);
 							saleItem.setSourceApp(SOURCERAPP);
 							saleItem.setSourceId(item.getId());
@@ -294,7 +294,7 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 				saleItem.setTaxrate(item.getTaxrate());
 				saleItem.setToDate(item.getToDate());
 				saleItem.setStatus((short) Status.NOT_REPLY.value());
-				saleItem.setSendStatus((short) Status.REPLIED.value());
+				saleItem.setSendStatus((short) Status.NOT_UPLOAD.value());
 				saleItem.setSourceApp(SOURCERAPP);
 				saleItem.setSourceId(item.getId());
 				Set<PurchaseInquiryReply> replies = new HashSet<PurchaseInquiryReply>();
@@ -538,7 +538,7 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 				item.setVendUserUU(SystemSession.getUser().getUserUU());
 				item.setSourceApp(SOURCERAPP);
 				item.setCustLap(Constant.NO);
-				item.setSendStatus((short) Status.DOWNLOADED.value());
+				item.setSendStatus((short) Status.NOT_UPLOAD.value());
 				item.setSourceId(id);
 				Set<PurchaseInquiryReply> replies = new HashSet<PurchaseInquiryReply>();
 				PurchaseInquiryReply reply = new PurchaseInquiryReply();
@@ -579,7 +579,7 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 						item.setSourceApp(SOURCERAPP);
 						item.setStatus((short) Status.NOT_REPLY.value());
 						item.setCustLap(Constant.NO);
-						item.setSendStatus((short) Status.DOWNLOADED.value());
+						item.setSendStatus((short) Status.NOT_UPLOAD.value());
 						item.setSourceId(id);
 						Set<PurchaseInquiryReply> replies = new HashSet<PurchaseInquiryReply>();
 						List<PurchaseInquiryReply> purcReplies = new ArrayList<PurchaseInquiryReply>();