实体注解等更新

src/main/java/com/uas/platform/b2b/mobile/model/ApprovalLog.java

@@ -1,16 +1,12 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+/**
+ * 审批日志
+ */
 @Entity
 @Table(name = "office$applog")
 public class ApprovalLog implements Serializable {

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

@@ -1,29 +1,13 @@
 package com.uas.platform.b2b.model;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+import com.alibaba.fastjson.annotation.JSONField;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import javax.persistence.*;
+import java.util.*;
 
 /**
- * 买家的不良品入库明细
+ * 买家的应付发票明细
  * 
  * @author suntg
  * 

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

@@ -1,23 +1,13 @@
 package com.uas.platform.b2b.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+/**
+ * 采购预单
+ */
 @Table(name = "purc$forecast")
 @Entity
 public class PurchaseForecastAll implements Serializable {

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

@@ -1,24 +1,15 @@
 package com.uas.platform.b2b.model;
 
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+import com.alibaba.fastjson.annotation.JSONField;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
 
+/**
+ * 采购预测单明细
+ */
 @Table(name = "purc$forecastitems")
 @Entity
 public class PurchaseForecastAllItem implements Serializable {

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

@@ -1,25 +1,12 @@
 package com.uas.platform.b2b.model;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+import com.alibaba.fastjson.annotation.JSONField;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import javax.persistence.*;
 
 /**
  * 模具物料明细
- * 
- * 
- *
  */
 @Entity
 @Table(name = "purc$inquirymoulddetail")
@@ -46,13 +33,6 @@ public class PurchaseInquiryMouldDetail {
 	@Column(name = "imd_detno")
 	private Short detno;
 
-	// /**
-	// * 询价单
-	// */
-	// @ManyToOne(cascade = CascadeType.ALL, optional = true)
-	// @JoinColumn(name = "imd_imid", nullable = false)
-	// private PurchaseInquiryMould inquiryMould;
-
 	/**
 	 * 询价单id
 	 */

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

@@ -1,31 +1,14 @@
 package com.uas.platform.b2b.model;
 
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import javax.persistence.*;
+import java.util.Set;
+
 /**
  * 模具明细
- * 
- * 
- *
  */
-
 @Table(name = "purc$inquirymoulditems")
 @Entity
 public class PurchaseInquiryMouldItem {

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

@@ -1,9 +1,6 @@
 package com.uas.platform.b2b.model;
 
 
-import com.alibaba.fastjson.annotation.JSONField;
-import org.codehaus.jackson.annotate.JsonIgnore;
-
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;

src/main/java/com/uas/platform/b2b/v2/controller/InviteRecordController.java

@@ -268,11 +268,7 @@ public class InviteRecordController {
     private Long checkByBusinessCode(Long enUU, String businessCode) {
         if (null != businessCode) {
             Enterprise enterprise = enterpriseService.findByenBussinessCode(businessCode);
-            if (null == enterprise) {
-                throw new IllegalOperatorException(businessCode + "对应的企业不存在");
-            } else {
-                enUU = enterprise.getUu();
-            }
+            enUU = enterprise.getUu();
         }
         return enUU;
     }