dongbw 8 лет назад
Родитель
Сommit
e5e005b4a0

+ 54 - 10
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/ProdSimpleInfo.java

@@ -1,7 +1,13 @@
 package com.uas.search.console.b2b.model;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -41,6 +47,8 @@ public class ProdSimpleInfo {
 
 	public static final String B2BDISABLED_FIELD = "pr_b2bdisabled";
 
+	public static final String ERPDATE_FIELD = "pr_erpdate";
+
 
 	/**
 	 * 标准属性
@@ -240,6 +248,12 @@ public class ProdSimpleInfo {
 	@Column(name = B2BDISABLED_FIELD)
 	private Short b2bDisabled;
 
+	/**
+	 * ERP 传入时间 (最后更新时间)
+	 */
+	@Column(name = ERPDATE_FIELD)
+	private Date erpDate;
+
 	public Long getId() {
 		return id;
 	}
@@ -441,6 +455,14 @@ public class ProdSimpleInfo {
 		this.b2bDisabled = b2bDisabled;
 	}
 
+	public Date getErpDate() {
+		return erpDate;
+	}
+
+	public void setErpDate(Date erpDate) {
+		this.erpDate = erpDate;
+	}
+
 	/**
 	 * 获取所有可以搜索的字段列名(索引的field名)
 	 *
@@ -463,14 +485,36 @@ public class ProdSimpleInfo {
 		return fields;
 	}
 
-	@Override
-	public String toString() {
-		return "ProdSimpleInfo [id=" + id + ", enterprise=" + enterprise + ", prodCode=" + prodCode + ", prodTitle="
-				+ prodTitle + ", prodSpec=" + prodSpec + ", brand=" + brand + ", issale=" + issale + ", isPurchase="
-				+ isPurchase + ", isShow=" + isShow + ", isPubsale=" + isPubsale + ", uuid=" + uuid + ", cmpCode="
-				+ cmpCode + ", standard=" + standard + ", matchstatus=" + matchstatus + ", kind=" + kind + ", kinden="
-				+ kinden + ", pcmpcode=" + pcmpcode + ", pbrand=" + pbrand + ", pbranden=" + pbranden + ", matchsize="
-				+ matchsize + ", b2bdisabled=" + b2bDisabled + "]";
-	}
+    @Override
+    public String toString() {
+        return "ProdSimpleInfo{" +
+                "id=" + id +
+                ", enterprise=" + enterprise +
+                ", prodCode='" + prodCode + '\'' +
+                ", prodTitle='" + prodTitle + '\'' +
+                ", prodSpec='" + prodSpec + '\'' +
+                ", brand='" + brand + '\'' +
+                ", issale=" + issale +
+                ", isPurchase=" + isPurchase +
+                ", isShow=" + isShow +
+                ", isPubsale=" + isPubsale +
+                ", uuid='" + uuid + '\'' +
+                ", cmpCode='" + cmpCode + '\'' +
+                ", standard=" + standard +
+                ", matchstatus=" + matchstatus +
+                ", kind='" + kind + '\'' +
+                ", kinden='" + kinden + '\'' +
+                ", pcmpcode='" + pcmpcode + '\'' +
+                ", pbrand='" + pbrand + '\'' +
+                ", pbranden='" + pbranden + '\'' +
+                ", matchsize=" + matchsize +
+                ", goodsnover='" + goodsnover + '\'' +
+                ", goodstaxno='" + goodstaxno + '\'' +
+                ", taxpre='" + taxpre + '\'' +
+                ", taxprecon='" + taxprecon + '\'' +
+                ", b2bDisabled=" + b2bDisabled +
+                ", erpDate=" + erpDate +
+                '}';
+    }
 
 }

+ 4 - 0
search-console-b2b/src/main/java/com/uas/search/console/b2b/util/DocumentToObjectUtils.java

@@ -1880,6 +1880,10 @@ public class DocumentToObjectUtils {
 		if (null != taxprecon) {
 			prodSimpleInfo.setPcmpcode(taxprecon);
 		}
+		String erpDate = document.get(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.ERPDATE_FIELD));
+		if (null != erpDate) {
+			prodSimpleInfo.setErpDate(new Date(Long.valueOf(erpDate)));
+		}
 
 		//禁用物料参数
 		String b2bDisabled = document.get(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.B2BDISABLED_FIELD));

+ 5 - 0
search-console-b2b/src/main/java/com/uas/search/console/b2b/util/ObjectToDocumentUtils.java

@@ -1565,6 +1565,11 @@ public class ObjectToDocumentUtils {
 					String.valueOf(prodSimpleInfo.getB2bDisabled()), Store.YES));
 		}
 
+		if (null != prodSimpleInfo.getErpDate()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.ERPDATE_FIELD),
+					String.valueOf(prodSimpleInfo.getErpDate().getTime()), Store.YES));
+		}
+
 		// 排序字段
 		document.add(new NumericDocValuesField(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.ID_FIELD),
 				prodSimpleInfo.getId()));