货款调账方法获取数据方法更新

src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseAPBillServiceImpl.java

@@ -5,7 +5,11 @@ import com.uas.platform.b2b.dao.PurchaseApBillDao;
 import com.uas.platform.b2b.erp.model.PurchaseAPBill;
 import com.uas.platform.b2b.erp.model.PurchaseAPBillDetail;
 import com.uas.platform.b2b.erp.service.PurchaseAPBillService;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.ApbillAdjustment;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.ProductInfo;
+import com.uas.platform.b2b.model.PurchaseApBill;
+import com.uas.platform.b2b.model.PurchaseApBillItem;
 import com.uas.platform.b2b.ps.ProductUtils;
 import com.uas.platform.b2b.support.CollectionUtil;
 import com.uas.platform.b2b.support.SystemSession;
@@ -13,7 +17,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 应付发票
@@ -78,12 +88,12 @@ public class PurchaseAPBillServiceImpl implements PurchaseAPBillService {
 
 	@Override
 	public List<ApbillAdjustment> convertApbillAdjustment(List<PurchaseAPBill> apBills) throws Exception {
-		List<ApbillAdjustment> adjusts = new ArrayList<ApbillAdjustment>();
+		List<ApbillAdjustment> adjusts = new ArrayList<>();
 		if (!CollectionUtils.isEmpty(apBills)) {
 			Long enUU = SystemSession.getUser().getEnterprise().getUu();
 			// 获取物料编号集合
 			Set<String> productCodes = CollectionUtil.getProductCodeCollection(apBills);
-            Map<String, ProductInfo> products = null;
+            Map<String, ProductInfo> products = new HashMap<>(2);
             if (!CollectionUtils.isEmpty(productCodes)) {
                 products = ProductUtils.findByEnUUAndCodes(enUU, productCodes);
             }
@@ -93,7 +103,7 @@ public class PurchaseAPBillServiceImpl implements PurchaseAPBillService {
 						ApbillAdjustment adjust = new ApbillAdjustment(apBill, detail);
 						Enterprise enterprise = enterpriseDao.findEnterpriseByUu(adjust.getEnuu());
 						adjust.setReceivename(enterprise.getEnName());
-						if (!CollectionUtils.isEmpty(products)) {
+						if (!products.isEmpty()) {
                             ProductInfo product = products.get(adjust.getProdcode());
                             if (null != product) {
                                 adjust.setPrid(product.getId());

src/main/java/com/uas/platform/b2b/service/impl/ApbillAdjustmentServiceImpl.java

@@ -1,15 +1,5 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.axis.utils.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
 import com.uas.platform.b2b.dao.ApbillAdjustmentDao;
 import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.erp.model.PurchaseAPBill;
@@ -18,6 +8,15 @@ import com.uas.platform.b2b.service.ApbillAdjustmentService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
+import org.apache.axis.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 
 @Service
@@ -31,11 +30,7 @@ public class ApbillAdjustmentServiceImpl implements ApbillAdjustmentService {
 
 	@Override
 	public void save(List<ApbillAdjustment> apBilladjustments) {
-		try {
-			apbillAdjustmentDao.save(apBilladjustments);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+        apbillAdjustmentDao.save(apBilladjustments);
 	}
 
 	@Override