|
@@ -9,6 +9,7 @@ import javax.persistence.criteria.CriteriaQuery;
|
|
|
import javax.persistence.criteria.Predicate;
|
|
import javax.persistence.criteria.Predicate;
|
|
|
import javax.persistence.criteria.Root;
|
|
import javax.persistence.criteria.Root;
|
|
|
|
|
|
|
|
|
|
+import org.apache.commons.collections.CollectionUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.data.domain.Page;
|
|
import org.springframework.data.domain.Page;
|
|
|
import org.springframework.data.jpa.domain.Specification;
|
|
import org.springframework.data.jpa.domain.Specification;
|
|
@@ -17,10 +18,13 @@ import org.springframework.stereotype.Service;
|
|
|
import com.uas.platform.b2b.dao.EnterpriseDao;
|
|
import com.uas.platform.b2b.dao.EnterpriseDao;
|
|
|
import com.uas.platform.b2b.dao.PurchaseOrderChangeDao;
|
|
import com.uas.platform.b2b.dao.PurchaseOrderChangeDao;
|
|
|
import com.uas.platform.b2b.dao.PurchaseOrderChangeItemDao;
|
|
import com.uas.platform.b2b.dao.PurchaseOrderChangeItemDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.PurchaseOrderDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
|
|
|
import com.uas.platform.b2b.erp.model.SaleDownChangeReply;
|
|
import com.uas.platform.b2b.erp.model.SaleDownChangeReply;
|
|
|
import com.uas.platform.b2b.model.PurchaseOrder;
|
|
import com.uas.platform.b2b.model.PurchaseOrder;
|
|
|
import com.uas.platform.b2b.model.PurchaseOrderChange;
|
|
import com.uas.platform.b2b.model.PurchaseOrderChange;
|
|
|
import com.uas.platform.b2b.model.PurchaseOrderChangeItem;
|
|
import com.uas.platform.b2b.model.PurchaseOrderChangeItem;
|
|
|
|
|
+import com.uas.platform.b2b.model.PurchaseOrderItem;
|
|
|
import com.uas.platform.b2b.service.PurchaseOrderChangeService;
|
|
import com.uas.platform.b2b.service.PurchaseOrderChangeService;
|
|
|
import com.uas.platform.b2b.support.SystemSession;
|
|
import com.uas.platform.b2b.support.SystemSession;
|
|
|
import com.uas.platform.b2b.support.XingePusher;
|
|
import com.uas.platform.b2b.support.XingePusher;
|
|
@@ -39,6 +43,11 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private EnterpriseDao enterpriseDao;
|
|
private EnterpriseDao enterpriseDao;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private PurchaseOrderDao purchaseOrderDao;
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private PurchaseOrderItemDao purchaseOrderItemDao;
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public void save(List<PurchaseOrderChangeItem> changeItems) {
|
|
public void save(List<PurchaseOrderChangeItem> changeItems) {
|
|
|
purchaseOrderChangeItemDao.save(changeItems);
|
|
purchaseOrderChangeItemDao.save(changeItems);
|
|
@@ -73,6 +82,33 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
|
|
|
if (change != null) {
|
|
if (change != null) {
|
|
|
change.setBackStatus((short) Status.DOWNLOADED.value());
|
|
change.setBackStatus((short) Status.DOWNLOADED.value());
|
|
|
purchaseOrderChangeDao.save(change);
|
|
purchaseOrderChangeDao.save(change);
|
|
|
|
|
+ // 变更信息反馈到客户采购单
|
|
|
|
|
+ changeOrder(change);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 变更信息反馈到客户采购单
|
|
|
|
|
+ *
|
|
|
|
|
+ * @param change
|
|
|
|
|
+ */
|
|
|
|
|
+ private void changeOrder(PurchaseOrderChange change) {
|
|
|
|
|
+ PurchaseOrder order = change.getOrder();
|
|
|
|
|
+ order.setCurrency(change.getNewCurrency());
|
|
|
|
|
+ order.setRate(change.getNewRate());
|
|
|
|
|
+ order.setPayments(change.getNewPayments());
|
|
|
|
|
+ purchaseOrderDao.save(order);
|
|
|
|
|
+ if (!CollectionUtils.isEmpty(change.getOrderChangeItems())) {
|
|
|
|
|
+ for (PurchaseOrderChangeItem changeItem : change.getOrderChangeItems()) {
|
|
|
|
|
+ PurchaseOrderItem orderItem = changeItem.getOrderItem();
|
|
|
|
|
+ orderItem.setDelivery(changeItem.getNewDelivery());
|
|
|
|
|
+ orderItem.setPrice(changeItem.getNewPrice());
|
|
|
|
|
+ orderItem.setQty(changeItem.getNewQty());
|
|
|
|
|
+ orderItem.setTaxrate(changeItem.getNewTaxrate());
|
|
|
|
|
+ orderItem.setProductId(changeItem.getNewProductId());
|
|
|
|
|
+ orderItem.setProduct(changeItem.getNewProduct());
|
|
|
|
|
+ purchaseOrderItemDao.save(orderItem);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|