Prechádzať zdrojové kódy

采购单搜索更新

Hu Jie 7 rokov pred
rodič
commit
4d4ffd8ebc

+ 33 - 7
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseOrderSimpleInfo.java

@@ -50,6 +50,8 @@ public class PurchaseOrderSimpleInfo {
 
 
 	public static final String USERUU_FIELD = "pu_useruu";
 	public static final String USERUU_FIELD = "pu_useruu";
 
 
+	public static final String SOURCE_FIELD = "pu_source";
+
 	@Id
 	@Id
 	@Column(name = ID_FIELD)
 	@Column(name = ID_FIELD)
 	// TODO
 	// TODO
@@ -120,6 +122,12 @@ public class PurchaseOrderSimpleInfo {
 	@Column(name = USERUU_FIELD)
 	@Column(name = USERUU_FIELD)
 	private Long userUU;
 	private Long userUU;
 
 
+	/**
+	 * 单据来源
+	 */
+	@Column(name = SOURCE_FIELD)
+	private String source;
+
 	public Long getId() {
 	public Long getId() {
 		return id;
 		return id;
 	}
 	}
@@ -221,6 +229,14 @@ public class PurchaseOrderSimpleInfo {
 		this.end = end;
 		this.end = end;
 	}
 	}
 
 
+	public String getSource() {
+		return source;
+	}
+
+	public void setSource(String source) {
+		this.source = source;
+	}
+
 	/**
 	/**
 	 * 获取所有可以搜索的字段列名(索引的field名)
 	 * 获取所有可以搜索的字段列名(索引的field名)
 	 * 
 	 * 
@@ -235,11 +251,21 @@ public class PurchaseOrderSimpleInfo {
 		return fields;
 		return fields;
 	}
 	}
 
 
-	@Override
-	public String toString() {
-		return "PurchaseOrderSimpleInfo [id=" + id + ", code=" + code + ", status=" + status + ", reply=" + reply
-				+ ", end=" + end + ", display=" + display + ", date=" + date + ", enterprise=" + enterprise + ", vend="
-				+ vend + ", orderItems=" + orderItems + "]";
-	}
-
+    @Override
+    public String toString() {
+        return "PurchaseOrderSimpleInfo{" +
+                "id=" + id +
+                ", code='" + code + '\'' +
+                ", status=" + status +
+                ", reply=" + reply +
+                ", end=" + end +
+                ", display=" + display +
+                ", date=" + date +
+                ", enterprise=" + enterprise +
+                ", vend=" + vend +
+                ", orderItems=" + orderItems +
+                ", userUU=" + userUU +
+                ", source='" + source + '\'' +
+                '}';
+    }
 }
 }

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

@@ -1473,6 +1473,10 @@ public class DocumentToObjectUtils {
 					document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseOrderSimpleInfo.ITEMS_FIELD)),
 					document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseOrderSimpleInfo.ITEMS_FIELD)),
 					PurchaseOrderItemSimpleInfo.class));
 					PurchaseOrderItemSimpleInfo.class));
 		}
 		}
+		if (null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseOrderSimpleInfo.SOURCE_FIELD))) {
+			purchaseOrder.setSource(
+					document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseOrderSimpleInfo.SOURCE_FIELD)));
+		}
 		return purchaseOrder;
 		return purchaseOrder;
 	}
 	}
 
 

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

@@ -205,6 +205,10 @@ public class ObjectToDocumentUtils {
 					new TextField(ClassAndTableNameUtils.combineField(tableName, PurchaseOrderSimpleInfo.ITEMS_FIELD),
 					new TextField(ClassAndTableNameUtils.combineField(tableName, PurchaseOrderSimpleInfo.ITEMS_FIELD),
 							JSONObject.toJSONString(purchaseOrder.getOrderItems()), Store.YES));
 							JSONObject.toJSONString(purchaseOrder.getOrderItems()), Store.YES));
 		}
 		}
+		if (!StringUtils.isEmpty(purchaseOrder.getSource())) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, PurchaseOrderSimpleInfo.SOURCE_FIELD),
+					purchaseOrder.getSource(), Store.YES));
+		}
 		// 排序字段
 		// 排序字段
 
 
 		document.add(new NumericDocValuesField(
 		document.add(new NumericDocValuesField(