增加开票索引

search-api-b2b/src/main/java/com/uas/search/b2b/service/SearchService.java

@@ -236,7 +236,12 @@ public interface SearchService {
 		/**
 		 * 购物车
 		 */
-		PURC$CART("PURC$CART");
+		PURC$CART("PURC$CART"),
+
+		/**
+		 * 航天开票
+		 */
+		PURC$APBILLOUT("PURC$APBILLOUT");
 		// TODO
 
 		private Table_name(String phrase) {

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

@@ -1,15 +1,9 @@
 package com.uas.search.console.b2b.model;
 
+import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
 /**
  * 物品信息表(用于建立物料搜索索引)
  * 
@@ -45,6 +39,8 @@ public class ProdSimpleInfo {
 
 	public static final String MATCHESIZE_FIELD = "pr_matchsize";
 
+	public static final String B2BENABLED_FIELD = "pr_b2benabled";
+
 
 	/**
 	 * 标准属性
@@ -72,6 +68,18 @@ public class ProdSimpleInfo {
 
 	public static final String CMPCODE_FIELD = "pr_cmpcode";
 
+	/**
+	 * 开票参数
+	 */
+	public static final String NOVER_FIELD = "pr_goodsnover";
+
+	public static final String TAXNO_FIELD = "pr_goodstaxno";
+
+	public static final String TAXPRE_FIELD = "pr_taxpre";
+
+	public static final String TAXPRECON_FIELD = "pr_taxprecon";
+
+
 	@Id
 	@Column(name = ID_FIELD)
 	private Long id;
@@ -114,6 +122,12 @@ public class ProdSimpleInfo {
 	@Column(name = ISSALE_FIELD)
 	private Short issale;
 
+	/**
+	 * 是否禁用
+	 */
+	@Column(name = B2BENABLED_FIELD)
+	private Short b2benabled;
+
 	/**
 	 * 是否可买<br>
 	 * 1. 可以买<br>
@@ -201,6 +215,30 @@ public class ProdSimpleInfo {
 	@Column(name = MATCHESIZE_FIELD)
 	private Integer matchsize;
 
+	/**
+	 * 编码版本号
+	 */
+	@Column(name = NOVER_FIELD)
+	private String goodsnover;
+
+	/**
+	 * 税收分类编码
+	 */
+	@Column(name = TAXNO_FIELD)
+	private String goodstaxno;
+
+	/**
+	 * 是否享受优惠政策
+	 */
+	@Column(name = TAXPRE_FIELD)
+	private String taxpre;
+
+	/**
+	 * 享受优惠政策内容
+	 */
+	@Column(name = TAXPRECON_FIELD)
+	private String taxprecon;
+
 	public Long getId() {
 		return id;
 	}
@@ -265,6 +303,14 @@ public class ProdSimpleInfo {
 		this.issale = issale;
 	}
 
+	public Short getB2benabled() {
+		return b2benabled;
+	}
+
+	public void setB2benabled(Short b2benabled) {
+		this.b2benabled = b2benabled;
+	}
+
 	public Short getIsPurchase() {
 		return isPurchase;
 	}
@@ -362,6 +408,38 @@ public class ProdSimpleInfo {
 		this.matchsize = matchsize;
 	}
 
+	public String getGoodsnover() {
+		return goodsnover;
+	}
+
+	public void setGoodsnover(String goodsnover) {
+		this.goodsnover = goodsnover;
+	}
+
+	public String getGoodstaxno() {
+		return goodstaxno;
+	}
+
+	public void setGoodstaxno(String goodstaxno) {
+		this.goodstaxno = goodstaxno;
+	}
+
+	public String getTaxpre() {
+		return taxpre;
+	}
+
+	public void setTaxpre(String taxpre) {
+		this.taxpre = taxpre;
+	}
+
+	public String getTaxprecon() {
+		return taxprecon;
+	}
+
+	public void setTaxprecon(String taxprecon) {
+		this.taxprecon = taxprecon;
+	}
+
 	/**
 	 * 获取所有可以搜索的字段列名（索引的field名）
 	 * 
@@ -391,7 +469,7 @@ public class ProdSimpleInfo {
 				+ 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 + "]";
+				+ matchsize + ", b2benabled=" + b2benabled + "]";
 	}
 
 }

search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseApBillOutItemSimpleInfo.java

@@ -0,0 +1,269 @@
+package com.uas.search.console.b2b.model;
+
+import javax.persistence.*;
+
+/**
+ * 航天开票单明细
+ * 
+ *
+ */
+@Table(name = "purc$apbilloutitem")
+@Entity
+public class PurchaseApBillOutItemSimpleInfo {
+
+	@Id
+	@Column(name = "pai_id")
+	private Long id;
+
+	/**
+	 * 行号
+	 */
+	@Column(name = "pai_number")
+	private Short number;
+
+	/**
+	 * 状态
+	 */
+	@Column(name = "pai_status")
+	private Integer status;
+
+	/**
+	 * 状态码
+	 */
+	@Column(name = "pai_statuscode")
+	private Integer statusCode;
+
+	/**
+	 * 开票单价
+	 */
+	@Column(name = "pai_nowprice")
+	private Double nowPrice;
+
+	/**
+	 * 成本单价
+	 */
+	@Column(name = "pai_costprice")
+	private Double costPrice;
+
+	/**
+	 * 发票单价
+	 */
+	@Column(name = "pai_price")
+	private Double price;
+
+	/**
+	 * 税率(%)
+	 */
+	@Column(name = "pai_taxrate")
+	private Double taxrate;
+
+	/**
+	 * 发票数量
+	 */
+	@Column(name = "pai_qty")
+	private Double qty;
+
+	/**
+	 * 开票数量
+	 */
+	@Column(name = "pai_nowqty")
+	private Double NowQty;
+
+	/**
+	 * 客户物料ID
+	 */
+	@OneToOne
+	@JoinColumn(name = "pai_prid", insertable = false, updatable = false)
+	private ProdSimpleInfo product;
+
+	/*@Column(name = "pai_prid")
+	private Long prid;*/
+
+	/**
+	 * 客户料号
+	 */
+	@Column(name = "pai_prodcode")
+	private String prodCode;
+
+	/**
+	 * 发票单号
+	 */
+	@Column(name = "pai_ordercode")
+	private String orderCode;
+
+	/**
+	 * 单据编号
+	 */
+	@Column(name = "pai_code")
+	private String code;
+
+	/**
+	 * 主表ID
+	 */
+	@Column(name = "pai_billoutid")
+	private Long billOutId;
+
+	/**
+	 * 发票ID
+	 */
+	@Column(name = "pai_orderid")
+	private Long orderId;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Short getNumber() {
+		return number;
+	}
+
+	public void setNumber(Short number) {
+		this.number = number;
+	}
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	public Integer getStatusCode() {
+		return statusCode;
+	}
+
+	public void setStatusCode(Integer statusCode) {
+		this.statusCode = statusCode;
+	}
+
+	public Double getNowPrice() {
+		return nowPrice;
+	}
+
+	public void setNowPrice(Double nowPrice) {
+		this.nowPrice = nowPrice;
+	}
+
+	public Double getCostPrice() {
+		return costPrice;
+	}
+
+	public void setCostPrice(Double costPrice) {
+		this.costPrice = costPrice;
+	}
+
+	public Double getPrice() {
+		return price;
+	}
+
+	public void setPrice(Double price) {
+		this.price = price;
+	}
+
+	public Double getTaxrate() {
+		return taxrate;
+	}
+
+	public void setTaxrate(Double taxrate) {
+		this.taxrate = taxrate;
+	}
+
+	public Double getQty() {
+		return qty;
+	}
+
+	public void setQty(Double qty) {
+		this.qty = qty;
+	}
+
+	public Double getNowQty() {
+		return NowQty;
+	}
+
+	public void setNowQty(Double nowQty) {
+		NowQty = nowQty;
+	}
+
+/*	public Long getPrid() {
+		return prid;
+	}
+
+	public void setPrid(Long prid) {
+		this.prid = prid;
+	}*/
+
+	public ProdSimpleInfo getProduct() {
+		return product;
+	}
+
+	public void setProduct(ProdSimpleInfo product) {
+		this.product = product;
+	}
+
+	public String getProdCode() {
+		return prodCode;
+	}
+
+	public void setProdCode(String prodCode) {
+		this.prodCode = prodCode;
+	}
+
+	public String getOrderCode() {
+		return orderCode;
+	}
+
+	public void setOrderCode(String orderCode) {
+		this.orderCode = orderCode;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public Long getBillOutId() {
+		return billOutId;
+	}
+
+	public void setBillOutId(Long billOutId) {
+		this.billOutId = billOutId;
+	}
+
+	public Long getOrderId() {
+		return orderId;
+	}
+
+	public void setOrderId(Long orderId) {
+		this.orderId = orderId;
+	}
+
+	@Override
+	public String toString() {
+		return "PurchaseApBillOutItemSimpleInfo{" +
+				"id=" + id +
+				", number=" + number +
+				", status=" + status +
+				", statusCode=" + statusCode +
+				", nowPrice=" + nowPrice +
+				", costPrice=" + costPrice +
+				", price=" + price +
+				", taxrate=" + taxrate +
+				", qty=" + qty +
+				", NowQty=" + NowQty +
+				//", prid=" + prid +
+				", prodCode='" + prodCode + '\'' +
+				", orderCode='" + orderCode + '\'' +
+				", code='" + code + '\'' +
+				", billOutId=" + billOutId +
+				", orderId=" + orderId +
+				'}';
+	}
+}

search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseApBillOutSimpleInfo.java

@@ -0,0 +1,382 @@
+package com.uas.search.console.b2b.model;
+
+import javax.persistence.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Created by 黄诚天 on 2017/7/4.
+ */
+@Table(name = PurchaseApBillOutSimpleInfo.TABLE_NAME)
+@Entity
+public class PurchaseApBillOutSimpleInfo {
+
+    public static final String TABLE_NAME = "PURC$APBILLOUT";
+
+    /**
+     * 各字段列名（也是存储索引时的field名）
+     */
+    public static final String ID_FIELD = "pabo_id";
+    public static final String TAXSUM_FIELD = "pabo_taxsum";
+    public static final String DIFFER_FIELD = "pabo_differ";
+    public static final String DATE_FIELD = "pabo_recorddate";
+    public static final String RECORDER_FIELD = "pabo_recorder";
+    public static final String CHECKSTATUS_FIELD = "pabo_checkstatus";
+    public static final String REMARK_FIELD = "pabo_remark";
+    public static final String AUDITDATE_FIELD = "pabo_auditdate";
+    public static final String RESDATE_FIELD = "pabo_resdate";
+    public static final String RESMAN_FIELD = "pabo_resman";
+    public static final String STATUS_FIELD = "pabo_status";
+    public static final String AMOUNT_FIELD = "pabo_amount";
+    public static final String PAYAMOUNT_FIELD = "pabo_payamount";
+    public static final String CURRENCY_FIELD = "pabo_currency";
+    public static final String RATE_FIELD = "pabo_rate";
+    public static final String CUSTUU_FIELD = "pabo_custuu";
+    public static final String CUSTNAME_FIELD = "pabo_custname";
+    public static final String ENUU_FIELD = "pabo_enuu";
+    public static final String CODE_FIELD = "pabo_code";
+    public static final String PRINT_FIELD = "pabo_print";
+    public static final String ITEMS_FIELD = "pai_paboid";
+
+
+
+
+
+
+    @Id
+    @Column(name = ID_FIELD)
+    private Long id;
+
+    /**
+     * 税金合计
+     */
+    @Column(name = TAXSUM_FIELD)
+    private Double taxSum;
+
+    /**
+     * 税金差异
+     */
+    @Column(name = DIFFER_FIELD)
+    private Double differ;
+
+    /**
+     * 录单日期
+     */
+    @Column(name = DATE_FIELD)
+    private Date recordDate;
+
+    /**
+     * 录单人
+     */
+    @Column(name = RECORDER_FIELD)
+    private String recorder;
+
+
+    /**
+     * 开票状态
+     */
+    @Column(name = CHECKSTATUS_FIELD)
+    private String checkStatus;
+
+    /**
+     * 备注
+     */
+    @Column(name = REMARK_FIELD)
+    private String remark;
+
+    /**
+     * 提交日期
+     */
+    @Column(name = AUDITDATE_FIELD)
+    private Date auditDate;
+
+    /**
+     * 作废日期
+     */
+    @Column(name = RESDATE_FIELD)
+    private Date resDate;
+
+    /**
+     * 作废人
+     */
+    @Column(name = RESMAN_FIELD)
+    private String resMan;
+
+    /**
+     * 状态
+     */
+    @Column(name = STATUS_FIELD)
+    private Short status;
+
+    /**
+     * 开票金额
+     */
+    @Column(name = AMOUNT_FIELD)
+    private Double amount;
+
+    /**
+     * 已付款金额
+     */
+    @Column(name = PAYAMOUNT_FIELD)
+    private Double payAmount;
+
+    /**
+     * 币别
+     */
+    @Column(name = CURRENCY_FIELD)
+    private String currency;
+
+    /**
+     * 汇率
+     */
+    @Column(name = RATE_FIELD)
+    private Double rate;
+
+
+    /**
+     * 客户UU
+     */
+    @Column(name = CUSTUU_FIELD)
+    private Long custUu;
+
+    /**
+     * 客户名称
+     */
+    @Column(name = CUSTNAME_FIELD)
+    private String custName;
+
+    /**
+     * 本企业UU
+     */
+    @Column(name = ENUU_FIELD)
+    private Long enUu;
+
+    /**
+     * 单据编号
+     */
+    @Column(name = CODE_FIELD)
+    private String code;
+
+    /**
+     * 打印次数
+     */
+    @Column(name = PRINT_FIELD)
+    private Short print;
+
+    /**
+     * 开票单明细行
+     */
+    @OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER)
+    @JoinColumn(name = ITEMS_FIELD, insertable = false, updatable = false)
+    private Set<PurchaseApBillOutItemSimpleInfo> items;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Double getTaxSum() {
+        return taxSum;
+    }
+
+    public void setTaxSum(Double taxSum) {
+        this.taxSum = taxSum;
+    }
+
+    public Double getDiffer() {
+        return differ;
+    }
+
+    public void setDiffer(Double differ) {
+        this.differ = differ;
+    }
+
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+
+    public String getRecorder() {
+        return recorder;
+    }
+
+    public void setRecorder(String recorder) {
+        this.recorder = recorder;
+    }
+
+    public String getCheckStatus() {
+        return checkStatus;
+    }
+
+    public void setCheckStatus(String checkStatus) {
+        this.checkStatus = checkStatus;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+
+    public Date getResDate() {
+        return resDate;
+    }
+
+    public void setResDate(Date resDate) {
+        this.resDate = resDate;
+    }
+
+    public String getResMan() {
+        return resMan;
+    }
+
+    public void setResMan(String resMan) {
+        this.resMan = resMan;
+    }
+
+    public Short getStatus() {
+        return status;
+    }
+
+    public void setStatus(Short status) {
+        this.status = status;
+    }
+
+    public Double getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Double amount) {
+        this.amount = amount;
+    }
+
+    public Double getPayAmount() {
+        return payAmount;
+    }
+
+    public void setPayAmount(Double payAmount) {
+        this.payAmount = payAmount;
+    }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
+    public Double getRate() {
+        return rate;
+    }
+
+    public void setRate(Double rate) {
+        this.rate = rate;
+    }
+
+    public Long getCustUu() {
+        return custUu;
+    }
+
+    public void setCustUu(Long custUu) {
+        this.custUu = custUu;
+    }
+
+    public String getCustName() {
+        return custName;
+    }
+
+    public void setCustName(String custName) {
+        this.custName = custName;
+    }
+
+    public Long getEnUu() {
+        return enUu;
+    }
+
+    public void setEnUu(Long enUu) {
+        this.enUu = enUu;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Short getPrint() {
+        return print;
+    }
+
+    public void setPrint(Short print) {
+        this.print = print;
+    }
+
+    public Set<PurchaseApBillOutItemSimpleInfo> getItems() {
+        return items;
+    }
+
+    public void setItems(Set<PurchaseApBillOutItemSimpleInfo> items) {
+        this.items = items;
+    }
+
+    @Override
+    public String toString() {
+        return "PurchaseApBillOutSimpleInfo{" +
+                "id=" + id +
+                ", taxSum=" + taxSum +
+                ", differ=" + differ +
+                ", recordDate=" + recordDate +
+                ", recorder='" + recorder + '\'' +
+                ", checkStatus='" + checkStatus + '\'' +
+                ", remark='" + remark + '\'' +
+                ", auditDate=" + auditDate +
+                ", resDate=" + resDate +
+                ", resMan='" + resMan + '\'' +
+                ", status=" + status +
+                ", amount=" + amount +
+                ", payAmount=" + payAmount +
+                ", currency='" + currency + '\'' +
+                ", rate=" + rate +
+                ", custUu=" + custUu +
+                ", custName='" + custName + '\'' +
+                ", enUu=" + enUu +
+                ", code='" + code + '\'' +
+                ", print=" + print +
+                ", items=" + items +
+                '}';
+    }
+
+    /**
+     * 获取除了status外的所有字段的列名（field名）
+     *
+     * @return
+     */
+    public static List<String> getKeywordFields() {
+        List<String> fields = new ArrayList<>();
+        fields.add(CODE_FIELD);
+        fields.add(CUSTUU_FIELD);
+        fields.add(ITEMS_FIELD);
+        return fields;
+    }
+}

search-console-b2b/src/main/java/com/uas/search/console/b2b/util/ClassAndTableNameUtils.java

@@ -1,19 +1,10 @@
 package com.uas.search.console.b2b.util;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.jpa.repository.JpaRepository;
-
 import com.uas.search.b2b.exception.SearchException;
 import com.uas.search.b2b.service.SearchService.Table_name;
 import com.uas.search.console.b2b.core.util.ContextUtils;
+import com.uas.search.console.b2b.dao.*;
+import com.uas.search.console.b2b.model.*;
 import com.uas.search.console.b2b.dao.B2BSaleTenderSimpleInfoDao;
 import com.uas.search.console.b2b.dao.CartSimpleInfoDao;
 import com.uas.search.console.b2b.dao.CustmerSimpleInfoDao;
@@ -98,6 +89,17 @@ import com.uas.search.console.b2b.model.SaleSendSimpleInfo;
 import com.uas.search.console.b2b.model.VendorSimpleInfo;
 import com.uas.search.console.b2b.platformmanager.dao.UserSpaceDetailSimpleInfoDao;
 import com.uas.search.console.b2b.platformmanager.model.UserSpaceDetailSimpleInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
 
 /**
  * 实体类与单据类型的工具类
@@ -163,6 +165,7 @@ public class ClassAndTableNameUtils {
 		entityClasses.add(ProdStandardSimpleInfo.class);
 		entityClasses.add(KindSimpleInfo.class);
 		entityClasses.add(B2BSaleTenderSimpleInfo.class);
+		entityClasses.add(PurchaseApBillOutSimpleInfo.class);
 		// TODO 其他表
 
 		// entityClasses和entityDaoClasses对于表的添加顺序必须一致
@@ -209,6 +212,7 @@ public class ClassAndTableNameUtils {
 		entityDaoClasses.add(ProdStandardSimpleInfoDao.class);
 		entityDaoClasses.add(KindSimpleInfoDao.class);
 		entityDaoClasses.add(B2BSaleTenderSimpleInfoDao.class);
+		entityDaoClasses.add(PurchaseApBillOutSimpleInfoDao.class);
 		// TODO 其他表的Dao
 	}
 

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

@@ -1,15 +1,10 @@
 package com.uas.search.console.b2b.util;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.lucene.document.Document;
-
 import com.alibaba.dubbo.common.utils.StringUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.search.b2b.exception.SearchException;
 import com.uas.search.b2b.service.SearchService.Table_name;
+import com.uas.search.console.b2b.model.*;
 import com.uas.search.console.b2b.model.B2BSaleTenderItemSimpleInfo;
 import com.uas.search.console.b2b.model.B2BSaleTenderSimpleInfo;
 import com.uas.search.console.b2b.model.BrandSimpleInfo;
@@ -79,6 +74,11 @@ import com.uas.search.console.b2b.model.SaleSendSimpleInfo;
 import com.uas.search.console.b2b.model.UserSimpleInfo;
 import com.uas.search.console.b2b.model.VendorSimpleInfo;
 import com.uas.search.console.b2b.platformmanager.model.UserSpaceDetailSimpleInfo;
+import org.apache.lucene.document.Document;
+
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * 将Document转换为对象的工具类
@@ -186,6 +186,8 @@ public class DocumentToObjectUtils {
 			return (T) toKindSimpleInfo(document);
 		} else if (clazz == B2BSaleTenderSimpleInfo.class) {
 			return (T) toB2BSaleTenderSimpleInfo(document);
+		} else if (clazz == PurchaseApBillOutSimpleInfo.class) {
+			return (T) toPurchaseApBillOutSimpleInfo(document);
 		}
 
 		// TODO 其他表
@@ -1783,6 +1785,31 @@ public class DocumentToObjectUtils {
 		if (null != pcmpCode) {
 			prodSimpleInfo.setPcmpcode(pcmpCode);
 		}
+
+		//开票参数
+		String goodsnover = document.get(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.NOVER_FIELD));
+		if (null != goodsnover) {
+			prodSimpleInfo.setPcmpcode(goodsnover);
+		}
+		String goodstaxno = document.get(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.TAXNO_FIELD));
+		if (null != goodstaxno) {
+			prodSimpleInfo.setPcmpcode(goodstaxno);
+		}
+		String taxpre = document.get(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.TAXPRE_FIELD));
+		if (null != taxpre) {
+			prodSimpleInfo.setPcmpcode(taxpre);
+		}
+		String taxprecon = document.get(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.TAXPRECON_FIELD));
+		if (null != taxprecon) {
+			prodSimpleInfo.setPcmpcode(taxprecon);
+		}
+
+		//禁用物料参数
+		String b2benabled = document.get(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.B2BENABLED_FIELD));
+		if (null != b2benabled) {
+			prodSimpleInfo.setB2benabled(Short.valueOf(b2benabled));
+		}
+
 		return prodSimpleInfo;
 	}
 
@@ -2121,7 +2148,7 @@ public class DocumentToObjectUtils {
 
 	/**
 	 * 将Document转换成B2BSaleTenderSimpleInfo对象
-	 * 
+	 *
 	 * @param document
 	 * @return
 	 */
@@ -2537,6 +2564,101 @@ public class DocumentToObjectUtils {
 	}
 
 
+	private static PurchaseApBillOutSimpleInfo toPurchaseApBillOutSimpleInfo(Document document) {
+		if (document == null){
+			return null;
+		}
+		Table_name tableName = ClassAndTableNameUtils.toTableName(PurchaseApBillOutSimpleInfo.class);
+		PurchaseApBillOutSimpleInfo purchaseApBillOutSimpleInfo = new PurchaseApBillOutSimpleInfo();
+		if(null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.ID_FIELD))){
+			purchaseApBillOutSimpleInfo.setId(Long.parseLong(document
+					.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.ID_FIELD))));
+		}
+		if(null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.AMOUNT_FIELD))){
+			purchaseApBillOutSimpleInfo.setAmount(Double.parseDouble(document
+					.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.AMOUNT_FIELD))));
+		}
+		if(null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.AUDITDATE_FIELD))){
+			purchaseApBillOutSimpleInfo.setAuditDate(new Date(Long.valueOf(document
+					.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.AUDITDATE_FIELD)))));
+		}
+		if(null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.CHECKSTATUS_FIELD))){
+			purchaseApBillOutSimpleInfo.setCheckStatus(document
+					.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.CHECKSTATUS_FIELD)));
+		}
+		if(null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.CODE_FIELD))){
+			purchaseApBillOutSimpleInfo.setCode(document
+					.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.CODE_FIELD)));
+		}
+		if(null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.TAXSUM_FIELD))){
+			purchaseApBillOutSimpleInfo.setTaxSum(Double.parseDouble(document
+					.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.TAXSUM_FIELD))));
+		}
+		if(null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.CURRENCY_FIELD))){
+			purchaseApBillOutSimpleInfo.setCurrency(document
+					.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.CURRENCY_FIELD)));
+		}
+		if(null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.CUSTNAME_FIELD))){
+			purchaseApBillOutSimpleInfo.setCustName(document
+					.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.CUSTNAME_FIELD)));
+		}
+		if(null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.PAYAMOUNT_FIELD))){
+			purchaseApBillOutSimpleInfo.setPayAmount(Double.parseDouble(document
+					.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.PAYAMOUNT_FIELD))));
+		}
+		if(null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.CUSTUU_FIELD))){
+			purchaseApBillOutSimpleInfo.setCustUu(Long.parseLong(document
+					.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.CUSTUU_FIELD))));
+		}
+		if(null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.ENUU_FIELD))){
+			purchaseApBillOutSimpleInfo.setEnUu(Long.parseLong(document
+					.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.ENUU_FIELD))));
+		}
+		if(null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.DIFFER_FIELD))){
+			purchaseApBillOutSimpleInfo.setDiffer(Double.parseDouble(document
+					.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.DIFFER_FIELD))));
+		}
+		if(null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.ITEMS_FIELD))){
+			purchaseApBillOutSimpleInfo.setItems(toSet(
+					document.get(
+							ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.ITEMS_FIELD)),PurchaseApBillOutItemSimpleInfo.class));
+		}
+		if(null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.PRINT_FIELD))){
+			purchaseApBillOutSimpleInfo.setPrint(Short.parseShort(document
+					.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.PRINT_FIELD))));
+		}
+		if(null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.RATE_FIELD))){
+			purchaseApBillOutSimpleInfo.setRate(Double.parseDouble(document
+					.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.RATE_FIELD))));
+		}
+		if(null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.DATE_FIELD))){
+			purchaseApBillOutSimpleInfo.setRecordDate(new Date(Long.valueOf(document
+					.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.DATE_FIELD)))));
+		}
+		if(null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.REMARK_FIELD))){
+			purchaseApBillOutSimpleInfo.setRemark(document
+					.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.REMARK_FIELD)));
+		}
+		if(null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.RECORDER_FIELD))){
+			purchaseApBillOutSimpleInfo.setRecorder(document
+					.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.RECORDER_FIELD)));
+		}
+		if(null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.RESDATE_FIELD))){
+			purchaseApBillOutSimpleInfo.setResDate(new Date(Long.valueOf(document
+					.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.RESDATE_FIELD)))));
+		}
+		if(null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.RESMAN_FIELD))){
+			purchaseApBillOutSimpleInfo.setResMan(document
+					.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.RESMAN_FIELD)));
+		}
+		if(null != document.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.STATUS_FIELD))){
+			purchaseApBillOutSimpleInfo.setStatus(Short.parseShort(document
+					.get(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.STATUS_FIELD))));
+		}
+
+		return purchaseApBillOutSimpleInfo;
+	}
+
 	/**
 	 * 将json字符串转为Set<T>对象
 	 * 

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

@@ -1,19 +1,10 @@
 package com.uas.search.console.b2b.util;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.FloatDocValuesField;
-import org.apache.lucene.document.LongField;
-import org.apache.lucene.document.NumericDocValuesField;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
-import org.springframework.util.StringUtils;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.core.model.Constant;
 import com.uas.search.b2b.service.SearchService.Table_name;
+import com.uas.search.console.b2b.model.*;
 import com.uas.search.console.b2b.model.B2BSaleTenderSimpleInfo;
 import com.uas.search.console.b2b.model.CartSimpleInfo;
 import com.uas.search.console.b2b.model.CustmerSimpleInfo;
@@ -56,8 +47,11 @@ import com.uas.search.console.b2b.model.SaleQuotationSimpleInfo;
 import com.uas.search.console.b2b.model.SaleSendSimpleInfo;
 import com.uas.search.console.b2b.model.VendorSimpleInfo;
 import com.uas.search.console.b2b.platformmanager.model.UserSpaceDetailSimpleInfo;
-
 import net.sf.ehcache.search.SearchException;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.lucene.document.*;
+import org.apache.lucene.document.Field.Store;
+import org.springframework.util.StringUtils;
 
 /**
  * 将对象转换为Document的工具类
@@ -162,6 +156,8 @@ public class ObjectToDocumentUtils {
 			return toDocument((KindSimpleInfo) object);
 		} else if (object instanceof B2BSaleTenderSimpleInfo) {
 			return toDocument((B2BSaleTenderSimpleInfo) object);
+		} else if (object instanceof PurchaseApBillOutSimpleInfo) {
+			return toDocument((PurchaseApBillOutSimpleInfo) object);
 		}
 		// TODO 其他表
 		else {
@@ -1558,6 +1554,29 @@ public class ObjectToDocumentUtils {
 		}
 		document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.ENTERPRISE_FIELD),
 				JSON.toJSONString(prodSimpleInfo.getEnterprise()), Store.YES));
+
+		if (null != prodSimpleInfo.getGoodsnover()) {
+			document.add(new TextField(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.NOVER_FIELD),
+					String.valueOf(prodSimpleInfo.getGoodsnover()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getGoodstaxno()) {
+			document.add(new TextField(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.TAXNO_FIELD),
+					String.valueOf(prodSimpleInfo.getGoodstaxno()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getTaxpre()) {
+			document.add(new TextField(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.TAXPRE_FIELD),
+					String.valueOf(prodSimpleInfo.getTaxpre()), Store.YES));
+		}
+		if (null != prodSimpleInfo.getTaxprecon()) {
+			document.add(new TextField(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.TAXPRECON_FIELD),
+					String.valueOf(prodSimpleInfo.getTaxprecon()), Store.YES));
+		}
+
+		if (null != prodSimpleInfo.getB2benabled()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.B2BENABLED_FIELD),
+					String.valueOf(prodSimpleInfo.getB2benabled()), Store.YES));
+		}
+
 		// 排序字段
 		document.add(new NumericDocValuesField(ClassAndTableNameUtils.combineField(tableName, ProdSimpleInfo.ID_FIELD),
 				prodSimpleInfo.getId()));
@@ -2250,7 +2269,7 @@ public class ObjectToDocumentUtils {
 
 	/**
 	 * 将SaleTenderSimpleInfo转换为Document
-	 * 
+	 *
 	 * @param saleTender
 	 * @return
 	 */
@@ -2975,4 +2994,111 @@ public class ObjectToDocumentUtils {
 				kindSimpleInfo.getId()));
 		return document;
 	}
+
+	/**
+	 * 将PurchaseApBillOutSimpleInfo转换成Document
+	 *
+	 * @author huangct
+	 * @param purchaseApBillOutSimpleInfo
+	 * @return
+	 */
+	public static Document toDocument(PurchaseApBillOutSimpleInfo purchaseApBillOutSimpleInfo) {
+		if (purchaseApBillOutSimpleInfo == null || purchaseApBillOutSimpleInfo.getId() == null) {
+			return null;
+		}
+		Table_name tableName = ClassAndTableNameUtils.toTableName(PurchaseApBillOutSimpleInfo.class);
+		Document document = new Document();
+		document.add(new StringField(ClassAndTableNameUtils
+				.combineField(tableName, PurchaseApBillOutSimpleInfo.ID_FIELD),
+				String.valueOf(purchaseApBillOutSimpleInfo.getId()), Store.YES));
+
+		if (null != purchaseApBillOutSimpleInfo.getAmount()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, purchaseApBillOutSimpleInfo.AMOUNT_FIELD),
+					String.valueOf(purchaseApBillOutSimpleInfo.getAmount()), Store.YES));
+		}
+		if (null != purchaseApBillOutSimpleInfo.getAuditDate()) {
+			document.add(new LongField(ClassAndTableNameUtils.combineField(tableName, purchaseApBillOutSimpleInfo.AUDITDATE_FIELD),
+					Long.valueOf(purchaseApBillOutSimpleInfo.getAuditDate().getTime()), Store.YES));
+		}
+		if (null != purchaseApBillOutSimpleInfo.getCheckStatus()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, purchaseApBillOutSimpleInfo.CHECKSTATUS_FIELD),
+					String.valueOf(purchaseApBillOutSimpleInfo.getCheckStatus()), Store.YES));
+		}
+		if (null != purchaseApBillOutSimpleInfo.getCode()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, purchaseApBillOutSimpleInfo.CODE_FIELD),
+					String.valueOf(purchaseApBillOutSimpleInfo.getCode()), Store.YES));
+		}
+		if (null != purchaseApBillOutSimpleInfo.getCurrency()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, purchaseApBillOutSimpleInfo.CURRENCY_FIELD),
+					String.valueOf(purchaseApBillOutSimpleInfo.getCurrency()), Store.YES));
+		}
+		if (null != purchaseApBillOutSimpleInfo.getCustName()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, purchaseApBillOutSimpleInfo.CUSTNAME_FIELD),
+					String.valueOf(purchaseApBillOutSimpleInfo.getCustName()), Store.YES));
+		}
+		if (null != purchaseApBillOutSimpleInfo.getCustUu()) {
+			document.add(new LongField(ClassAndTableNameUtils.combineField(tableName, purchaseApBillOutSimpleInfo.CUSTUU_FIELD),
+					Long.valueOf(purchaseApBillOutSimpleInfo.getCustUu()), Store.YES));
+		}
+		if (null != purchaseApBillOutSimpleInfo.getItems()) {
+			document.add(new TextField(ClassAndTableNameUtils.combineField(tableName, purchaseApBillOutSimpleInfo.ITEMS_FIELD),
+					JSONObject.toJSONString(purchaseApBillOutSimpleInfo.getItems()), Store.YES));
+		}
+		if (null != purchaseApBillOutSimpleInfo.getDiffer()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, purchaseApBillOutSimpleInfo.DIFFER_FIELD),
+					String.valueOf(purchaseApBillOutSimpleInfo.getDiffer()), Store.YES));
+		}
+		if (null != purchaseApBillOutSimpleInfo.getPayAmount()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, purchaseApBillOutSimpleInfo.PAYAMOUNT_FIELD),
+					String.valueOf(purchaseApBillOutSimpleInfo.getPayAmount()), Store.YES));
+		}
+		if (null != purchaseApBillOutSimpleInfo.getPrint()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, purchaseApBillOutSimpleInfo.PRINT_FIELD),
+					String.valueOf(purchaseApBillOutSimpleInfo.getPrint()), Store.YES));
+		}
+		if (null != purchaseApBillOutSimpleInfo.getRate()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, purchaseApBillOutSimpleInfo.RATE_FIELD),
+					String.valueOf(purchaseApBillOutSimpleInfo.getRate()), Store.YES));
+		}
+		if (null != purchaseApBillOutSimpleInfo.getRecordDate()) {
+			document.add(new LongField(ClassAndTableNameUtils.combineField(tableName, purchaseApBillOutSimpleInfo.DATE_FIELD),
+					Long.valueOf(purchaseApBillOutSimpleInfo.getRecordDate().getTime()), Store.YES));
+		}
+		if (null != purchaseApBillOutSimpleInfo.getRecorder()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, purchaseApBillOutSimpleInfo.RECORDER_FIELD),
+					String.valueOf(purchaseApBillOutSimpleInfo.getRecorder()), Store.YES));
+		}
+		if (null != purchaseApBillOutSimpleInfo.getRemark()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, purchaseApBillOutSimpleInfo.REMARK_FIELD),
+					String.valueOf(purchaseApBillOutSimpleInfo.getRemark()), Store.YES));
+		}
+		if (null != purchaseApBillOutSimpleInfo.getResDate()) {
+			document.add(new LongField(ClassAndTableNameUtils.combineField(tableName, purchaseApBillOutSimpleInfo.RESDATE_FIELD),
+					Long.valueOf(purchaseApBillOutSimpleInfo.getResDate().getTime()), Store.YES));
+		}
+		if (null != purchaseApBillOutSimpleInfo.getResMan()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, purchaseApBillOutSimpleInfo.RESMAN_FIELD),
+					String.valueOf(purchaseApBillOutSimpleInfo.getResMan()), Store.YES));
+		}
+		if (null != purchaseApBillOutSimpleInfo.getStatus()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, purchaseApBillOutSimpleInfo.STATUS_FIELD),
+					String.valueOf(purchaseApBillOutSimpleInfo.getStatus()), Store.YES));
+		}
+		if (null != purchaseApBillOutSimpleInfo.getTaxSum()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, purchaseApBillOutSimpleInfo.TAXSUM_FIELD),
+					String.valueOf(purchaseApBillOutSimpleInfo.getTaxSum()), Store.YES));
+		}
+		if (null != purchaseApBillOutSimpleInfo.getEnUu()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, purchaseApBillOutSimpleInfo.ENUU_FIELD),
+					purchaseApBillOutSimpleInfo.getEnUu().toString(), Store.YES));
+		}
+		//TODO
+
+		// 排序字段
+		document.add(new NumericDocValuesField(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.ID_FIELD),
+				purchaseApBillOutSimpleInfo.getId()));
+		document.add(new NumericDocValuesField(ClassAndTableNameUtils.combineField(tableName, PurchaseApBillOutSimpleInfo.DATE_FIELD),
+				purchaseApBillOutSimpleInfo.getRecordDate().getTime()));
+		return document;
+	}
 }