|
|
@@ -1,28 +1,11 @@
|
|
|
package com.uas.platform.b2b.service.impl;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.List;
|
|
|
-
|
|
|
-import javax.persistence.criteria.CriteriaBuilder;
|
|
|
-import javax.persistence.criteria.CriteriaQuery;
|
|
|
-import javax.persistence.criteria.Predicate;
|
|
|
-import javax.persistence.criteria.Root;
|
|
|
-
|
|
|
-import com.uas.platform.b2b.erp.model.ProdInOutRefreshPrice;
|
|
|
-import com.uas.platform.core.exception.NotFoundException;
|
|
|
-import org.apache.commons.collections.CollectionUtils;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.data.domain.Page;
|
|
|
-import org.springframework.data.jpa.domain.Specification;
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.ui.ModelMap;
|
|
|
-import org.springframework.util.StringUtils;
|
|
|
-
|
|
|
import com.uas.platform.b2b.core.util.ContextUtils;
|
|
|
import com.uas.platform.b2b.dao.PagingReleaseCountDao;
|
|
|
import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
|
|
|
import com.uas.platform.b2b.dao.PurchaseReturnDao;
|
|
|
import com.uas.platform.b2b.dao.PurchaseReturnItemDao;
|
|
|
+import com.uas.platform.b2b.erp.model.ProdInOutRefreshPrice;
|
|
|
import com.uas.platform.b2b.event.PurchaseReturnSaveEvent;
|
|
|
import com.uas.platform.b2b.model.PurchaseOrderItem;
|
|
|
import com.uas.platform.b2b.model.PurchaseReturn;
|
|
|
@@ -36,6 +19,20 @@ import com.uas.platform.core.model.PageInfo;
|
|
|
import com.uas.platform.core.model.Status;
|
|
|
import com.uas.platform.core.persistence.criteria.PredicateUtils;
|
|
|
import com.uas.search.b2b.model.PageParams;
|
|
|
+import org.apache.commons.collections.CollectionUtils;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.data.domain.Page;
|
|
|
+import org.springframework.data.jpa.domain.Specification;
|
|
|
+import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.ui.ModelMap;
|
|
|
+import org.springframework.util.StringUtils;
|
|
|
+
|
|
|
+import javax.persistence.criteria.CriteriaBuilder;
|
|
|
+import javax.persistence.criteria.CriteriaQuery;
|
|
|
+import javax.persistence.criteria.Predicate;
|
|
|
+import javax.persistence.criteria.Root;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.List;
|
|
|
|
|
|
@Service
|
|
|
public class PurchaseReturnServiceImpl implements PurchaseReturnService {
|
|
|
@@ -62,17 +59,7 @@ public class PurchaseReturnServiceImpl implements PurchaseReturnService {
|
|
|
for (PurchaseReturnItem item : returnItems) {
|
|
|
if (null == item.getOrderItemId()) {
|
|
|
// item.setOrderItem(null);
|
|
|
- if (null != item.getOrderCode() && null != item.getOrderDetno()) {
|
|
|
- List<PurchaseOrderItem> items = purchaseOrderItemDao.findByEnUUAndOrderCodeAndNumber(SystemSession.getUser().getEnterprise().getUu(), item.getOrderCode(), item.getOrderDetno());
|
|
|
- if (!CollectionUtils.isEmpty(items)) {
|
|
|
- item.setOrderItemId(items.get(0).getId());
|
|
|
- saveList.add(item);
|
|
|
- } else {
|
|
|
- throw new NotFoundException("与采购单号为“" + item.getOrderCode() + "”,序号为" + item.getOrderDetno() + "对应的采购明细");
|
|
|
- }
|
|
|
- } else {
|
|
|
- throw new NotFoundException("与验退单号为“" + item.getPurchaseReturn().getCode() + "”,序号为" + item.getNumber() + "对应的采购明细");
|
|
|
- }
|
|
|
+ saveList.add(item);
|
|
|
}
|
|
|
if (null != item.getOrderItemId() && null != item.getOrderItem().getId()) {
|
|
|
PurchaseOrderItem orderItem = purchaseOrderItemDao.findOne(item.getOrderItemId());
|