实体增加字段

pom.xml

@@ -9,6 +9,7 @@
         <groupId>com.uas.platform</groupId>
         <artifactId>platform</artifactId>
         <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../platform</relativePath>
     </parent>
     <profiles>
         <profile>
@@ -19,7 +20,6 @@
                 <!-- static plugin -->
                 <static-path>static</static-path>
             </properties>
-
         </profile>
         <profile>
             <!-- 测试环境 -->
@@ -29,7 +29,7 @@
                 <!-- static plugin -->
                 <static-path>static</static-path>
             </properties>
-            <!-- 默认 -->
+
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
@@ -42,6 +42,8 @@
                 <!-- static plugin -->
                 <static-path>http://static.ubtob.com</static-path>
             </properties>
+            <!-- 默认 -->
+
         </profile>
     </profiles>
     <dependencies>
@@ -285,6 +287,12 @@
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.uas.sso</groupId>
+            <artifactId>sso-common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>com.uas.ps</groupId>
             <artifactId>ps-core</artifactId>
@@ -349,7 +357,7 @@
         </resources>
         <!-- 在maven生命周期validate阶段生成timestamp -->
         <plugins>
-            <plugin>
+            <!--<plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>
                 <version>1.3</version>
@@ -362,10 +370,12 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <format>{0,date,yyyy-MM-dd HH:mm:ss}</format>
-                    <items>
-                        <item>timestamp</item>
-                    </items>
+                    <configuration>
+                        <format>{0,date,yyyy-MM-dd HH:mm:ss}</format>
+                        <items>
+                            <item>timestamp</item>
+                        </items>
+                    </configuration>
                 </configuration>
             </plugin>
             <plugin>
@@ -380,7 +390,7 @@
                 <groupId>com.samaxes.maven</groupId>
                 <artifactId>minify-maven-plugin</artifactId>
                 <version>1.7.4</version>
-                <!-- 静态文件压缩  -->
+                &lt;!&ndash; 静态文件压缩  &ndash;&gt;
                 <executions>
                     <execution>
                         <id>default-minify</id>
@@ -441,7 +451,7 @@
                 <groupId>com.uas.plugins</groupId>
                 <artifactId>static-maven-plugin</artifactId>
                 <version>0.0.2-SNAPSHOT</version>
-                <!-- 静态资源分离  -->
+                &lt;!&ndash; 静态资源分离  &ndash;&gt;
                 <executions>
                     <execution>
                         <id>default-static</id>
@@ -459,6 +469,7 @@
                                 <sourceInclude>resources/tpl/**/*.html</sourceInclude>
                                 <sourceInclude>WEB-INF/views/**/*.html</sourceInclude>
                             </sourceIncludes>
+                            http://static.ubtob.com/css/index.css?_v=1450321871828
                             <versionSuffix>
                                 <suffix>?_v=${timestamp}</suffix>
                                 <exclude>*/require.js,*.min.js,*.min.css</exclude>
@@ -484,7 +495,7 @@
                         </resource>
                     </webResources>
                 </configuration>
-            </plugin>
+            </plugin>-->
             <plugin>
                 <groupId>org.apache.tomcat.maven</groupId>
                 <artifactId>tomcat7-maven-plugin</artifactId>
@@ -496,7 +507,7 @@
                 </configuration>
             </plugin>
         </plugins>
-        <pluginManagement>
+        <!--<pluginManagement>
             <plugins>
                 <plugin>
                     <groupId>org.eclipse.m2e</groupId>
@@ -531,7 +542,7 @@
                     </configuration>
                 </plugin>
             </plugins>
-        </pluginManagement>
+        </pluginManagement>-->
     </build>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

@@ -1,26 +1,10 @@
 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.*;
 
 /**
  * 买家的采购验收单明细
@@ -118,6 +102,12 @@ public class PurchaseAcceptItem {
 	@Column(name = "pai_prodcode")
 	private String prodcode;
 
+	/**
+	 * 本次对账数
+	 */
+	@Column(name = "pai_ycheckqty")
+	private Integer checkQty;
+
 	public Long getId() {
 		return id;
 	}
@@ -252,4 +242,11 @@ public class PurchaseAcceptItem {
 		this.prodcode = prodcode;
 	}
 
+	public Integer getCheckQty() {
+		return checkQty;
+	}
+
+	public void setCheckQty(Integer checkQty) {
+		this.checkQty = checkQty;
+	}
 }

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

@@ -1,26 +1,10 @@
 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.*;
 
 /**
  * 买家的不良品入库明细
@@ -104,6 +88,12 @@ public class PurchaseBadInItem {
 	@Column(name = "pbi_erpdate")
 	private Date erpDate;
 
+	/**
+	 * 本次对账数量
+	 */
+	@Column(name = "pbi_ycheckqty")
+	private Integer checkQty;
+
 	public Long getId() {
 		return id;
 	}
@@ -202,6 +192,14 @@ public class PurchaseBadInItem {
 		this.erpDate = erpDate;
 	}
 
+	public Integer getCheckQty() {
+		return checkQty;
+	}
+
+	public void setCheckQty(Integer checkQty) {
+		this.checkQty = checkQty;
+	}
+
 	public static List<PurchaseBadIn> distinct(List<PurchaseBadInItem> items) {
 		List<PurchaseBadIn> list = new ArrayList<PurchaseBadIn>();
 		Set<Long> keys = new HashSet<Long>();

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

@@ -1,16 +1,10 @@
 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.*;
-
+import com.alibaba.fastjson.annotation.JSONField;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import javax.persistence.*;
+import java.util.*;
 
 /**
  * 买家的采购验退单明细
@@ -136,6 +130,12 @@ public class PurchaseReturnItem {
 	@Transient
 	private Short orderDetno;
 
+	/**
+	 * 本次对账数
+	 */
+	@Column(name = "pri_ycheckqty")
+	private Integer checkQty;
+
 	public Long getId() {
 		return id;
 	}
@@ -269,4 +269,12 @@ public class PurchaseReturnItem {
 	public void setOrderDetno(Short orderDetno) {
 		this.orderDetno = orderDetno;
 	}
+
+	public Integer getCheckQty() {
+		return checkQty;
+	}
+
+	public void setCheckQty(Integer checkQty) {
+		this.checkQty = checkQty;
+	}
 }