Erp用到的接口分到单独Controller。实体部分注释修改。

src/main/java/com/uas/ps/inquiry/controller/ErpDownloadController.java

@@ -2,16 +2,17 @@ package com.uas.ps.inquiry.controller;
 
 import com.uas.ps.core.logging.BufferedLoggerManager;
 import com.uas.ps.httplog.annotation.HttpLog;
-import com.uas.ps.inquiry.entity.Constant;
-import com.uas.ps.inquiry.entity.InquirySource;
+import com.uas.ps.inquiry.entity.*;
 import com.uas.ps.inquiry.model.PublicInquiryItem;
 import com.uas.ps.inquiry.service.AttachService;
 import com.uas.ps.inquiry.service.InquiryForSaleService;
 import com.uas.ps.inquiry.service.PublicInquiryService;
 import com.uas.ps.inquiry.support.InquiryBufferedLogger;
+import javassist.NotFoundException;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -46,6 +47,120 @@ public class ErpDownloadController {
 
     private final static Logger log = Logger.getLogger(Logger.class);
 
+    /**
+     * 将买家ERP的公共询价写到公共询价服务中心
+     *
+     * @param inquiries    公共询价信息
+     * @param enuu    询价企业UU
+     * @param address 询价企业地址信息
+     * @return
+     * @throws UnsupportedEncodingException
+     */
+    @HttpLog
+    @RequestMapping(method = RequestMethod.POST)
+    public void saveInquiries(@RequestBody List<BatchInquiry> inquiries, Long enuu, String address) throws NotFoundException, UnsupportedEncodingException {
+        long start = System.currentTimeMillis();
+        publicInquiryService.save(inquiries, enuu, URLDecoder.decode(address, "UTF-8"));
+        log.info("/inquiry/public post 耗时:" + (System.currentTimeMillis() - start));
+        logger.log("公共询价", "ERP上传公共询价", "size: " + inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name());
+    }
+
+    /**
+     * erp的公共询价单提交待审核时，更新公共询价服务中心的单据设置为不能报价
+     *
+     * @param inquiries 封装的数据信息
+     * @param enuu 询价企业UU
+     * @throws UnsupportedEncodingException
+     */
+    @HttpLog
+    @RequestMapping(value = "/check", method = RequestMethod.POST)
+    public void updateInquiryStatus(@RequestBody List<BatchInquiry> inquiries, Long enuu) throws UnsupportedEncodingException {
+        long start = System.currentTimeMillis();
+        publicInquiryService.updateStatus(inquiries, enuu);
+        log.info("/inquiry/public/check post 耗时:" + (System.currentTimeMillis() - start));
+        logger.log("公共询价", "ERP设置公共询价不能报价", "size: " + inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name());
+    }
+
+    /**
+     * （针对客户）获取公共询价服务中心供应商的报价信息
+     *
+     * @param enuu 询价企业UU
+     * @author hejq
+     * @date 2018-01-14 15:20
+     */
+    @HttpLog
+    @RequestMapping(value = "/quotation", method = RequestMethod.GET)
+    public List<InquiryDetail> getReply(Long enuu) {
+        long start = System.currentTimeMillis();
+        List<InquiryDetail> details = publicInquiryService.findNotUploadReply(enuu);
+        log.info("/inquiry/public/quotation 耗时:" + (System.currentTimeMillis() - start));
+        logger.log("公共询价", "ERP获取供应商报价信息", "size: " + details.size(), Constant.UU, enuu, InquirySource.ERP.name());
+        return details;
+    }
+
+    /**
+     * 公共询价服务中心的报价信息传到买家ERP之后，修改公共询价服务中心里面的询价单明细的上传状态
+     *
+     * @param data 传回的id串
+     * @return
+     * @throws UnsupportedEncodingException
+     */
+    @HttpLog
+    @RequestMapping(value = "/reply/back", method = RequestMethod.POST)
+    public void onReplySuccess(@RequestBody String data, Long enuu) throws UnsupportedEncodingException {
+        long start = System.currentTimeMillis();
+        String[] idArray = URLDecoder.decode(data, "UTF-8").split(",");
+        logger.log("公共询价", "ERP获取报价信息返回id", "id: " + idArray, Constant.UU, enuu, InquirySource.ERP.name());
+        publicInquiryService.onReplyUploadSuccess(idArray);
+        log.info("/inquiry/public/reply/back post 耗时:" + (System.currentTimeMillis() - start));
+    }
+
+    /**
+     * 买家在收到报价信息后，点击提交按钮后，状态传至公共询价服务中心，至此公共询价服务中心的供应商不能再对这张询价单进行报价
+     *
+     * @param details 封装的data信息
+     * @throws UnsupportedEncodingException
+     */
+    @HttpLog
+    @RequestMapping(value = "/checking", method = RequestMethod.POST)
+    public void checkInquiry(@RequestBody List<InquiryDetail> details , Long enuu) throws UnsupportedEncodingException {
+        long start = System.currentTimeMillis();
+        logger.log("公共询价", "ERP提交报价信息应用禁止报价", "size: " + details.size(), Constant.UU, enuu, InquirySource.ERP.name());
+        publicInquiryService.updateInquiryStatus(details, enuu);
+        log.info("/inquiry/public/checking post 耗时:" + (System.currentTimeMillis() - start));
+    }
+
+    /**
+     * 买家ERP（不）采纳了价格之后，修改公共询价服务中心里面的报价信息的状态
+     *
+     * @return 封装的data信息
+     * @throws UnsupportedEncodingException
+     */
+    @HttpLog
+    @RequestMapping(value = "/reply/decide", method = RequestMethod.POST)
+    public void onReplyDecide(@RequestBody List<InquiryDecide> decides, Long enuu) throws UnsupportedEncodingException {
+        long start = System.currentTimeMillis();
+        logger.log("公共询价", "ERP针对供应报价信息进行（不）采纳操作", "size: " + decides.size(), Constant.UU, enuu, InquirySource.ERP.name());
+        publicInquiryService.onReplyDecide(decides, enuu);
+        log.info("/inquiry/public/reply/decide post 耗时:" + (System.currentTimeMillis() - start));
+    }
+
+    /**
+     * 买家ERP作废询价单后，修改公共询价服务中心里面的状态
+     *
+     * @param inquiries 封装的询价信息
+     * @return
+     * @throws UnsupportedEncodingException
+     */
+    @HttpLog
+    @RequestMapping(value = "/invalid", method = RequestMethod.POST)
+    public void onReplyInvalid(@RequestBody List<Inquiry> inquiries, Long enuu) throws UnsupportedEncodingException {
+        long start = System.currentTimeMillis();
+        logger.log("公共询价", "ERP作废公共询价单返回数据到公共服务", "size: " + inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name());
+        publicInquiryService.onReplyInvalid(inquiries, enuu);
+        log.info("/inquiry/public/invalid post 耗时:" + (System.currentTimeMillis() - start));
+    }
+
     /**
      * 买家采纳或拒绝之后，上传到报价方UAS
      *
@@ -95,7 +210,7 @@ public class ErpDownloadController {
      */
     @HttpLog
     @RequestMapping(value = "/down/reply", method = RequestMethod.GET)
-    public List<PublicInquiryItem> getReply(Long enUU) {
+    public List<PublicInquiryItem> downReply(Long enUU) {
         long start = System.currentTimeMillis();
         List<PublicInquiryItem> details = publicInquiryService.findNotUploadToUas(enUU);
         log.info("/inquiry/public/quotation 耗时:" + (System.currentTimeMillis() - start));
@@ -113,7 +228,7 @@ public class ErpDownloadController {
      */
     @HttpLog
     @RequestMapping(value = "/down/reply/back", method = RequestMethod.POST)
-    public void onReplySuccess(String ids, Long enUU) throws UnsupportedEncodingException {
+    public void onReplyDownSuccess(String ids, Long enUU) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
         String[] idArray = URLDecoder.decode(ids, "UTF-8").split(",");
         logger.log("公共询价", "将报价方在商城报价的单据同步到报价方UAS 之后 回调 修改状态", "id: " + idArray, Constant.UU, enUU, InquirySource.ERP.name());

src/main/java/com/uas/ps/inquiry/controller/PublicInquiryController.java

@@ -4,11 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.ps.core.logging.BufferedLoggerManager;
 import com.uas.ps.httplog.annotation.HttpLog;
 import com.uas.ps.inquiry.domain.IPage;
-import com.uas.ps.inquiry.entity.BatchInquiry;
 import com.uas.ps.inquiry.entity.Constant;
-import com.uas.ps.inquiry.entity.Inquiry;
-import com.uas.ps.inquiry.entity.InquiryDecide;
-import com.uas.ps.inquiry.entity.InquiryDetail;
 import com.uas.ps.inquiry.entity.InquiryMessage;
 import com.uas.ps.inquiry.entity.InquirySource;
 import com.uas.ps.inquiry.entity.OrderStatus;
@@ -22,20 +18,16 @@ import com.uas.ps.inquiry.service.AttachService;
 import com.uas.ps.inquiry.service.InquiryForSaleService;
 import com.uas.ps.inquiry.service.PublicInquiryService;
 import com.uas.ps.inquiry.support.InquiryBufferedLogger;
-import javassist.NotFoundException;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import java.rmi.AccessException;
 import java.util.List;
 import java.util.Map;
@@ -63,120 +55,6 @@ public class PublicInquiryController {
 
     private final static Logger log = Logger.getLogger(Logger.class);
 
-    /**
-     * 将买家ERP的公共询价写到公共询价服务中心
-     *
-     * @param inquiries    公共询价信息
-     * @param enuu    询价企业UU
-     * @param address 询价企业地址信息
-     * @return
-     * @throws UnsupportedEncodingException
-     */
-    @HttpLog
-    @RequestMapping(method = RequestMethod.POST)
-    public void saveInquiries(@RequestBody List<BatchInquiry> inquiries, Long enuu, String address) throws NotFoundException, UnsupportedEncodingException {
-        long start = System.currentTimeMillis();
-        publicInquiryService.save(inquiries, enuu, URLDecoder.decode(address, "UTF-8"));
-        log.info("/inquiry/public post 耗时:" + (System.currentTimeMillis() - start));
-        logger.log("公共询价", "ERP上传公共询价", "size: " + inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name());
-    }
-
-    /**
-     * erp的公共询价单提交待审核时，更新公共询价服务中心的单据设置为不能报价
-     *
-     * @param inquiries 封装的数据信息
-     * @param enuu 询价企业UU
-     * @throws UnsupportedEncodingException
-     */
-    @HttpLog
-    @RequestMapping(value = "/check", method = RequestMethod.POST)
-    public void updateInquiryStatus(@RequestBody List<BatchInquiry> inquiries, Long enuu) throws UnsupportedEncodingException {
-        long start = System.currentTimeMillis();
-        publicInquiryService.updateStatus(inquiries, enuu);
-        log.info("/inquiry/public/check post 耗时:" + (System.currentTimeMillis() - start));
-        logger.log("公共询价", "ERP设置公共询价不能报价", "size: " + inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name());
-    }
-
-    /**
-     * （针对客户）获取公共询价服务中心供应商的报价信息
-     *
-     * @param enuu 询价企业UU
-     * @author hejq
-     * @date 2018-01-14 15:20
-     */
-    @HttpLog
-    @RequestMapping(value = "/quotation", method = RequestMethod.GET)
-    public List<InquiryDetail> getReply(Long enuu) {
-        long start = System.currentTimeMillis();
-        List<InquiryDetail> details = publicInquiryService.findNotUploadReply(enuu);
-        log.info("/inquiry/public/quotation 耗时:" + (System.currentTimeMillis() - start));
-        logger.log("公共询价", "ERP获取供应商报价信息", "size: " + details.size(), Constant.UU, enuu, InquirySource.ERP.name());
-        return details;
-    }
-
-    /**
-     * 公共询价服务中心的报价信息传到买家ERP之后，修改公共询价服务中心里面的询价单明细的上传状态
-     *
-     * @param data 传回的id串
-     * @return
-     * @throws UnsupportedEncodingException
-     */
-    @HttpLog
-    @RequestMapping(value = "/reply/back", method = RequestMethod.POST)
-    public void onReplySuccess(@RequestBody String data, Long enuu) throws UnsupportedEncodingException {
-        long start = System.currentTimeMillis();
-        String[] idArray = URLDecoder.decode(data, "UTF-8").split(",");
-        logger.log("公共询价", "ERP获取报价信息返回id", "id: " + idArray, Constant.UU, enuu, InquirySource.ERP.name());
-        publicInquiryService.onReplyUploadSuccess(idArray);
-        log.info("/inquiry/public/reply/back post 耗时:" + (System.currentTimeMillis() - start));
-    }
-
-    /**
-     * 买家在收到报价信息后，点击提交按钮后，状态传至公共询价服务中心，至此公共询价服务中心的供应商不能再对这张询价单进行报价
-     *
-     * @param details 封装的data信息
-     * @throws UnsupportedEncodingException
-     */
-    @HttpLog
-    @RequestMapping(value = "/checking", method = RequestMethod.POST)
-    public void checkInquiry(@RequestBody List<InquiryDetail> details , Long enuu) throws UnsupportedEncodingException {
-        long start = System.currentTimeMillis();
-        logger.log("公共询价", "ERP提交报价信息应用禁止报价", "size: " + details.size(), Constant.UU, enuu, InquirySource.ERP.name());
-        publicInquiryService.updateInquiryStatus(details, enuu);
-        log.info("/inquiry/public/checking post 耗时:" + (System.currentTimeMillis() - start));
-    }
-
-    /**
-     * 买家ERP（不）采纳了价格之后，修改公共询价服务中心里面的报价信息的状态
-     *
-     * @return 封装的data信息
-     * @throws UnsupportedEncodingException
-     */
-    @HttpLog
-    @RequestMapping(value = "/reply/decide", method = RequestMethod.POST)
-    public void onReplyDecide(@RequestBody List<InquiryDecide> decides, Long enuu) throws UnsupportedEncodingException {
-        long start = System.currentTimeMillis();
-        logger.log("公共询价", "ERP针对供应报价信息进行（不）采纳操作", "size: " + decides.size(), Constant.UU, enuu, InquirySource.ERP.name());
-        publicInquiryService.onReplyDecide(decides, enuu);
-        log.info("/inquiry/public/reply/decide post 耗时:" + (System.currentTimeMillis() - start));
-    }
-
-    /**
-     * 买家ERP作废询价单后，修改公共询价服务中心里面的状态
-     *
-     * @param data 封装的询价信息
-     * @return
-     * @throws UnsupportedEncodingException
-     */
-    @HttpLog
-    @RequestMapping(value = "/invalid", method = RequestMethod.POST)
-    public void onReplyInvalid(@RequestBody List<Inquiry> inquiries, Long enuu) throws UnsupportedEncodingException {
-        long start = System.currentTimeMillis();
-        logger.log("公共询价", "ERP作废公共询价单返回数据到公共服务", "size: " + inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name());
-        publicInquiryService.onReplyInvalid(inquiries, enuu);
-        log.info("/inquiry/public/invalid post 耗时:" + (System.currentTimeMillis() - start));
-    }
-
     /**
      * 将客户的公共询价列表中一条数据转成询价报价单数据
      *

src/main/java/com/uas/ps/inquiry/model/InquiryEnRemind.java

@@ -56,6 +56,8 @@ public class InquiryEnRemind implements Serializable {
     @Column(name = "ir_usertel")
     private String userTel;
 
+    /* ********************* 物料信息start***************************** */
+
     /**
      * 询价品牌
      */
@@ -86,6 +88,8 @@ public class InquiryEnRemind implements Serializable {
     @Column(name = "ir_title")
     private String prodTitle;
 
+    /* ********************* 物料信息end***************************** */
+
     /**
      * 需求数量
      */

src/main/java/com/uas/ps/inquiry/model/InquiryRemind.java

@@ -64,6 +64,8 @@ public class InquiryRemind implements Serializable {
     @Column(name = "ir_usertel")
     private String userTel;
 
+    /* ********************* 物料信息start***************************** */
+
     /**
      * 询价品牌
      */
@@ -94,6 +96,8 @@ public class InquiryRemind implements Serializable {
     @Column(name = "ir_title")
     private String prodTitle;
 
+    /* ********************* 物料信息end***************************** */
+
     /**
      * 需求数量
      */

src/main/java/com/uas/ps/inquiry/model/PublicInquiryItem.java

@@ -218,7 +218,7 @@ public class PublicInquiryItem implements Serializable {
 	private Short replySendStatus;
 
 	/**
-	 * 是否采纳
+	 * 是否采纳 1 为已采纳 0为已拒绝  空 未处理
 	 */
 	@Column(name = "id_agreed")
 	private Short agreed;
@@ -271,20 +271,13 @@ public class PublicInquiryItem implements Serializable {
 	private Date date;
 
 	/**
-	 * search项目进行单据是否已过期时实际根据主表中enddate与当前时间的比较获取，但是数据库无字段会报“标识符无效”的错误
-	 * 所以建立此字段，但是此字段不会赋值。
-	 *   在建立索引时，overdue的值加入到了invalid（已失效）的判断条件中，所以此字段的值无实际意义，
-	 *   UAS询价单提交或反提交时，更新此字段，来使询价单明细更新触发器生效，更新询价单明细索引，
-	 *   才能使未过期未报价已提交单据进入失效列表，未过期未报价反提交单据从已失效列表回到待报价列表。
-	 *
-	 *   （1为已提交， 0为被反提交， null为未提交）
+	 *   是否已过期 （目前来看此字段没有用到）
 	 */
 	@Column(name = "id_overdue", insertable = false, updatable = false)
 	private Short overdue;
 
 	/**
-	 * 报价是否已过期  根据vendToDate与当前时间的比较获取，但是数据库无字段会报“标识符无效”的错误
-	 * 所以建立此字段，此字段在视图中赋值。
+	 * 报价是否还有效 （目前来看此字段没有用到）
 	 *
 	 */
 	@Column(name = "id_invalid", insertable = false, updatable = false)

src/main/java/com/uas/ps/inquiry/model/PublicInquiryItemInfo.java

@@ -240,20 +240,13 @@ public class PublicInquiryItemInfo implements Serializable {
 	private Date date;
 
 	/**
-	 * search项目进行单据是否已过期时实际根据主表中enddate与当前时间的比较获取，但是数据库无字段会报“标识符无效”的错误
-	 * 所以建立此字段，但是此字段不会赋值。
-	 *   在建立索引时，overdue的值加入到了invalid（已失效）的判断条件中，所以此字段的值无实际意义，
-	 *   UAS询价单提交或反提交时，更新此字段，来使询价单明细更新触发器生效，更新询价单明细索引，
-	 *   才能使未过期未报价已提交单据进入失效列表，未过期未报价反提交单据从已失效列表回到待报价列表。
-	 *
-	 *   （1为已提交， 0为被反提交， null为未提交）
+	 *  报价是否过期 （目前来看此字段没有用到）
 	 */
 	@Column(name = "id_overdue", insertable = false, updatable = false)
 	private Short overdue;
 
 	/**
-	 * 报价是否已过期  根据vendToDate与当前时间的比较获取，但是数据库无字段会报“标识符无效”的错误
-	 * 所以建立此字段，此字段在视图中赋值。
+	 *  报价是否还有效 （目前来看此字段没有用到）
 	 *
 	 */
 	@Column(name = "id_invalid", insertable = false, updatable = false)

src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -1605,7 +1605,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
         ModelMap map = new ModelMap();
         for (PublicInquiryItem item : items) {
             if (enUU.equals(item.getVendUU())) {
-                item.setDecideDownStatus((short) Status.REPLIED.value());
+                item.setDecideDownStatus((short) Status.DOWNLOADED.value());
                 saveList.add(item);
             }
         }