Browse Source

公共询价明细日期采用主表的日期

hejq 8 years ago
parent
commit
86ee189939

+ 5 - 0
src/main/java/com/uas/platform/b2b/erp/service/impl/PublicInquiryServiceImpl.java

@@ -103,6 +103,11 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                             item.setSource("ERP");
                             item.setSourceid(batch.getBip_id());
                             item.setCurrency(batch.getBip_currency());
+                            if(null != inquiry.getBi_date()) {
+                                item.setDate(inquiry.getBi_date());
+                            } else {
+                                item.setDate(new Date());
+                            }
                             if(item.getCurrency() == null) {
                                 item.setCurrency("RMB");
                             }

+ 14 - 0
src/main/java/com/uas/platform/b2b/model/PurcInquiryItem.java

@@ -246,6 +246,12 @@ public class PurcInquiryItem {
 	@Column(name = "id_sourceid")
 	private Long sourceid;
 
+    /**
+     * 单据日期,索引过滤需要
+     */
+	@Column(name = "id_date")
+    private Date date;
+
 	public Long getId() {
 		return id;
 	}
@@ -536,6 +542,14 @@ public class PurcInquiryItem {
 		this.sourceid = sourceid;
 	}
 
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
     public static List<PurcInquiry> distinct(List<PurcInquiryItem> inquiryItems) {
 		List<PurcInquiry> inquiries = new ArrayList<>();
 		Set<Long> keys = new HashSet<>();

+ 1 - 0
src/main/java/com/uas/platform/b2b/service/impl/PurcInquiryServiceImpl.java

@@ -532,6 +532,7 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 						item.setCurrency(inquiry.getCurrency());
 						item.setFromDate(new Date());
 						item.setToDate(purcitem.getToDate());
+						item.setDate(new Date());
 						if (item.getCurrency().equals(RMB)) {
 							item.setTaxrate((float) 17);
 						} else {