Merge remote-tracking branch 'origin/dev' into dev

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

@@ -323,6 +323,42 @@ public class PublicInquiryItem implements Serializable {
 	@Transient
 	private String quDomain;
 
+	/**
+	 * 物料编号
+	 */
+	@Transient
+	private String prodCode;
+
+	/**
+	 * 名称
+	 */
+	@Transient
+	private String prodTitle;
+
+	/**
+	 * 规格
+	 */
+	@Transient
+	private String spec;
+
+	/**
+	 * 单位
+	 */
+	@Transient
+	private String unit;
+
+	/**
+	 * 型号
+	 */
+	@Transient
+	private String cmpCode;
+
+	/**
+	 * 品牌
+	 */
+	@Transient
+	private String inbrand;
+
 	public Long getId() {
 		return id;
 	}
@@ -686,6 +722,54 @@ public class PublicInquiryItem implements Serializable {
 		this.quDomain = quDomain;
 	}
 
+	public String getProdCode() {
+		return prodCode;
+	}
+
+	public void setProdCode(String prodCode) {
+		this.prodCode = prodCode;
+	}
+
+	public String getProdTitle() {
+		return prodTitle;
+	}
+
+	public void setProdTitle(String prodTitle) {
+		this.prodTitle = prodTitle;
+	}
+
+	public String getSpec() {
+		return spec;
+	}
+
+	public void setSpec(String spec) {
+		this.spec = spec;
+	}
+
+	public String getUnit() {
+		return unit;
+	}
+
+	public void setUnit(String unit) {
+		this.unit = unit;
+	}
+
+	public String getCmpCode() {
+		return cmpCode;
+	}
+
+	public void setCmpCode(String cmpCode) {
+		this.cmpCode = cmpCode;
+	}
+
+	public String getInbrand() {
+		return inbrand;
+	}
+
+	public void setInbrand(String inbrand) {
+		this.inbrand = inbrand;
+	}
+
 	/**
 	 * 回复记录的描述
 	 * 

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

@@ -38,6 +38,17 @@ public class PagingReleaseServiceImpl implements PagingReleaseService {
 
     @Autowired
     private PagingReleaseDetailDao pagingReleaseDetailDao;
+
+    /**
+     * 消息类型 （在B2B消息中拼接跳转单据详情url请求时需要）
+     */
+    private final String INQUIRY_TYPE = "公共询价";
+
+    /**
+     * 消息类型，公共询价的采纳结果
+     */
+    private final String INQUIRY_DECIDE_TYPE = "公共询价采纳结果";
+
     /**
      * 获取未读消息数量
      *
@@ -85,17 +96,15 @@ public class PagingReleaseServiceImpl implements PagingReleaseService {
     @Override
     public com.uas.account.support.Page<MessageModel> getPublicMessage(String keyword, PageParams params, Short isRead) throws Exception {
         com.uas.account.support.Page<MessageModel> page =  MessageUtils.getMessage(params, isRead, keyword);
-        List<MessageModel> messageModelList = new ArrayList<>();
         if (page != null) {
             for (MessageModel messageModel : page.getContent()) {
                 // 拼接公共询价链接
-                if ("公共询价".equals(messageModel.getType())) {
-
+                if (INQUIRY_TYPE.equals(messageModel.getType())) {
                     messageModel.setUrl("#/baseInfo/inquiryList/" + messageModel.getSourceId());
+                } else if (INQUIRY_DECIDE_TYPE.equals(messageModel.getType())) {
+                    messageModel.setUrl("#/sale/pubinquiry/" + messageModel.getSourceId());
                 }
-                messageModelList.add(messageModel);
             }
-            page.setContent(messageModelList);
         }
         return page;
     }

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

@@ -509,6 +509,7 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 				}
 
 			}
+			sendItems = saleSendItemDao.save(sendItems);
 			for (SaleSendItem sendItem : sendItems) {
 				PurchaseNotice notice = purchaseNoticeDao.findOne(sendItem.getNoticeId());
 				double endQty = (notice.getEndQty() == null ? 0.0 : notice.getEndQty()) + sendItem.getQty();
@@ -522,7 +523,6 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
                 // 转入我的物料库
                 productUsersService.coverToMyProduct(notice.getOrderItem().getProductId(), SystemSession.getUser().getEnterprise().getUu(), SystemSession.getUser().getUserUU(), "批量发货");
 			}
-			sendItems = saleSendItemDao.save(sendItems);
 			if (!CollectionUtils.isEmpty(sendItems)) {
 				List<SaleSend> saleSends = new ArrayList<SaleSend>();
 				saleSends.add(sendItems.get(0).getSend());