自动询价发送邮件通知，建立供应商关系，并且供应商注册后自动传回ERP同步更新供应商信息；

批量修改采购验收单价格时更新关联的发票的单价

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

@@ -28,4 +28,13 @@ public interface InvitationRecordDao
 	 * @return
 	 */
 	public List<InvitationRecord> findByUseruu(Long useruu);
+
+	/**
+	 * 通过邀请企业uu号和供应商名称查询邀请记录
+	 *
+	 * @param enuu
+	 * @param vendname
+	 * @return
+	 */
+	public InvitationRecord findByEnuuAndVendname(Long enuu, String vendname);
 }

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

@@ -1,17 +1,16 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
-import javax.persistence.QueryHint;
-
+import com.uas.platform.b2b.model.Vendor;
+import com.uas.platform.core.data.repository.GenericRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.jpa.repository.QueryHints;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.Vendor;
-import com.uas.platform.core.data.repository.GenericRepository;
+import javax.persistence.QueryHint;
+import java.util.List;
 
 @Repository
 public interface VendorDao extends JpaSpecificationExecutor<Vendor>, GenericRepository<Vendor, Long> {
@@ -128,4 +127,14 @@ public interface VendorDao extends JpaSpecificationExecutor<Vendor>, GenericRepo
 	 * @return
 	 */
     List<Vendor> findBySynchStatus(short no);
+
+	/**
+	 * 寻找未同步到ERP的供应商信息
+	 *
+	 * @param myEnuu
+	 * @param status
+	 * @return
+	 */
+    List<Vendor> findByMyEnUUAndErpstatus(Long myEnuu, Integer status);
+
 }

src/main/java/com/uas/platform/b2b/erp/controller/PurchaseProdInOutController.java

@@ -4,6 +4,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.List;
 
+import com.uas.platform.b2b.service.PurchaseApBillService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,10 +32,13 @@ import com.uas.platform.core.util.serializer.FlexJsonUtils;
 public class PurchaseProdInOutController {
 
 	@Autowired
-	PurchaseAcceptService purchaseAcceptService;
+	private PurchaseAcceptService purchaseAcceptService;
 	
 	@Autowired
-	PurchaseProdInOutService purchaseProdInOutService;
+	private PurchaseProdInOutService purchaseProdInOutService;
+
+	@Autowired
+	private PurchaseApBillService purchaseApBillService;
 
 	private final static ErpBufferedLogger logger = BufferedLoggerManager.getLogger(ErpBufferedLogger.class);
 
@@ -81,6 +85,9 @@ public class PurchaseProdInOutController {
 	public void refreshPrice(@RequestParam("data") String data) throws UnsupportedEncodingException {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<ProdInOutRefreshPrice> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, ProdInOutRefreshPrice.class);
+		// 更新采购验收单的价格
 		purchaseAcceptService.save(purchaseProdInOutService.convertPirceForProdIn(prodInOuts));
+		// 更新关联的应付发票的价格
+		purchaseApBillService.refreshPrice(prodInOuts);
 	}
 }

src/main/java/com/uas/platform/b2b/erp/controller/VendorRateController.java

@@ -2,8 +2,10 @@ package com.uas.platform.b2b.erp.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.uas.platform.b2b.dao.VendorDao;
+import com.uas.platform.b2b.erp.model.InquiryVendorInfo;
 import com.uas.platform.b2b.erp.model.VendorInfo;
 import com.uas.platform.b2b.erp.model.VendorRate;
+import com.uas.platform.b2b.erp.service.VendorService;
 import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
 import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.core.logging.BufferedLoggerManager;
@@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.util.Arrays;
 import java.util.List;
 
 @Controller
@@ -28,6 +31,9 @@ public class VendorRateController {
 	@Autowired
 	private VendorDao vendorDao;
 
+	@Autowired
+	private VendorService vendorService;
+
 	/**
 	 * 上传供应商费率
 	 * 
@@ -84,4 +90,41 @@ public class VendorRateController {
 		}
 	}
 
+
+	/**
+	 * 同步erp的未注册平台的供应商进行邀请注册
+	 *
+	 * @param data
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(value = "/invite", method = RequestMethod.POST)
+	@ResponseBody
+	public void uploadVendorInfo(@RequestParam("data") String data) throws UnsupportedEncodingException {
+		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		List<InquiryVendorInfo> infos = JSONArray.parseArray(jsonStr, InquiryVendorInfo.class);
+		vendorService.saveInvitation(infos);
+		logger.log("供应商资料", "邀请供应商开通平台", infos.size());
+	}
+
+	/**
+	 * 获取未同步UU号到ERP的供应商信息
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/downloadUU", method = RequestMethod.GET)
+	@ResponseBody
+	public List<InquiryVendorInfo> getVendUU() {
+		return vendorService.getInfo();
+	}
+
+	/**
+	 * erp更新供应商uu后回传到平台更新下载状态
+	 *
+	 * @param data
+	 */
+	@RequestMapping(value = "/check", method = RequestMethod.POST)
+	@ResponseBody
+	public void checkSuccess(@RequestParam("data") String data) {
+		vendorService.updateStatus(data);
+	}
 }

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

@@ -45,6 +45,7 @@ public class InquiryDetail {
 	private String id_vendyyzzh;// 供应商营业执照号
 	private String in_code;// 公共询价时epr没有表不同，这时，需要新建数据
 	private String in_inquirytype;// 询价类型，公共询价传回到ERP时进行特殊处理
+    private Integer id_quto;//给是否自动询价赋值
 
 	public Long getB2b_id_id() {
 		return b2b_id_id;
@@ -270,7 +271,15 @@ public class InquiryDetail {
 		this.in_inquirytype = in_inquirytype;
 	}
 
-	/**
+    public Integer getId_quto() {
+        return id_quto;
+    }
+
+    public void setId_quto(Integer id_quto) {
+        this.id_quto = id_quto;
+    }
+
+    /**
 	 * 转为平台的采购询价明细
 	 * 
 	 * @return
@@ -340,6 +349,9 @@ public class InquiryDetail {
 				files.add(new RemoteFile(attach));
 			}
 		}
+		if("自动询价".equals(item.getInquiry().getRemark())) {
+            this.id_quto = 1;
+        }
 	}
 
 	public InquiryDetail(SaleQuotationItem item) {

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

@@ -24,6 +24,7 @@ public class SaleDownDetail {
 	private Float sd_taxrate;
 	private Double sd_taxtotal;
 	private String sd_factory;
+	private String sd_prodsource;
 	
 
 	public String getSd_factory() {
@@ -162,6 +163,14 @@ public class SaleDownDetail {
 		this.sd_taxtotal = sd_taxtotal;
 	}
 
+	public String getSd_prodsource() {
+		return sd_prodsource;
+	}
+
+	public void setSd_prodsource(String sd_prodsource) {
+		this.sd_prodsource = sd_prodsource;
+	}
+
 	public SaleDownDetail() {
 
 	}
@@ -189,6 +198,7 @@ public class SaleDownDetail {
 		this.sd_total = orderItem.getAmount();
 		this.sd_taxtotal = orderItem.getNoTaxAmount();
 		this.sd_factory = orderItem.getFactory();
+		this.sd_prodsource = orderItem.getProdsource();
 	}
 
 	/**

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

@@ -114,6 +114,26 @@ public class InvitationRecord implements Serializable {
 	@Column(name = "in_venduu")
 	private Long venduu;
 
+	/**
+	 * 邀请来源
+	 */
+	@Column(name = "in_source")
+	private String source;
+
+	/**
+	 * 邀请状态
+	 */
+	@Column(name = "in_status")
+	private Integer status;
+
+	/**
+	 * erp数据传入时间
+	 *
+	 * @return
+	 */
+	@Column(name = "in_erpdate")
+	private Date erpdate;
+
 	public Long getId() {
 		return id;
 	}
@@ -225,4 +245,28 @@ public class InvitationRecord implements Serializable {
 	public void setUser(User user) {
 		this.user = user;
 	}
+
+	public String getSource() {
+		return source;
+	}
+
+	public void setSource(String source) {
+		this.source = source;
+	}
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	public Date getErpdate() {
+		return erpdate;
+	}
+
+	public void setErpdate(Date erpdate) {
+		this.erpdate = erpdate;
+	}
 }

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

@@ -19,6 +19,8 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
+import com.uas.platform.b2b.core.util.StringUtil;
+import org.apache.axis.utils.StringUtils;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
 import com.alibaba.fastjson.annotation.JSONField;
@@ -178,9 +180,18 @@ public class PurchaseOrderAllItem {
 	@Transient
 	private Boolean key;
 
+	/**
+	 * erp传入时间
+	 */
 	@Column(name = "pd_erpdate")
 	private Date erpDate;
 
+	/**
+	 * 物料路径来源
+	 */
+	@Column(name = "pd_prodsource")
+	private String prodsource;
+
 	public Long getId() {
 		return id;
 	}
@@ -375,6 +386,15 @@ public class PurchaseOrderAllItem {
 		this.erpDate = erpDate;
 	}
 
+	public String getProdsource() {
+		// 默认是供应商的物料
+		return StringUtils.isEmpty(prodsource) ? "seller" : prodsource;
+	}
+
+	public void setProdsource(String prodsource) {
+		this.prodsource = prodsource;
+	}
+
 	public double getBalance() {
 		double qtyNum, returnQtyNum, acceptQtyNum;
 		qtyNum = qty == null ? 0 : qty;

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

@@ -15,6 +15,7 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
+import com.uas.platform.b2b.erp.model.InquiryVendorInfo;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
@@ -51,10 +52,10 @@ public class Vendor implements Serializable {
 	private Integer status;
 
 	/**
-	 * 我的企业UU
-	 */
-	@Column(name = "ve_myenuu")
-	private Long myEnUU;
+     * 我的企业UU
+     */
+    @Column(name = "ve_myenuu")
+    private Long myEnUU;
 	
 	/**
 	 * 我的企业
@@ -154,6 +155,15 @@ public class Vendor implements Serializable {
 	@Column(name = "ve_synchstatus")
 	private Short synchStatus;
 
+	/**
+	 * 同步到erp的状态
+	 * <pre>
+	 *     主要是针对erp邀请注册后自动添加供应商，并且同步erp的供应商uu
+	 * </pre>
+	 */
+	@Column(name = "ve_erpstatus")
+	private Integer erpstatus;
+
 	public Long getId() {
 		return id;
 	}
@@ -282,8 +292,6 @@ public class Vendor implements Serializable {
 		this.servicerswitch = servicerswitch;
 	}
 
-
-
 	public Short getCustswitch() {
 		return custswitch;
 	}
@@ -313,4 +321,20 @@ public class Vendor implements Serializable {
 		return this.vendorEnterprise.getEnName();
 	}
 
+	public Integer getErpstatus() {
+		return erpstatus;
+	}
+
+	public void setErpstatus(Integer erpstatus) {
+		this.erpstatus = erpstatus;
+	}
+
+
+	public InquiryVendorInfo covert() {
+		InquiryVendorInfo info = new InquiryVendorInfo();
+		info.setB2b_id(this.id);
+		info.setVe_uu(String.valueOf(this.vendEnUU));
+		info.setVe_webserver(this.vendorEnterprise.getEnBussinessCode());
+		return info;
+	}
 }

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

@@ -1,13 +1,13 @@
 package com.uas.platform.b2b.service;
 
-import java.util.List;
-
-import org.springframework.data.domain.Page;
-
+import com.uas.platform.b2b.erp.model.ProdInOutRefreshPrice;
 import com.uas.platform.b2b.model.PurchaseApBill;
 import com.uas.platform.b2b.model.PurchaseApBillItem;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.core.model.PageInfo;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
 
 public interface PurchaseApBillService {
 
@@ -80,4 +80,11 @@ public interface PurchaseApBillService {
 	public Long getAllCount();
 
     Integer getApBillUnreadCount();
+
+	/**
+	 * erp批量更新采购验收单的单价，平台需要批量更新关联的应付发票的单价
+	 *
+	 * @param acceptItems
+	 */
+	public void refreshPrice(List<ProdInOutRefreshPrice> prodInOuts);
 }

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

@@ -621,6 +621,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 					orderDetail.setNumber(i);
 					orderDetail.setPuid(order.getId());
 					orderDetail.setPrice(Double.valueOf(orderitem.getPrice()));
+					orderDetail.setProdsource(orderitem.getProdsource());
 					// 这里根据币别设置税率信息,非RMB全部设置0
 					if(!order.getCurrency().equals("RMB")) {
 						orderDetail.setTaxrate((float) 0);
@@ -635,6 +636,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 					orderDetail.setPuid(order.getId());
 					orderDetail.setPrice(Double.valueOf(orderitem.getPrice()));
 					orderDetail.setTaxrate(orderitem.getTaxrate());
+					orderDetail.setProdsource(orderitem.getProdsource());
 				}
 				orderDetails.add(orderDetail);
 				i++;

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

@@ -1,27 +1,13 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import com.uas.platform.b2b.dao.PagingReleaseCountDao;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
-
 import com.uas.platform.b2b.core.util.ContextUtils;
+import com.uas.platform.b2b.dao.CommonDao;
+import com.uas.platform.b2b.dao.PagingReleaseCountDao;
 import com.uas.platform.b2b.dao.PurchaseApBillDao;
 import com.uas.platform.b2b.dao.PurchaseApBillItemDao;
+import com.uas.platform.b2b.erp.model.ProdInOutRefreshPrice;
 import com.uas.platform.b2b.event.PurchaseApBillSaveEvent;
+import com.uas.platform.b2b.model.PurchaseAcceptItem;
 import com.uas.platform.b2b.model.PurchaseApBill;
 import com.uas.platform.b2b.model.PurchaseApBillItem;
 import com.uas.platform.b2b.model.SearchFilter;
@@ -33,6 +19,21 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.search.b2b.model.PageParams;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class PurchaseApBillServiceImpl implements PurchaseApBillService {
@@ -49,6 +50,9 @@ public class PurchaseApBillServiceImpl implements PurchaseApBillService {
 	@Autowired
 	private PagingReleaseCountDao pagingReleaseCountDao;
 
+	@Autowired
+	private CommonDao commonDao;
+
 	@Override
 	public void save(List<PurchaseApBillItem> apBillItems) {
 		List<PurchaseApBillItem> newApBillItems = purchaseApBillItemDao.save(apBillItems);
@@ -163,4 +167,15 @@ public class PurchaseApBillServiceImpl implements PurchaseApBillService {
 				SystemSession.getUser().getUserUU(), "sale", "PURC$APBILL");
 	}
 
+	@Override
+	public void refreshPrice(List<ProdInOutRefreshPrice> prodInOuts) {
+		if(!CollectionUtils.isEmpty(prodInOuts)) {
+			for(ProdInOutRefreshPrice prod : prodInOuts) {
+				String sql = " merge into purc$apbillitem i using purc$apbill a on (i.papi_papid = a.pab_id and i.papi_pdinoutno = '" + prod.getPbu_inoutno() + "' and a.pad_venduu= " +SystemSession.getUser().getEnterprise().getUu() + ")" +
+						" when matched then update set i.papi_price = " + prod.getPbu_orderprice();
+				commonDao.getJdbcTemplate().update(sql);
+			}
+		}
+	}
+
 }

src/main/java/com/uas/platform/b2b/support/MessageConf.java

@@ -32,6 +32,20 @@ public class MessageConf {
 	@Value("#{message.msgTenderForB2B}")
 	private String msgTenderForB2B;
 
+	/**
+	 * erp用户邀请注册的邮件模板id
+	 *
+	 * @return
+	 */
+	@Value("#{message.tplInvitationForERP}")
+	private String tplInvitationForERP;
+
+	/**
+	 * erp用户邀请注册的短信模板id
+	 */
+	@Value("#{message.msgInvitationForERP}")
+	private String msgInvitationForERP;
+
 	/**
 	 * 邮件模版id：询价单提醒供应商报价
 	 * @return
@@ -85,6 +99,22 @@ public class MessageConf {
 		this.msgTenderForB2B = msgTenderForB2B;
 	}
 
+	public String getTplInvitationForERP() {
+		return tplInvitationForERP;
+	}
+
+	public void setTplInvitationForERP(String tplInvitationForERP) {
+		this.tplInvitationForERP = tplInvitationForERP;
+	}
+
+	public String getMsgInvitationForERP() {
+		return msgInvitationForERP;
+	}
+
+	public void setMsgInvitationForERP(String msgInvitationForERP) {
+		this.msgInvitationForERP = msgInvitationForERP;
+	}
+
 	public String getTplInquiryForB2B() {
 		return tplInquiryForB2B;
 	}

src/main/java/com/uas/platform/b2b/support/SysConf.java

@@ -46,6 +46,22 @@ public class SysConf {
 	@Value("#{sys.reportUploadUrl}")
 	private String reportUploadUrl;
 
+    /**
+     * 账户中心注册地址
+     *
+     * @return
+     */
+    @Value("#{sys.registerUrl}")
+    private String registerUrl;
+
+    public String getRegisterUrl() {
+        return registerUrl;
+    }
+
+    public void setRegisterUrl(String registerUrl) {
+        this.registerUrl = registerUrl;
+    }
+
 	public String getB2b() {
 		return b2b;
 	}

src/main/java/com/uas/platform/b2b/temporary/model/OrderItems.java

@@ -1,9 +1,9 @@
 package com.uas.platform.b2b.temporary.model;
 
-import java.util.Date;
-
 import com.uas.platform.b2b.model.Product;
 
+import java.util.Date;
+
 public class OrderItems {
 
 	private Date delivery;
@@ -11,6 +11,8 @@ public class OrderItems {
 	private String remark;
 	private String price;
 	private Long id;
+	//物料来源，默认导入的归属于客户，新增的归属于供应商
+	private String  prodsource;
 	// 下面是product的信息
 	private Product product;
 	private String code;
@@ -170,6 +172,14 @@ public class OrderItems {
 		this.product = product;
 	}
 
+	public String getProdsource() {
+		return prodsource;
+	}
+
+	public void setProdsource(String prodsource) {
+		this.prodsource = prodsource;
+	}
+
 	@Override
 	public String toString() {
 		return "OrderItems [delivery=" + delivery + ", qty=" + qty + ", remark=" + remark + ", price=" + price + ", id="

src/main/resources/dev/message.properties

@@ -2,8 +2,10 @@ tplInvitationForB2B=e472f874-0579-4ca2-9bb8-2635109dc7f3
 msgInvitationForB2B=73c513f8-7423-49c4-b57c-50a63bd8a0af
 tplAfterBeAddedtoB2B=b9dee589-9fd8-45d3-9b2a-64b56d65e7e2
 msgTenderForB2B=f9e29b6f-4116-4d33-9bde-048aa037f8c6
+tplInvitationForERP=d8324da8-fa97-429c-8293-761698a94db8
+msgInvitationForERP=5081e29f-47af-4556-a560-9213af11753f
 
-## ×Ô¶¯Ñ¯¼Û±¨¼ÛÌáÐÑ
+## messageConfig
 tplInquiryForB2B=bc60d592-9651-4ca1-9305-0852fc7c4101
 msgInquiryForB2B=72cc98e4-0c2b-4d16-944b-2e0515048b8d
-messageUrl=http://message.ubtob.com/sms/send
+messageUrl=http://message.ubtob.com/sms/send

src/main/resources/dev/sys.properties

@@ -4,6 +4,8 @@ manage=http://218.17.158.219:9090/platform-manage
 manageInner=http://192.168.253.60:9090/platform-manage
 im=http://113.105.74.131:8092
 b2c=http://192.168.253.60:9090/platform-b2c
+registerUrl=http://10.10.100.133/sso/register
+
 #report url
 reportPrintUrl=http://print.ubtob.com/report/print?userName=B2B%s&profile=${profile}&reportName=%s&whereCondition=%s
 reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2B%s

src/main/resources/prod/message.properties

@@ -2,8 +2,10 @@ tplInvitationForB2B=e472f874-0579-4ca2-9bb8-2635109dc7f3
 msgInvitationForB2B=73c513f8-7423-49c4-b57c-50a63bd8a0af
 tplAfterBeAddedtoB2B=b9dee589-9fd8-45d3-9b2a-64b56d65e7e2
 msgTenderForB2B=f9e29b6f-4116-4d33-9bde-048aa037f8c6
+tplInvitationForERP=d8324da8-fa97-429c-8293-761698a94db8
+msgInvitationForERP=5081e29f-47af-4556-a560-9213af11753f
 
-## ×Ô¶¯Ñ¯¼Û±¨¼ÛÌáÐÑ
+## messageConfig
 tplInquiryForB2B=bc60d592-9651-4ca1-9305-0852fc7c4101
 msgInquiryForB2B=72cc98e4-0c2b-4d16-944b-2e0515048b8d
 messageUrl=http://message.ubtob.com/sms/send

src/main/resources/prod/sys.properties

@@ -4,6 +4,8 @@ manage=http://manage.ubtob.com
 manageInner=http://10.10.100.81:8080
 im=http://113.105.74.140:8092
 b2c=http://www.usoftmall.com
+registerUrl=https://account.ubtob.com/sso/register
+
 #report url
 reportPrintUrl=http://print.ubtob.com/report/print?userName=B2B%s&profile=${profile}&reportName=%s&whereCondition=%s
 reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2B%s

src/main/resources/test/message.properties

@@ -2,8 +2,10 @@ tplInvitationForB2B=e472f874-0579-4ca2-9bb8-2635109dc7f3
 msgInvitationForB2B=73c513f8-7423-49c4-b57c-50a63bd8a0af
 tplAfterBeAddedtoB2B=b9dee589-9fd8-45d3-9b2a-64b56d65e7e2
 msgTenderForB2B=f9e29b6f-4116-4d33-9bde-048aa037f8c6
+tplInvitationForERP=d8324da8-fa97-429c-8293-761698a94db8
+msgInvitationForERP=5081e29f-47af-4556-a560-9213af11753f
 
-## ×Ô¶¯Ñ¯¼Û±¨¼ÛÌáÐÑ
+## messageConfig
 tplInquiryForB2B=bc60d592-9651-4ca1-9305-0852fc7c4101
 msgInquiryForB2B=72cc98e4-0c2b-4d16-944b-2e0515048b8d
 messageUrl=http://message.ubtob.com/sms/send

src/main/resources/test/sys.properties

@@ -4,6 +4,8 @@ manage=http://218.17.158.219:9090/platform-manage
 manageInner=http://192.168.253.60:9090/platform-manage
 im=http://113.105.74.131:8092
 b2c=http://192.168.253.60:9090/platform-b2c
+registerUrl=http://10.10.100.133/sso/register
+
 #report url
 reportPrintUrl=http://print.ubtob.com/report/print?userName=B2B%s&profile=${profile}&reportName=%s&whereCondition=%s
 reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2B%s

src/main/webapp/resources/js/index/app.js

@@ -13901,7 +13901,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     remark: null,
                     delivery: null,
                     $endDateOpen: false,
-                    taxrate: $scope.order.rate
+                    taxrate: $scope.order.rate,
+                    prodsource: 'seller'
                 });
             }
         };
@@ -13956,7 +13957,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 remark: null,
                 delivery: null,
                 prid: data.id,
-                taxrate: $scope.order.rate
+                taxrate: $scope.order.rate,
+                prodsource: 'seller'
             });
         };
 
@@ -13981,7 +13983,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                         remark: prod.remark,
                         delivery: prod.date,
                         prid: prod.id,
-                        taxrate: prod.rate
+                        taxrate: prod.rate,
+                        prodsource: 'purchaser'
                     });
                 })