返回UAS报价单实体修改；物料信息不做关联修改

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

@@ -213,7 +213,7 @@ public class ErpDownloadController {
     public List<PublicInquiryItem> downReply(Long enUU) {
         long start = System.currentTimeMillis();
         List<PublicInquiryItem> details = publicInquiryService.findNotUploadToUas(enUU);
-        log.info("/inquiry/public/quotation 耗时:" + (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/down/reply 耗时:" + (System.currentTimeMillis() - start));
         logger.log("公共询价", "ERP获取供应商报价信息", "size: " + details.size(), Constant.UU, enUU, InquirySource.ERP.name());
         return details;
     }

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

@@ -67,7 +67,7 @@ public class InquiryForSaleController {
 
     /**
      * 通过id查询公共询价详情
-     *
+     *                 UU互联，查看报价单详情调用
      * @param id 询价明细id
      * @param enuu 企业UU号
      * @return
@@ -127,7 +127,7 @@ public class InquiryForSaleController {
      *
      * @param item 前台数据
      * @return
-     *   报价后续统一调用  /item/saveQuote
+     *   报价后续统一调用  /item/saveQuote 2018年7月10日 之后不在维护
      */
     @Deprecated
     @HttpLog
@@ -152,7 +152,7 @@ public class InquiryForSaleController {
      * 保存报价接口
      *
      * 后续统一使用
-     * @param publicInquiryItem
+     * @param publicInquiryItem 报价单内容
      * @return
      * @throws Exception
      */
@@ -193,7 +193,7 @@ public class InquiryForSaleController {
 
     /**
      * 根据公共询价明细id查询报价信息，判断是否已报价
-     *
+     *                        UU转报价前，会调用，查询是否已转
      * @param id 公共询价明细id
      * @param en_uu 当前企业UU
      * @return
@@ -210,7 +210,7 @@ public class InquiryForSaleController {
 
     /**
      * 移动端转报价的功能
-     *
+     *                        2018年7月10日 15:24:55 之后app报价将调用统一报价接口 /inquiry/sale/item/saveQuote
      * @param inquiryItemId 公共询价明细id
      * @param en_uu 报价企业UU号
      * @param replies 报价信息
@@ -219,6 +219,7 @@ public class InquiryForSaleController {
      * @param minPackQty 最小包装
      * @return
      */
+    @Deprecated
     @HttpLog
     @RequestMapping(value = "/mobile/quote", method = RequestMethod.POST)
     public ModelMap quote(Long inquiryItemId, Long en_uu, Long useruu, Long leadtime, Double minPackQty, Double minOrderQty, String replies, String currency, Float taxrate) throws Exception {

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

@@ -135,17 +135,20 @@ public class PublicInquiryController {
     public IPage<PublicInquiryItemInfo> getQuotation(PageInfo pageInfo, String filter, String _state, Short overdue) {
         long start = System.currentTimeMillis();
         SearchFilter searchFilter = JSONObject.parseObject(filter, SearchFilter.class);
-        if (null != searchFilter.getVendUU()) {
-            pageInfo.filter("vendUU", searchFilter.getVendUU());
-        } else if (null != searchFilter.getEnUU()) {
-            pageInfo.filter("inquiry.enUU", searchFilter.getEnUU());
-        } else {
+        if (null != searchFilter) {
+            if (null != searchFilter.getVendUU()) {
+                pageInfo.filter("vendUU", searchFilter.getVendUU());
+            } else if (null != searchFilter.getEnUU()) {
+                pageInfo.filter("inquiry.enUU", searchFilter.getEnUU());
+                // 已报价未传vendUU时，抛出异常
+            }
+        } else if (null != _state && _state.equals(OrderStatus.done.name())) {
             throw new IllegalAccessError("请先传入企业信息");
         }
         if (null != _state) {
             pageInfo = publicInquiryService.covert(pageInfo, _state, overdue);
         }
-        logger.log("公共询价", "查询已转报价询价列表信息", "状态: " + _state == null ? "all" : _state, searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name());
+        logger.log("公共询价", "查询已转报价询价列表信息", "状态: " + (_state == null ? "all" : _state), searchFilter != null ? searchFilter.getUserUU() : null, searchFilter != null ? searchFilter.getEnUU() : null, InquirySource.PLAIN.name());
         IPage<PublicInquiryItemInfo> inquiryItemInfoIPage = publicInquiryService.findByPageInfo(pageInfo, searchFilter);
         log.info("/inquiry/public/quotation/list 耗时:" + (System.currentTimeMillis() - start));
         return inquiryItemInfoIPage;
@@ -311,6 +314,7 @@ public class PublicInquiryController {
      * @param endDate  截止日期
      * @return
      */
+    @Deprecated
     @HttpLog
     @RequestMapping(value = "/mobile", method = RequestMethod.GET)
     public ModelMap publincInquiry(Integer page, Integer size, Long en_uu, String _state,
@@ -376,7 +380,8 @@ public class PublicInquiryController {
 
     /**
      * 移动端查询公共询价列表信息
-     *
+     *                     2018年7月10日 16:24:35 此接口实际是将获取全部、获取已报价、获取未报价接口整合到一起，供UU互联只调用一个接口，
+     *                     可以修改为去调用对应的列表方法，这样，UU只用调用一个接口，公共服务也不用重复维护。
      * @param page     页码
      * @param size     每页大小
      * @param en_uu    企业UU
@@ -387,6 +392,7 @@ public class PublicInquiryController {
      * @param endDate  截止日期
      * @return
      */
+    @Deprecated
     @HttpLog
     @RequestMapping(value = "/mobile/v2", method = RequestMethod.GET)
     public ModelMap publicInquiry(Integer page, Integer size, Long en_uu, String _state,

src/main/java/com/uas/ps/inquiry/entity/InquiryDetail.java

@@ -4,7 +4,9 @@ import com.uas.ps.core.util.CollectionUtils;
 import com.uas.ps.inquiry.model.PublicInquiryItem;
 import com.uas.ps.inquiry.model.PublicInquiryReply;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 买家ERP系统的采购询价单明细
@@ -46,6 +48,26 @@ public class InquiryDetail {
     private Integer id_quto;//给是否自动询价赋值
 	private String id_incode;// 询价单号
 
+	/**
+	 * 替代型号
+	 */
+	private String replaceCmpCode;
+
+	/**
+	 * 替代规格
+	 */
+	private String replaceSpec;
+
+	/**
+	 * 替代品牌
+	 */
+	private String replaceBrand;
+
+	/**
+	 * 是否替代物料报价  1 是替代料报价， 0为普通报价
+	 */
+	private Short isReplace;
+
 	public Long getB2b_id_id() {
 		return b2b_id_id;
 	}
@@ -294,6 +316,38 @@ public class InquiryDetail {
 		this.ve_contacttel = ve_contacttel;
 	}
 
+	public String getReplaceCmpCode() {
+		return replaceCmpCode;
+	}
+
+	public void setReplaceCmpCode(String replaceCmpCode) {
+		this.replaceCmpCode = replaceCmpCode;
+	}
+
+	public String getReplaceSpec() {
+		return replaceSpec;
+	}
+
+	public void setReplaceSpec(String replaceSpec) {
+		this.replaceSpec = replaceSpec;
+	}
+
+	public String getReplaceBrand() {
+		return replaceBrand;
+	}
+
+	public void setReplaceBrand(String replaceBrand) {
+		this.replaceBrand = replaceBrand;
+	}
+
+	public Short getIsReplace() {
+		return isReplace;
+	}
+
+	public void setIsReplace(Short isReplace) {
+		this.isReplace = isReplace;
+	}
+
 	public InquiryDetail() {
 
 	}
@@ -348,6 +402,14 @@ public class InquiryDetail {
 			this.ve_contact = item.getUser().getUserName();
 			this.ve_contacttel = item.getUser().getUserTel();
 		}
+		this.replaceCmpCode = item.getReplaceCmpCode();
+		this.replaceBrand = item.getReplaceBrand();
+		this.replaceSpec = item.getReplaceSpec();
+		if (null != item.getIsReplace()) {
+			this.isReplace = item.getIsReplace();
+		} else {
+			this.isReplace = 0;
+		}
 	}
 
 }

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

@@ -512,6 +512,15 @@ public class PublicInquiryItem implements Serializable {
 	}
 
 	public Product getProduct() {
+		Product product = new Product();
+		product.setId(this.productId);
+		product.setCode(this.prodCode);
+		product.setSpec(this.spec);
+		product.setCmpCode(this.cmpCode);
+		product.setpCmpCode(this.cmpCode);
+		product.setTitle(this.prodTitle);
+		product.setBrand(this.inbrand);
+		product.setpBrandEn(this.inbrand);
 		return product;
 	}
 

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

@@ -67,8 +67,7 @@ public class PurcInquiryItemInfo {
 	/**
 	 * 产品
 	 */
-	@OneToOne(cascade = {CascadeType.ALL})
-	@JoinColumn(name = "id_prid", insertable = false, updatable = false)
+	@Transient
 	private Product product;
 
 	/**
@@ -410,7 +409,16 @@ public class PurcInquiryItemInfo {
 	}
 
     public Product getProduct() {
-        return product;
+		Product product = new Product();
+		product.setId(this.productId);
+		product.setCode(this.prodCode);
+		product.setSpec(this.spec);
+		product.setCmpCode(this.cmpCode);
+		product.setpCmpCode(this.cmpCode);
+		product.setTitle(this.prodTitle);
+		product.setBrand(this.inbrand);
+		product.setpBrandEn(this.inbrand);
+		return product;
     }
 
     public void setProduct(Product product) {

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

@@ -751,7 +751,7 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
         inquiryItem.setMinOrderQty(publicInquiryItem.getMinOrderQty());
         inquiryItem.setMinPackQty(publicInquiryItem.getMinPackQty());
         inquiryItem.setLeadtime(publicInquiryItem.getLeadtime());
-        inquiryItem.setQutoApp(InquirySource.UU.name());
+        inquiryItem.setQutoApp(publicInquiryItem.getQutoApp());
         inquiryItem.setReplies(publicInquiryItem.getReplies());
         inquiryItem.setCurrency(publicInquiryItem.getCurrency());
         inquiryItem.setTaxrate(publicInquiryItem.getTaxrate());

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

@@ -1410,7 +1410,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                         itemInfo.setQuoted(Constant.YES);
                         itemInfo.setQuteId(remind.getNewId());
                     }
-                    if (itemInfo.getRemainingTime() <= 0) {
+                    if (null != itemInfo.getRemainingTime() && itemInfo.getRemainingTime() <= 0) {
                         itemInfo.setOverdue(Constant.YES);
                     }
                     infoList.add(itemInfo);