Преглед изворни кода

应付对账单显示方法和搜索方法修改,委外变更单搜索条件去掉本企业信息搜索。

dongbw пре 9 година
родитељ
комит
63a6bac5e0

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

@@ -93,11 +93,6 @@ public interface SearchService {
 		 */
 		 */
 		MAKE$ACCEPT("MAKE$ACCEPT"),
 		MAKE$ACCEPT("MAKE$ACCEPT"),
 
 
-		/**
-		 * 委外变更单
-		 */
-		MAKE$CHANGES("MAKE$CHANGES"),
-
 		/**
 		/**
 		 * 委外变更单详情
 		 * 委外变更单详情
 		 */
 		 */

+ 6 - 27
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/MakeChangesSimpleInfo.java

@@ -10,60 +10,39 @@ import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.persistence.Table;
 
 
 /**
 /**
- * 委外变更单(主表,变更信息在明细表
+ * 委外变更单(作为变更明细的从表,因为可能一条对应多条明细,而明细只对应一条委外变更单记录
  * 
  * 
  * @author suntg
  * @author suntg
  * @since 2015年8月6日下午2:18:11
  * @since 2015年8月6日下午2:18:11
  */
  */
-@Table(name = MakeChangesSimpleInfo.TABLE_NAME)
+@Table(name = "MAKE$CHANGES")
 @Entity
 @Entity
 public class MakeChangesSimpleInfo {
 public class MakeChangesSimpleInfo {
 
 
-	/**
-	 * 表名
-	 */
-	public static final String TABLE_NAME = "MAKE$CHANGES";
-
-	/**
-	 * 各字段列名(也是存储索引时的field名)
-	 */
-	public static final String ID_FIELD = "mc_id";
-
-	public static final String CODE_FIELD = "mc_code";
-
-	public static final String DATE_FIELD = "mc_indate";
-
-	public static final String ENTERPRISE_FIELD = "mc_enuu";
 
 
 	@Id
 	@Id
-	@Column(name = ID_FIELD)
+	@Column(name = "mc_id")
 	private Long id;
 	private Long id;
 
 
 	/**
 	/**
 	 * 日期
 	 * 日期
 	 */
 	 */
-	@Column(name = DATE_FIELD)
+	@Column(name = "mc_indate")
 	private Date date;
 	private Date date;
 
 
 	/**
 	/**
 	 * 采购变更单所属企业(客户)
 	 * 采购变更单所属企业(客户)
 	 */
 	 */
 	@OneToOne
 	@OneToOne
-	@JoinColumn(name = ENTERPRISE_FIELD, insertable = false, updatable = false)
+	@JoinColumn(name = "mc_enuu", insertable = false, updatable = false)
 	private EnterpriseSimpleInfo enterprise;
 	private EnterpriseSimpleInfo enterprise;
 
 
 	/**
 	/**
 	 * 采购变更单号
 	 * 采购变更单号
 	 */
 	 */
-	@Column(name = CODE_FIELD)
+	@Column(name = "mc_code")
 	private String code;
 	private String code;
 
 
-	// /**
-	// * 采购变更单明细
-	// */
-	// @OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER)
-	// @JoinColumn(name = ITEMS_FIELD, insertable = false, updatable = false)
-	// private Set<MakeOrderChangeItemSimpleInfo> orderChangeItems;
 
 
 	public Long getId() {
 	public Long getId() {
 		return id;
 		return id;

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

@@ -132,7 +132,6 @@ public class MakeOrderChangeItemSimpleInfo {
 	public static List<String> getKeywordFields() {
 	public static List<String> getKeywordFields() {
 		List<String> fields = new ArrayList<>();
 		List<String> fields = new ArrayList<>();
 		fields.add(CODE_FIELD);
 		fields.add(CODE_FIELD);
-		fields.add(VEND_FIELD);
 		fields.add(PRODUCT_FIELD);
 		fields.add(PRODUCT_FIELD);
 		fields.add(MAKE_FIELD);
 		fields.add(MAKE_FIELD);
 		return fields;
 		return fields;

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

@@ -178,7 +178,6 @@ public class PurchaseApCheckSimpleInfo {
 		List<String> fields = new ArrayList<>();
 		List<String> fields = new ArrayList<>();
 		fields.add(CODE_FIELD);
 		fields.add(CODE_FIELD);
 		fields.add(VEND_FIELD);
 		fields.add(VEND_FIELD);
-		fields.add(ENTERPRISE_FIELD);
 		fields.add(ITEMS_FIELD);
 		fields.add(ITEMS_FIELD);
 		fields.add(CHECKSTATUS_FIELD);
 		fields.add(CHECKSTATUS_FIELD);
 		return fields;
 		return fields;

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

@@ -156,7 +156,7 @@ public class SaleArcheckSimpleInfo {
 	public static List<String> getKeywordFields() {
 	public static List<String> getKeywordFields() {
 		List<String> fields = new ArrayList<>();
 		List<String> fields = new ArrayList<>();
 		fields.add(CODE_FIELD);
 		fields.add(CODE_FIELD);
-		fields.add(ENTERPRISE_FIELD);
+		fields.add(VEND_FIELD);
 		fields.add(ITEMS_FIELD);
 		fields.add(ITEMS_FIELD);
 		return fields;
 		return fields;
 	}
 	}