|
|
@@ -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 PurchaseBadOutItem {
|
|
|
@Column(name = "poi_erpdate")
|
|
|
private Date erpDate;
|
|
|
|
|
|
+ /**
|
|
|
+ * 本次对账数量
|
|
|
+ */
|
|
|
+ @Column(name = "poi_ycheckqty")
|
|
|
+ private Integer checkQty;
|
|
|
+
|
|
|
public Long getId() {
|
|
|
return id;
|
|
|
}
|
|
|
@@ -202,6 +192,14 @@ public class PurchaseBadOutItem {
|
|
|
this.erpDate = erpDate;
|
|
|
}
|
|
|
|
|
|
+ public Integer getCheckQty() {
|
|
|
+ return checkQty;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setCheckQty(Integer checkQty) {
|
|
|
+ this.checkQty = checkQty;
|
|
|
+ }
|
|
|
+
|
|
|
public static List<PurchaseBadOut> distinct(List<PurchaseBadOutItem> items) {
|
|
|
List<PurchaseBadOut> accepts = new ArrayList<PurchaseBadOut>();
|
|
|
Set<Long> keys = new HashSet<Long>();
|