Просмотр исходного кода

部分注释错误修改;发票关联明细字段错误修改;发票明细加入单据编号orderCode字段用来搜索;不良品入库搜索企业写成本企业,修改为客户;移除getKeyword方法中不需要搜索的字段。

dongbw 9 лет назад
Родитель
Сommit
a4dca70734

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

@@ -129,12 +129,12 @@ public interface SearchService {
 		PURC$PROOFINGSEND("PURC$PROOFINGSEND"),
 
 		/**
-		 * 应付对账单(家)
+		 * 应付对账单(家)
 		 */
 		SALE$ARCHECK("SALE$ARCHECK"),
 
 		/**
-		 * 应收对账单(家)
+		 * 应收对账单(家)
 		 */
 		PURC$APCHECK("PURC$APCHECK");
 		// TODO

+ 15 - 1
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseApBillItemSimpleInfo.java

@@ -22,6 +22,12 @@ public class PurchaseApBillItemSimpleInfo {
 	@Column(name = "papi_id")
 	private Long id;
 
+	/**
+	 * 采购单号
+	 */
+	@Column(name = "papi_ordercode")
+	private String orderCode;
+
 	/**
 	 * 产品
 	 */
@@ -37,6 +43,14 @@ public class PurchaseApBillItemSimpleInfo {
 		this.id = id;
 	}
 
+	public String getOrderCode() {
+		return orderCode;
+	}
+
+	public void setOrderCode(String orderCode) {
+		this.orderCode = orderCode;
+	}
+
 	public ProductSimpleInfo getProduct() {
 		return product;
 	}
@@ -47,6 +61,6 @@ public class PurchaseApBillItemSimpleInfo {
 
 	@Override
 	public String toString() {
-		return "PurchaseApBillItemSimpleInfo [id=" + id + ", product=" + product + "]";
+		return "PurchaseApBillItemSimpleInfo [id=" + id + ", orderCode=" + orderCode + ", product=" + product + "]";
 	}
 }

+ 0 - 1
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseApCheckSimpleInfo.java

@@ -179,7 +179,6 @@ public class PurchaseApCheckSimpleInfo {
 		fields.add(CODE_FIELD);
 		fields.add(VEND_FIELD);
 		fields.add(ITEMS_FIELD);
-		fields.add(CHECKSTATUS_FIELD);
 		return fields;
 	}
 

+ 1 - 1
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseApbillSimpleInfo.java

@@ -45,7 +45,7 @@ public class PurchaseApbillSimpleInfo {
 
 	public static final String VEND_FIELD = "pad_venduu";
 
-	public static final String ITEMS_FIELD = "papi_id";
+	public static final String ITEMS_FIELD = "papi_papid";
 
 	@Id
 	@Column(name = ID_FIELD)

+ 2 - 2
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseBadinSimpleInfo.java

@@ -87,7 +87,7 @@ public class PurchaseBadinSimpleInfo {
 	private EnterpriseSimpleInfo vend;
 
 	/**
-	 * 验收明细
+	 * 不良品入库明细
 	 */
 	@OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER)
 	@JoinColumn(name = ITEMS_FIELD, updatable = false, insertable = false)
@@ -157,7 +157,7 @@ public class PurchaseBadinSimpleInfo {
 	public static List<String> getKeywordFields() {
 		List<String> fields = new ArrayList<>();
 		fields.add(CODE_FIELD);
-		fields.add(VEND_FIELD);
+		fields.add(ENTERPRISE_FIELD);
 		fields.add(ITEMS_FIELD);
 		fields.add(SENDCODE_FIELD);
 		return fields;

+ 0 - 1
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseBadoutSimpleInfo.java

@@ -157,7 +157,6 @@ public class PurchaseBadoutSimpleInfo {
 	public static List<String> getKeywordFields() {
 		List<String> fields = new ArrayList<>();
 		fields.add(CODE_FIELD);
-		fields.add(VEND_FIELD);
 		fields.add(ITEMS_FIELD);
 		fields.add(SENDCODE_FIELD);
 		fields.add(ENTERPRISE_FIELD);

+ 0 - 3
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseOrderSimpleInfo.java

@@ -209,10 +209,7 @@ public class PurchaseOrderSimpleInfo {
 		List<String> fields = new ArrayList<>();
 		fields.add(CODE_FIELD);
 		fields.add(VEND_FIELD);
-		fields.add(DISPLAY_FIELD);
 		fields.add(ITEMS_FIELD);
-		fields.add(REPLY_FIELD);
-		fields.add(END_FIELD);
 		fields.add(ENTERPRISE_FIELD);
 		return fields;
 	}