add link between po children and purchase request
This commit is contained in:
@@ -93,6 +93,9 @@ public class PurchaseRequestServiceImpl implements PurchaseRequestService {
|
|||||||
// SOPHAL
|
// SOPHAL
|
||||||
setProjectPurchaseOrder(purchaseOrder, purchaseRequest);
|
setProjectPurchaseOrder(purchaseOrder, purchaseRequest);
|
||||||
purchaseOrder.setNotes(purchaseRequest.getDescription());
|
purchaseOrder.setNotes(purchaseRequest.getDescription());
|
||||||
|
// sophal set purchase request
|
||||||
|
// purchaseOrder.setPurchaseRequest(purchaseRequest.getId());
|
||||||
|
// sophal
|
||||||
purchaseOrderRepo.save(purchaseOrder);
|
purchaseOrderRepo.save(purchaseOrder);
|
||||||
// SOPHAL
|
// SOPHAL
|
||||||
key = key == null ? purchaseRequest.getId().toString() : key;
|
key = key == null ? purchaseRequest.getId().toString() : key;
|
||||||
@@ -133,6 +136,7 @@ public class PurchaseRequestServiceImpl implements PurchaseRequestService {
|
|||||||
}
|
}
|
||||||
purchaseOrder.getPurchaseOrderLineList().addAll(purchaseOrderLineList);
|
purchaseOrder.getPurchaseOrderLineList().addAll(purchaseOrderLineList);
|
||||||
purchaseOrderService.computePurchaseOrder(purchaseOrder);
|
purchaseOrderService.computePurchaseOrder(purchaseOrder);
|
||||||
|
purchaseOrder.setPurchaseRequestOrigin(purchaseRequest);
|
||||||
purchaseOrderRepo.save(purchaseOrder);
|
purchaseOrderRepo.save(purchaseOrder);
|
||||||
Set<PurchaseOrder> hash_Set = new HashSet<PurchaseOrder>();
|
Set<PurchaseOrder> hash_Set = new HashSet<PurchaseOrder>();
|
||||||
hash_Set.add(purchaseOrder);
|
hash_Set.add(purchaseOrder);
|
||||||
|
|||||||
@@ -69,6 +69,8 @@
|
|||||||
<integer name="importationType" selection="importation.folder.type.select" title="Type d'importation" default="1" />
|
<integer name="importationType" selection="importation.folder.type.select" title="Type d'importation" default="1" />
|
||||||
<many-to-one name="importationFolder" ref="com.axelor.apps.purchase.db.ImportationFolder" title="Dossier d'importation" />
|
<many-to-one name="importationFolder" ref="com.axelor.apps.purchase.db.ImportationFolder" title="Dossier d'importation" />
|
||||||
|
|
||||||
|
<many-to-one name="purchaseRequestOrigin" ref="com.axelor.apps.purchase.db.PurchaseRequest" title="Purchase Request" />
|
||||||
|
|
||||||
<unique-constraint columns="purchaseOrderSeq,company"/>
|
<unique-constraint columns="purchaseOrderSeq,company"/>
|
||||||
|
|
||||||
<extra-code>
|
<extra-code>
|
||||||
|
|||||||
@@ -28,9 +28,11 @@ import com.axelor.apps.base.service.PartnerPriceListService;
|
|||||||
import com.axelor.apps.base.service.app.AppBaseService;
|
import com.axelor.apps.base.service.app.AppBaseService;
|
||||||
import com.axelor.apps.purchase.db.PurchaseOrder;
|
import com.axelor.apps.purchase.db.PurchaseOrder;
|
||||||
import com.axelor.apps.purchase.db.PurchaseOrderLine;
|
import com.axelor.apps.purchase.db.PurchaseOrderLine;
|
||||||
|
import com.axelor.apps.purchase.db.PurchaseRequest;
|
||||||
import com.axelor.apps.purchase.db.SupplierCatalog;
|
import com.axelor.apps.purchase.db.SupplierCatalog;
|
||||||
import com.axelor.apps.purchase.db.repo.PurchaseOrderLineRepository;
|
import com.axelor.apps.purchase.db.repo.PurchaseOrderLineRepository;
|
||||||
import com.axelor.apps.purchase.db.repo.PurchaseOrderRepository;
|
import com.axelor.apps.purchase.db.repo.PurchaseOrderRepository;
|
||||||
|
import com.axelor.apps.purchase.db.repo.PurchaseRequestRepository;
|
||||||
import com.axelor.apps.purchase.service.PurchaseOrderLineService;
|
import com.axelor.apps.purchase.service.PurchaseOrderLineService;
|
||||||
import com.axelor.apps.purchase.service.app.AppPurchaseService;
|
import com.axelor.apps.purchase.service.app.AppPurchaseService;
|
||||||
import com.axelor.apps.stock.service.StockLocationService;
|
import com.axelor.apps.stock.service.StockLocationService;
|
||||||
@@ -52,6 +54,8 @@ import java.util.List;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
public class PurchaseOrderSupplierService {
|
public class PurchaseOrderSupplierService {
|
||||||
|
|
||||||
@@ -65,6 +69,8 @@ public class PurchaseOrderSupplierService {
|
|||||||
|
|
||||||
@Inject protected PurchaseOrderRepository poRepo;
|
@Inject protected PurchaseOrderRepository poRepo;
|
||||||
|
|
||||||
|
@Inject private PurchaseRequestRepository purchaseRequestRepo;
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
public void generateAllSuppliersRequests(PurchaseOrder purchaseOrder) {
|
public void generateAllSuppliersRequests(PurchaseOrder purchaseOrder) {
|
||||||
|
|
||||||
@@ -128,13 +134,22 @@ public class PurchaseOrderSupplierService {
|
|||||||
Map<Partner, List<PurchaseOrderLine>> purchaseOrderLinesBySupplierPartner =
|
Map<Partner, List<PurchaseOrderLine>> purchaseOrderLinesBySupplierPartner =
|
||||||
this.splitBySupplierPartner(purchaseOrder.getPurchaseOrderLineList());
|
this.splitBySupplierPartner(purchaseOrder.getPurchaseOrderLineList());
|
||||||
|
|
||||||
|
// remove link purchase order purchase request
|
||||||
|
PurchaseRequest purchaseRequest = Beans.get(PurchaseRequestRepository.class).find(purchaseOrder.getPurchaseRequestOrigin().getId());
|
||||||
|
purchaseRequest.getPurchaseOrderSet().remove(purchaseOrder);
|
||||||
|
Set<PurchaseOrder> hash_Set = new HashSet<PurchaseOrder>();
|
||||||
|
|
||||||
for (Partner supplierPartner : purchaseOrderLinesBySupplierPartner.keySet()) {
|
for (Partner supplierPartner : purchaseOrderLinesBySupplierPartner.keySet()) {
|
||||||
|
|
||||||
PurchaseOrder PurchaseOrderNew = this.createPurchaseOrderSophal(
|
PurchaseOrder PurchaseOrderNew = this.createPurchaseOrderSophal(
|
||||||
supplierPartner, purchaseOrderLinesBySupplierPartner.get(supplierPartner), purchaseOrder);
|
supplierPartner, purchaseOrderLinesBySupplierPartner.get(supplierPartner), purchaseOrder);
|
||||||
|
// sophal
|
||||||
|
hash_Set.add(PurchaseOrderNew);
|
||||||
createPurchaseOrderSupplierLineTCO(PurchaseOrderNew.getPurchaseOrderLineList() ,purchaseOrderLinesBySupplierPartner.get(supplierPartner));
|
createPurchaseOrderSupplierLineTCO(PurchaseOrderNew.getPurchaseOrderLineList() ,purchaseOrderLinesBySupplierPartner.get(supplierPartner));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
purchaseRequest.setPurchaseOrderSet(hash_Set);
|
||||||
|
purchaseRequestRepo.save(purchaseRequest);
|
||||||
purchaseOrder.setArchived(true);
|
purchaseOrder.setArchived(true);
|
||||||
poRepo.save(purchaseOrder);
|
poRepo.save(purchaseOrder);
|
||||||
}
|
}
|
||||||
@@ -273,7 +288,7 @@ public class PurchaseOrderSupplierService {
|
|||||||
|
|
||||||
purchaseOrder.setStatusSelect(PurchaseOrderRepository.STATUS_REQUESTED);
|
purchaseOrder.setStatusSelect(PurchaseOrderRepository.STATUS_REQUESTED);
|
||||||
purchaseOrder.setReceiptState(PurchaseOrderRepository.STATE_NOT_RECEIVED);
|
purchaseOrder.setReceiptState(PurchaseOrderRepository.STATE_NOT_RECEIVED);
|
||||||
|
purchaseOrder.setPurchaseRequestOrigin(parentPurchaseOrder.getPurchaseRequestOrigin());
|
||||||
poRepo.save(purchaseOrder);
|
poRepo.save(purchaseOrder);
|
||||||
|
|
||||||
return purchaseOrder;
|
return purchaseOrder;
|
||||||
|
|||||||
Reference in New Issue
Block a user