Merge remote-tracking branch 'origin/hotfix-201807-suntg' into hotfix-201807-suntg

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

@@ -88,14 +88,6 @@ public class PurchaseReturnItem {
 	@Column(name = "pri_whname")
 	private String whname;
 
-	public String getProdCode() {
-		return prodCode;
-	}
-
-	public void setProdCode(String prodCode) {
-		this.prodCode = prodCode;
-	}
-
 	/**
 	 * 备注
 	 */

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

@@ -304,19 +304,4 @@ public interface PurchaseInquiryService {
     void coverInquiryItemProdToUser(Long enUU) throws Exception;
 
     void saveList(List<PurchaseInquiryItemTemp> purchaseInquiryItemTemps);
-
-	/**
-	 * 查找所有待上传到卖家ERP的报价信息的作废决定
-	 *
-	 * @param prid 供应商物料id
-	 * @return
-	 */
-	List<PurchaseInquiryItem> findNotUploadInquiryReplyInvalid();
-
-    /**
-     * B2B回复报价
-     *
-     * @param inquiryItem
-     */
-    public PurchaseInquiryItem reply(PurchaseInquiryItem inquiryItem);
 }

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

@@ -294,8 +294,6 @@ public interface PurchaseNoticeService {
 
     List<SaleSend> findNotUploadSendEDI(Long enUU);
 
-	void send(List<SaleSendItem> sendItems);
-
 	void setReadByOrder(String category, Long[] sourceId);
 
     Map<String, Integer> getNoticeCount(String category);

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

@@ -470,12 +470,6 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		}
 	}
 
-	@Override
-	public List<PurchaseInquiryItem> findNotUploadInquiryReplyInvalid() {
-		return purchaseInquiryItemDao.findByVendUUAndInvalidStatus(SystemSession.getUser().getEnterprise().getUu(),
-				(short) Status.NOT_UPLOAD.value());
-	}
-
     @Override
     public ModelMap addAttaches(PurchaseInquiryItem inquiryItem, String method, FileUpload uploadItem) throws Exception {
 		ModelMap map = new ModelMap();
@@ -996,15 +990,4 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		inquiry.setInquiryItems(items);
 		return inquiry;
 	}
-
-    /**
-     * 根据询价单明细id返回询价单明细
-     *
-     * @param itemId 询价单明细id
-     * @return
-     */
-    @Override
-    public PurchaseInquiryItem getInquiryItemByItemId(Long itemId) {
-        return purchaseInquiryItemDao.findOne(itemId);
-    }
 }