Browse Source

更新采购询价上传到平台保存方法

hejq 8 years ago
parent
commit
a755a538e1

+ 3 - 13
src/main/java/com/uas/platform/b2b/erp/service/impl/InquiryServiceImpl.java

@@ -23,11 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 @Service
 public class InquiryServiceImpl implements InquiryService {
@@ -130,15 +126,9 @@ public class InquiryServiceImpl implements InquiryService {
                             item.setInquiry(purchaseInquiry);
 							PurchaseInquiryTemp temp = new PurchaseInquiryTemp();
                             BeanUtils.copyProperties(purchaseInquiry, temp, PurchaseInquiryTemp.class);
-                            PurchaseInquiryTemp inquiryTemp = tempDao.findByCodeAndEnUU(temp.getCode(), temp.getEnUU());
                             PurchaseInquiryItemTemp itemTemp = new PurchaseInquiryItemTemp();
-                            BeanUtils.copyProperties(item, itemTemp, PurchaseInquiryItemTemp.class);
-                            if (inquiryTemp == null) {
-                                temp = tempDao.save(temp);
-                                itemTemp.setInId(temp.getId());
-                            } else {
-                                itemTemp.setInId(inquiryTemp.getId());
-                            }
+							BeanUtils.copyProperties(item, itemTemp, PurchaseInquiryItemTemp.class);
+							itemTemp.setInquiry(temp);
                             tempList.add(itemTemp);
 						}
 					}

+ 17 - 6
src/main/java/com/uas/platform/b2b/model/PurchaseInquiryItemTemp.java

@@ -1,14 +1,11 @@
 package com.uas.platform.b2b.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.uas.platform.b2b.core.util.DateUtils;
-import com.uas.platform.core.model.Constant;
-import com.uas.platform.core.model.Status;
 import org.codehaus.jackson.annotate.JsonIgnore;
-import org.springframework.util.CollectionUtils;
 
 import javax.persistence.*;
-import java.util.*;
+import java.util.Date;
+import java.util.Set;
 
 /**
  * 平台里面,以供应商的角度来查看采购询价单明细
@@ -43,6 +40,12 @@ public class PurchaseInquiryItemTemp {
 	@Column(name = "id_inid", nullable = false)
 	private Long inId;
 
+    /**
+     * 询价单
+     */
+	@Transient
+	private PurchaseInquiryTemp inquiry;
+
 	/**
 	 * 买家采购员UU
 	 */
@@ -310,7 +313,15 @@ public class PurchaseInquiryItemTemp {
 		this.inId = inId;
 	}
 
-	public Long getUserUU() {
+    public PurchaseInquiryTemp getInquiry() {
+        return inquiry;
+    }
+
+    public void setInquiry(PurchaseInquiryTemp inquiry) {
+        this.inquiry = inquiry;
+    }
+
+    public Long getUserUU() {
 		return userUU;
 	}
 

+ 9 - 0
src/main/java/com/uas/platform/b2b/service/impl/PurchaseInquiryServiceImpl.java

@@ -132,6 +132,15 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
     @Override
     public void saveList(List<PurchaseInquiryItemTemp> purchaseInquiryItemTemps) {
     	try {
+    	    for (PurchaseInquiryItemTemp itemTemp : purchaseInquiryItemTemps) {
+                PurchaseInquiryTemp inquiryTemp = inquiryTempDao.findByCodeAndEnUU(itemTemp.getInquiry().getCode(), itemTemp.getInquiry().getEnUU());
+                if (inquiryTemp == null) {
+                    PurchaseInquiryTemp temp = inquiryTempDao.save(itemTemp.getInquiry());
+                    itemTemp.setInId(temp.getId());
+                } else {
+                    itemTemp.setInId(inquiryTemp.getId());
+                }
+            }
 			purchaseInquiryItemTemps = tempDao.save(purchaseInquiryItemTemps);
 		} catch (Exception e) {
     		for (PurchaseInquiryItemTemp temp : purchaseInquiryItemTemps) {