Browse Source

对账ERP采纳结果上传到商务平台处理方法调整

hejq 7 years ago
parent
commit
4a8c64596d

+ 2 - 5
src/main/java/com/uas/platform/b2b/erp/service/impl/APCheckServiceImpl.java

@@ -5,7 +5,6 @@ import com.uas.platform.b2b.erp.model.APCheck;
 import com.uas.platform.b2b.erp.service.APCheckService;
 import com.uas.platform.b2b.erp.service.APCheckService;
 import com.uas.platform.b2b.model.PurchaseApCheck;
 import com.uas.platform.b2b.model.PurchaseApCheck;
 import com.uas.platform.b2b.model.PurchaseApCheckItem;
 import com.uas.platform.b2b.model.PurchaseApCheckItem;
-import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.exception.IllegalStatusException;
 import com.uas.platform.core.exception.IllegalStatusException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -31,12 +30,10 @@ public class APCheckServiceImpl implements APCheckService {
 	@Override
 	@Override
 	public List<PurchaseApCheckItem> convertAPChecks(List<APCheck> apChecks) {
 	public List<PurchaseApCheckItem> convertAPChecks(List<APCheck> apChecks) {
 		List<PurchaseApCheckItem> apCheckItems = new ArrayList<PurchaseApCheckItem>();
 		List<PurchaseApCheckItem> apCheckItems = new ArrayList<PurchaseApCheckItem>();
-		long vendUU = SystemSession.getUser().getEnterprise().getUu();// 卖方UU号
 		if (!CollectionUtils.isEmpty(apChecks)) {
 		if (!CollectionUtils.isEmpty(apChecks)) {
 			for (APCheck apCheck : apChecks) {
 			for (APCheck apCheck : apChecks) {
-				List<PurchaseApCheck> existChecks = purchaseAPCheckDao.findByCustUuAndCode(vendUU, apCheck.getAc_code());
-				if (!CollectionUtils.isEmpty(existChecks)) {// 客户UU正确,否则不保存
-					PurchaseApCheck apcheckb2b = existChecks.get(0);
+				PurchaseApCheck apcheckb2b = purchaseAPCheckDao.findOne(apCheck.getAc_b2bid());
+				if (null != apcheckb2b) {// 客户UU正确,否则不保存
 					apcheckb2b.setCheckStatus(apCheck.getAc_confirmstatus());
 					apcheckb2b.setCheckStatus(apCheck.getAc_confirmstatus());
 					apcheckb2b.setCustreply(apCheck.getAc_reason());
 					apcheckb2b.setCustreply(apCheck.getAc_reason());
 					apcheckb2b.setReason(apCheck.getAc_reason());
 					apcheckb2b.setReason(apCheck.getAc_reason());