git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@780 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/erp/model/ErpLog.java

@@ -18,6 +18,7 @@ import javax.validation.constraints.NotNull;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.uas.platform.b2b.core.util.DateFormatUtils;
 import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.support.SystemSession;
@@ -80,6 +81,7 @@ public class ErpLog extends BufferedLogable implements Serializable {
 	private Integer total;
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public Long getId() {
 		return id;
 	}
@@ -153,6 +155,7 @@ public class ErpLog extends BufferedLogable implements Serializable {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public String getTimeString() {
 		return DateFormatUtils.DATETIME_FORMAT.format(getTime());
 	}

src/main/java/com/uas/platform/b2b/model/Attach.java

@@ -13,6 +13,8 @@ import javax.persistence.Transient;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 @Entity
 @Table(name = "attachs")
 public class Attach {
@@ -74,6 +76,7 @@ public class Attach {
 	}
 	
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public Date getDate() {
 		return date;
 	}
@@ -83,6 +86,7 @@ public class Attach {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public String getPath() {
 		return path;
 	}
@@ -92,6 +96,7 @@ public class Attach {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public String getDescription() {
 		return description;
 	}
@@ -117,6 +122,7 @@ public class Attach {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public String getSourceId() {
 		return sourceId;
 	}
@@ -126,6 +132,7 @@ public class Attach {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public String getRelativeTable() {
 		return relativeTable;
 	}
@@ -135,6 +142,7 @@ public class Attach {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public Long getRelativeKey() {
 		return relativeKey;
 	}

src/main/java/com/uas/platform/b2b/model/Enterprise.java

@@ -23,6 +23,7 @@ import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.uas.platform.core.model.Constant;
 
 /**
@@ -334,6 +335,7 @@ public class Enterprise implements Serializable {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public boolean isEnabled() {
 		return this.getEnable() != null && this.getEnable() == Constant.YES;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseAcceptItem.java

@@ -14,6 +14,8 @@ import javax.persistence.Table;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 /**
  * 买家的采购验收单明细
  * 
@@ -116,6 +118,7 @@ public class PurchaseAcceptItem {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public PurchaseAccept getAccept() {
 		return accept;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseApBillItem.java

@@ -14,6 +14,8 @@ import javax.persistence.Table;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 /**
  * 买家的不良品入库明细
  * 
@@ -283,6 +285,7 @@ public class PurchaseApBillItem {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public PurchaseApBill getaPBill() {
 		return aPBill;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseBadInItem.java

@@ -14,6 +14,8 @@ import javax.persistence.Table;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 /**
  * 买家的不良品入库明细
  * 
@@ -116,6 +118,7 @@ public class PurchaseBadInItem {
 	}
 	
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public PurchaseBadIn getBadIn() {
 		return badIn;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseBadOutItem.java

@@ -14,6 +14,8 @@ import javax.persistence.Table;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 /**
  * 买家的不良品入库明细
  * 
@@ -156,6 +158,7 @@ public class PurchaseBadOutItem {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public PurchaseBadOut getBadOut() {
 		return badOut;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseForecastAll.java

@@ -19,6 +19,8 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
+
+import com.alibaba.fastjson.annotation.JSONField;
 @Table(name = "purc$forecast")
 @Entity
 public class PurchaseForecastAll implements Serializable{
@@ -171,6 +173,7 @@ public class PurchaseForecastAll implements Serializable{
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public Set<PurchaseForecastAllItem> getForecastItems() {
 		return forecastItems;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseInquiry.java

@@ -22,6 +22,8 @@ import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.annotations.ForeignKey;
 import org.hibernate.annotations.Where;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 /**
  * 平台里面，以供应商的角度来查看采购询价单
  * 
@@ -209,6 +211,7 @@ public class PurchaseInquiry implements Serializable {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public Set<PurchaseInquiryItem> getInquiryItems() {
 		return inquiryItems;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseInquiryItem.java

@@ -21,6 +21,8 @@ import javax.persistence.Table;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.springframework.util.CollectionUtils;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 /**
  * 平台里面，以供应商的角度来查看采购询价单明细
  * 
@@ -197,6 +199,7 @@ public class PurchaseInquiryItem {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public Long getSourceId() {
 		return sourceId;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseOrderAllItem.java

@@ -16,6 +16,8 @@ import javax.persistence.Table;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 @Table(name = "purc$orderitems")
 @Entity
 public class PurchaseOrderAllItem {
@@ -147,6 +149,7 @@ public class PurchaseOrderAllItem {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public PurchaseOrderAll getOrder() {
 		return order;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseOrderChange.java

@@ -21,6 +21,7 @@ import javax.persistence.Table;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.springframework.util.StringUtils;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.uas.platform.core.model.Constant;
 
 /**
@@ -28,7 +29,7 @@ import com.uas.platform.core.model.Constant;
  * 级联变更明细
  * 
  * @author yingp
- *
+ * 
  */
 @Table(name = "purc$changes")
 @Entity
@@ -148,7 +149,8 @@ public class PurchaseOrderChange implements Serializable {
 	/**
 	 * 采购变更单明细
 	 */
-	@OneToMany(mappedBy = "orderChange", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch = FetchType.EAGER)
+	@OneToMany(mappedBy = "orderChange", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE,
+			CascadeType.MERGE }, fetch = FetchType.EAGER)
 	@OrderBy("number")
 	private Set<PurchaseOrderChangeItem> orderChangeItems;
 
@@ -305,6 +307,7 @@ public class PurchaseOrderChange implements Serializable {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public boolean isAgreed() {
 		return this.agreed != null && Constant.YES == this.agreed;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseOrderChangeItem.java

@@ -16,11 +16,13 @@ import javax.persistence.Table;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 /**
  * 平台里面的订单变更单明细
  * 
  * @author yingp
- *
+ * 
  */
 @Table(name = "purc$changeitems")
 @Entity
@@ -112,6 +114,7 @@ public class PurchaseOrderChangeItem {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public PurchaseOrderChange getOrderChange() {
 		return orderChange;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseOrderDoneItem.java

@@ -14,6 +14,8 @@ import javax.persistence.Table;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.annotations.Where;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 @Table(name = "purc$orderitems")
 @Entity
 @Where(clause = "pd_status = 201 and (pd_end is null or pd_end = 0)")
@@ -250,6 +252,7 @@ public class PurchaseOrderDoneItem {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public PurchaseOrderDone getOrder() {
 		return order;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseOrderEndItem.java

@@ -13,6 +13,8 @@ import javax.persistence.Table;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 @Table(name = "purc$orderitems")
 @Entity
 public class PurchaseOrderEndItem {
@@ -158,6 +160,7 @@ public class PurchaseOrderEndItem {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public PurchaseOrderEnd getOrder() {
 		return order;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseOrderReply.java

@@ -18,6 +18,8 @@ import javax.persistence.Table;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 /**
  * 
  * 采购订单回复记录
@@ -113,6 +115,7 @@ public class PurchaseOrderReply implements Serializable {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public PurchaseOrderItem getOrderItem() {
 		return orderItem;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseOrderTodoItem.java

@@ -13,6 +13,8 @@ import javax.persistence.Table;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 @Table(name = "purc$orderitems")
 @Entity
 public class PurchaseOrderTodoItem {
@@ -136,6 +138,7 @@ public class PurchaseOrderTodoItem {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public PurchaseOrderTodo getOrder() {
 		return order;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseProofing.java

@@ -22,6 +22,8 @@ import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.annotations.ForeignKey;
 import org.hibernate.annotations.Where;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 /**
  * 平台里面，以供应商的角度来查看客户打样申请
  * 
@@ -264,6 +266,7 @@ public class PurchaseProofing implements Serializable {
 	}
 	
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public Set<PurchaseProofingItem> getProofingItems() {
 		return proofingItems;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseProofingSend.java

@@ -21,6 +21,8 @@ import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.annotations.ForeignKey;
 import org.hibernate.annotations.Where;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 /**
  * 平台里面，供应商针对客户打样申请的送样单
  * 
@@ -205,6 +207,7 @@ public class PurchaseProofingSend implements Serializable {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public PurchaseProofingItem getProofingItem() {
 		return proofingItem;
 	}

src/main/java/com/uas/platform/b2b/model/Role.java

@@ -22,6 +22,7 @@ import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.uas.platform.core.model.Constant;
 
 @Entity
@@ -75,6 +76,7 @@ public class Role implements Serializable {
 	private Long enUU;
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public Long getId() {
 		return id;
 	}
@@ -124,6 +126,7 @@ public class Role implements Serializable {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public boolean isSys() {
 		return getIssys() != null && getIssys() == Constant.YES;
 	}

src/main/java/com/uas/platform/b2b/model/SaleSend.java

@@ -19,6 +19,8 @@ import javax.persistence.Table;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.springframework.util.CollectionUtils;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 /**
  * 平台里面，供应商发起的发货单<br>
  * （以供应商的视角）
@@ -193,6 +195,7 @@ public class SaleSend implements Serializable {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public Set<SaleSendItem> getSendItems() {
 		return sendItems;
 	}

src/main/java/com/uas/platform/b2b/model/SaleSendItem.java

@@ -14,6 +14,8 @@ import javax.persistence.Table;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 /**
  * 平台里面，供应商发起的发货单明细
  * 
@@ -98,6 +100,7 @@ public class SaleSendItem {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public PurchaseNotice getNotice() {
 		return notice;
 	}

src/main/java/com/uas/platform/b2b/model/SigninLog.java

@@ -17,6 +17,7 @@ import javax.validation.constraints.NotNull;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.springframework.mobile.device.site.SitePreference;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.uas.platform.core.model.Constant;
 
 /**
@@ -92,6 +93,7 @@ public class SigninLog implements Serializable {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public Long getId() {
 		return id;
 	}

src/main/java/com/uas/platform/b2b/model/UsageLog.java

@@ -19,6 +19,7 @@ import javax.validation.constraints.NotNull;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.springframework.util.StringUtils;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.uas.platform.b2b.core.util.DateFormatUtils;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.logging.BufferedLogable;
@@ -89,6 +90,7 @@ public class UsageLog extends BufferedLogable implements Serializable {
 	private Long key;
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public Long getId() {
 		return id;
 	}
@@ -178,6 +180,7 @@ public class UsageLog extends BufferedLogable implements Serializable {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public String getTimeString() {
 		return DateFormatUtils.DATETIME_FORMAT.format(getTime());
 	}

src/main/java/com/uas/platform/b2b/model/User.java

@@ -26,6 +26,7 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.uas.platform.core.model.Constant;
 
 @Entity
@@ -153,6 +154,7 @@ public class User implements Serializable {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public String getUserPwd() {
 		return userPwd;
 	}
@@ -206,6 +208,7 @@ public class User implements Serializable {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public Set<Enterprise> getEnterprises() {
 		return enterprises;
 	}
@@ -215,6 +218,7 @@ public class User implements Serializable {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public boolean enable() {
 		return this.getEnable() != null && this.getEnable() == Constant.YES;
 	}
@@ -251,11 +255,13 @@ public class User implements Serializable {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public boolean isSys() {
 		return getIssys() != null && getIssys() == Constant.YES;
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public String getIp() {
 		return ip;
 	}

src/main/java/com/uas/platform/b2b/model/Vendor.java

@@ -15,6 +15,7 @@ import javax.persistence.Table;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.uas.platform.core.persistence.Logger;
 import com.uas.platform.core.persistence.OtherUserUU;
 import com.uas.platform.core.persistence.StatusColumn;
@@ -108,6 +109,7 @@ public class Vendor implements Serializable {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public Long getMyEnUU() {
 		return myEnUU;
 	}
@@ -117,6 +119,7 @@ public class Vendor implements Serializable {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public Long getMyUserUU() {
 		return myUserUU;
 	}
@@ -142,6 +145,7 @@ public class Vendor implements Serializable {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public Long getVendEnUU() {
 		return vendEnUU;
 	}
@@ -151,6 +155,7 @@ public class Vendor implements Serializable {
 	}
 
 	@JsonIgnore
+	@JSONField(serialize = false)
 	public Long getVendUserUU() {
 		return vendUserUU;
 	}