Kaynağa Gözat

B2B新增采购单时批量导入物料数据异常问题的处理

hejq 7 yıl önce
ebeveyn
işleme
84d4faf0a5

+ 8 - 8
src/main/java/com/uas/platform/b2b/model/PurchaseOrderItem.java

@@ -92,14 +92,6 @@ public class PurchaseOrderItem extends AbstractOrderProduct {
 	@Column(name = "pd_vendspec")
 	@Column(name = "pd_vendspec")
 	private String vendspec;
 	private String vendspec;
 
 
-	public String getVendspec() {
-		return vendspec;
-	}
-
-	public void setVendspec(String vendspec) {
-		this.vendspec = vendspec;
-	}
-
 	/**
 	/**
 	 * 含税单价
 	 * 含税单价
 	 */
 	 */
@@ -345,6 +337,14 @@ public class PurchaseOrderItem extends AbstractOrderProduct {
 		this.factory = factory;
 		this.factory = factory;
 	}
 	}
 
 
+	public String getVendspec() {
+		return vendspec;
+	}
+
+	public void setVendspec(String vendspec) {
+		this.vendspec = vendspec;
+	}
+
 	public static List<PurchaseOrderItem> distinctItem(List<PurchaseOrderItem> items) {
 	public static List<PurchaseOrderItem> distinctItem(List<PurchaseOrderItem> items) {
 		List<PurchaseOrderItem> orderItems = new ArrayList<>();
 		List<PurchaseOrderItem> orderItems = new ArrayList<>();
 		Set<Long> keys = new HashSet<>();
 		Set<Long> keys = new HashSet<>();

+ 2 - 1
src/main/java/com/uas/platform/b2b/service/impl/PurcOrderServiceImpl.java

@@ -247,7 +247,8 @@ public class PurcOrderServiceImpl implements PurcOrderService {
 					}
 					}
 					if (failure == 0) {
 					if (failure == 0) {
 					    // 录入数据符合要求,进行物料处理
 					    // 录入数据符合要求,进行物料处理
-                        productInfos = (List<ProductInfo>) musterdProduct(product, productInfo, success).get("productInfos");
+						List<ProductInfo> productInfoList = (List<ProductInfo>) musterdProduct(product, productInfo, success).get("productInfos");
+                        productInfos.addAll(productInfoList);
                         success = (Integer) musterdProduct(product, productInfo, success).get("success");
                         success = (Integer) musterdProduct(product, productInfo, success).get("success");
                     }
                     }
 				}
 				}

+ 0 - 8
src/main/java/com/uas/platform/b2b/service/impl/PurchaseNoticeServiceImpl.java

@@ -5,7 +5,6 @@ import com.uas.platform.b2b.core.util.SplitArray;
 import com.uas.platform.b2b.core.util.ThreadTask;
 import com.uas.platform.b2b.core.util.ThreadTask;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.PurchaseNotify;
 import com.uas.platform.b2b.erp.model.PurchaseNotify;
-import com.uas.platform.b2b.event.PurchaseNoticeSaveReleaseEvent;
 import com.uas.platform.b2b.event.SaleSendAcceptReleaseEvent;
 import com.uas.platform.b2b.event.SaleSendAcceptReleaseEvent;
 import com.uas.platform.b2b.event.SaleSendRefuseReleaseEvent;
 import com.uas.platform.b2b.event.SaleSendRefuseReleaseEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.model.*;
@@ -63,9 +62,6 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 	@Autowired
 	@Autowired
 	private SaleSendItemVerifyDao saleSendItemVerifyDao;
 	private SaleSendItemVerifyDao saleSendItemVerifyDao;
 
 
-	@Autowired
-	private UserBaseInfoDao userBaseInfoDao;
-
 	@Autowired
 	@Autowired
 	private B2bCodeSetDao b2bCodeSetDao;
 	private B2bCodeSetDao b2bCodeSetDao;
 
 
@@ -105,9 +101,6 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 	@Autowired
 	@Autowired
     private PersonalProductService personalProductService;
     private PersonalProductService personalProductService;
 
 
-	@Autowired
-	private PurchaseOrderItemDao orderItemDao;
-
 	@Autowired
 	@Autowired
 	private PurchaseNoticeEndDao noticeEndDao;
 	private PurchaseNoticeEndDao noticeEndDao;
 
 
@@ -120,7 +113,6 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 	public List<PurchaseNotice> save(List<PurchaseNotice> notices) {
 	public List<PurchaseNotice> save(List<PurchaseNotice> notices) {
 		notices = purchaseNoticeDao.save(notices);
 		notices = purchaseNoticeDao.save(notices);
 		saveUserOrders(notices);
 		saveUserOrders(notices);
-		ContextUtils.publishEvent(new PurchaseNoticeSaveReleaseEvent(notices));
 		return notices;
 		return notices;
 	}
 	}