Skip to content

Commit

Permalink
DD_Order window enhancements
Browse files Browse the repository at this point in the history 
refs: #6713
  • Loading branch information
@pvpurcarcosmin
pvpurcarcosmin committed May 27, 2020
1 parent a4f526c commit ad9ea51
Show file tree
Hide file tree
Showing 11 changed files with 705 additions and 88 deletions.
42 changes: 42 additions & 0 deletions .../de.metas.adempiere.adempiere/base/src/main/java-gen/org/eevolution/model/I_DD_Order.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1084,6 +1084,27 @@ public interface I_DD_Order
/** Column name M_Shipper_ID */
public static final String COLUMNNAME_M_Shipper_ID = "M_Shipper_ID";

/**
* Set Warehouse from.
*
* <br>Type: Search
* <br>Mandatory: true
* <br>Virtual Column: false
*/
public void setM_Warehouse_From_ID (int M_Warehouse_From_ID);

/**
* Get Warehouse from.
*
* <br>Type: Search
* <br>Mandatory: true
* <br>Virtual Column: false
*/
public int getM_Warehouse_From_ID();

/** Column name M_Warehouse_From_ID */
public static final String COLUMNNAME_M_Warehouse_From_ID = "M_Warehouse_From_ID";

/**
* Set Lager.
* Storage Warehouse and Service Point
Expand Down Expand Up @@ -1113,6 +1134,27 @@ public interface I_DD_Order
/** Column name M_Warehouse_ID */
public static final String COLUMNNAME_M_Warehouse_ID = "M_Warehouse_ID";

/**
* Set Warehouse to.
*
* <br>Type: Search
* <br>Mandatory: true
* <br>Virtual Column: false
*/
public void setM_Warehouse_To_ID (int M_Warehouse_To_ID);

/**
* Get Warehouse to.
*
* <br>Type: Search
* <br>Mandatory: true
* <br>Virtual Column: false
*/
public int getM_Warehouse_To_ID();

/** Column name M_Warehouse_To_ID */
public static final String COLUMNNAME_M_Warehouse_To_ID = "M_Warehouse_To_ID";

/**
* Set MRP Allow Cleanup.
* MRP is allowed to remove this document
Expand Down
60 changes: 52 additions & 8 deletions .../de.metas.adempiere.adempiere/base/src/main/java-gen/org/eevolution/model/X_DD_Order.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/** Generated Model - DO NOT CHANGE */
package org.eevolution.model;

import static org.eevolution.model.I_DD_Order.COLUMNNAME_IsApproved;

import java.math.BigDecimal;
import java.sql.ResultSet;
import java.util.Properties;
Expand All @@ -17,7 +15,7 @@ public class X_DD_Order extends org.compiere.model.PO implements I_DD_Order, org
/**
*
*/
private static final long serialVersionUID = -1609246920L;
private static final long serialVersionUID = -936086873L;

/** Standard Constructor */
public X_DD_Order (Properties ctx, int DD_Order_ID, String trxName)
Expand All @@ -42,7 +40,9 @@ public X_DD_Order (Properties ctx, int DD_Order_ID, String trxName)
setIsInTransit (false); // N
setIsPrinted (false); // N
setIsSOTrx (false); // @IsSOTrx@
setM_Warehouse_From_ID (0); // 540008
setM_Warehouse_ID (0);
setM_Warehouse_To_ID (0); // 540005
setMRP_AllowCleanup (false); // N
setMRP_Generated (false); // N
setMRP_ToDelete (false); // N
Expand Down Expand Up @@ -627,7 +627,7 @@ public int getDD_Order_ID ()
return ii.intValue();
}

// /**
// /**
// * DeliveryRule AD_Reference_ID=151
// * Reference name: C_Order DeliveryRule
// */
Expand Down Expand Up @@ -988,7 +988,7 @@ public boolean isDropShip ()
}

/** Set In Dispute.
@param IsInDispute
@param IsInDispute
Document is in dispute
*/
@Override
Expand Down Expand Up @@ -1187,6 +1187,50 @@ public int getM_Warehouse_ID ()
return 0;
return ii.intValue();
}
/** Set Warehouse from.
@param M_Warehouse_From_ID Warehouse from */
@Override
public void setM_Warehouse_From_ID (int M_Warehouse_From_ID)
{
if (M_Warehouse_From_ID < 1)
set_Value (COLUMNNAME_M_Warehouse_From_ID, null);
else
set_Value (COLUMNNAME_M_Warehouse_From_ID, Integer.valueOf(M_Warehouse_From_ID));
}

/** Get Warehouse from.
@return Warehouse from */
@Override
public int getM_Warehouse_From_ID ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_M_Warehouse_From_ID);
if (ii == null)
return 0;
return ii.intValue();
}


/** Set Warehouse to.
@param M_Warehouse_To_ID Warehouse to */
@Override
public void setM_Warehouse_To_ID (int M_Warehouse_To_ID)
{
if (M_Warehouse_To_ID < 1)
set_Value (COLUMNNAME_M_Warehouse_To_ID, null);
else
set_Value (COLUMNNAME_M_Warehouse_To_ID, Integer.valueOf(M_Warehouse_To_ID));
}

/** Get Warehouse to.
@return Warehouse to */
@Override
public int getM_Warehouse_To_ID ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_M_Warehouse_To_ID);
if (ii == null)
return 0;
return ii.intValue();
}

/** Set MRP Allow Cleanup.
@param MRP_AllowCleanup
Expand Down Expand Up @@ -1435,7 +1479,7 @@ public java.lang.String getPriorityRule ()

/** Set Verarbeitet.
@param Processed
Checkbox sagt aus, ob der Beleg verarbeitet wurde.
Checkbox sagt aus, ob der Beleg verarbeitet wurde.
*/
@Override
public void setProcessed (boolean Processed)
Expand All @@ -1444,7 +1488,7 @@ public void setProcessed (boolean Processed)
}

/** Get Verarbeitet.
@return Checkbox sagt aus, ob der Beleg verarbeitet wurde.
@return Checkbox sagt aus, ob der Beleg verarbeitet wurde.
*/
@Override
public boolean isProcessed ()
Expand Down Expand Up @@ -1696,4 +1740,4 @@ public java.math.BigDecimal getWeight ()
return BigDecimal.ZERO;
return bd;
}
}
}
101 changes: 49 additions & 52 deletions backend/de.metas.business/src/main/java/de/metas/pricing/service/impl/PriceListDAO.java
View file
Original file line number Diff line number Diff line change
@@ -1,60 +1,8 @@
package de.metas.pricing.service.impl;

import static de.metas.util.Check.assumeNotNull;
import static org.adempiere.model.InterfaceWrapperHelper.copy;
import static org.adempiere.model.InterfaceWrapperHelper.getCtx;
import static org.adempiere.model.InterfaceWrapperHelper.load;
import static org.adempiere.model.InterfaceWrapperHelper.loadOutOfTrx;
import static org.adempiere.model.InterfaceWrapperHelper.newInstance;
import static org.adempiere.model.InterfaceWrapperHelper.save;
import static org.adempiere.model.InterfaceWrapperHelper.saveRecord;

import java.math.BigDecimal;
import java.sql.Timestamp;
import java.time.LocalDate;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Optional;
import java.util.Properties;
import java.util.Set;
import java.util.stream.Stream;

import javax.annotation.Nullable;

import org.adempiere.ad.dao.ICompositeQueryFilter;
import org.adempiere.ad.dao.IQueryBL;
import org.adempiere.ad.dao.IQueryBuilder;
import org.adempiere.ad.dao.IQueryFilter;
import org.adempiere.ad.dao.impl.CompareQueryFilter;
import org.adempiere.ad.dao.impl.CompareQueryFilter.Operator;
import org.adempiere.ad.dao.impl.DateTruncQueryFilterModifier;
import org.adempiere.ad.dao.impl.TypedSqlQueryFilter;
import org.adempiere.ad.session.ISessionBL;
import org.adempiere.ad.trx.api.ITrx;
import org.adempiere.exceptions.AdempiereException;
import org.adempiere.mm.attributes.AttributeSetInstanceId;
import org.adempiere.mm.attributes.api.IAttributeDAO;
import org.adempiere.model.InterfaceWrapperHelper;
import org.adempiere.util.proxy.Cached;
import org.compiere.model.IQuery;
import org.compiere.model.IQuery.Aggregate;
import org.compiere.model.I_C_BPartner;
import org.compiere.model.I_M_PriceList;
import org.compiere.model.I_M_PriceList_Version;
import org.compiere.model.I_M_PricingSystem;
import org.compiere.model.I_M_ProductPrice;
import org.compiere.util.DB;
import org.compiere.util.Env;
import org.compiere.util.TimeUtil;
import org.slf4j.Logger;

import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;

import de.metas.bpartner.BPartnerLocationId;
import de.metas.bpartner.service.IBPartnerDAO;
import de.metas.cache.annotation.CacheCtx;
Expand All @@ -80,6 +28,55 @@
import de.metas.util.NumberUtils;
import de.metas.util.Services;
import lombok.NonNull;
import org.adempiere.ad.dao.ICompositeQueryFilter;
import org.adempiere.ad.dao.IQueryBL;
import org.adempiere.ad.dao.IQueryBuilder;
import org.adempiere.ad.dao.IQueryFilter;
import org.adempiere.ad.dao.impl.CompareQueryFilter;
import org.adempiere.ad.dao.impl.CompareQueryFilter.Operator;
import org.adempiere.ad.dao.impl.DateTruncQueryFilterModifier;
import org.adempiere.ad.dao.impl.TypedSqlQueryFilter;
import org.adempiere.ad.session.ISessionBL;
import org.adempiere.ad.trx.api.ITrx;
import org.adempiere.exceptions.AdempiereException;
import org.adempiere.mm.attributes.AttributeSetInstanceId;
import org.adempiere.mm.attributes.api.IAttributeDAO;
import org.adempiere.model.InterfaceWrapperHelper;
import org.adempiere.util.proxy.Cached;
import org.compiere.model.IQuery;
import org.compiere.model.IQuery.Aggregate;
import org.compiere.model.I_C_BPartner;
import org.compiere.model.I_M_PriceList;
import org.compiere.model.I_M_PriceList_Version;
import org.compiere.model.I_M_PricingSystem;
import org.compiere.model.I_M_ProductPrice;
import org.compiere.util.DB;
import org.compiere.util.Env;
import org.compiere.util.TimeUtil;
import org.slf4j.Logger;

import javax.annotation.Nullable;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.time.LocalDate;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Optional;
import java.util.Properties;
import java.util.Set;
import java.util.stream.Stream;

import static de.metas.util.Check.assumeNotNull;
import static org.adempiere.model.InterfaceWrapperHelper.copy;
import static org.adempiere.model.InterfaceWrapperHelper.getCtx;
import static org.adempiere.model.InterfaceWrapperHelper.load;
import static org.adempiere.model.InterfaceWrapperHelper.loadOutOfTrx;
import static org.adempiere.model.InterfaceWrapperHelper.newInstance;
import static org.adempiere.model.InterfaceWrapperHelper.save;
import static org.adempiere.model.InterfaceWrapperHelper.saveRecord;

public class PriceListDAO implements IPriceListDAO
{
Expand Down
46 changes: 22 additions & 24 deletions ...its.base/src/main/java/de/metas/handlingunits/ddorder/api/impl/DDOrderLinesAllocator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,7 @@
* #L%
*/

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import org.adempiere.ad.trx.api.ITrxManager;
import org.adempiere.model.InterfaceWrapperHelper;
import org.compiere.model.I_M_MovementLine;
import org.eevolution.api.IDDOrderBL;
import org.eevolution.api.IDDOrderDAO;
import org.eevolution.api.IDDOrderMovementBuilder;
import org.eevolution.model.I_DD_Order;
import org.eevolution.model.I_DD_OrderLine;
import org.eevolution.model.I_DD_OrderLine_Alternative;
import org.eevolution.model.I_DD_OrderLine_Or_Alternative;
import org.slf4j.Logger;

import com.google.common.collect.ImmutableList;

import de.metas.handlingunits.IHUContextFactory;
import de.metas.handlingunits.ddorder.api.IHUDDOrderBL;
import de.metas.handlingunits.exceptions.HUException;
Expand All @@ -61,6 +37,28 @@
import de.metas.util.Services;
import de.metas.util.time.SystemTime;
import lombok.NonNull;
import org.adempiere.ad.trx.api.ITrxManager;
import org.adempiere.model.InterfaceWrapperHelper;
import org.compiere.model.I_M_MovementLine;
import org.eevolution.api.IDDOrderBL;
import org.eevolution.api.IDDOrderDAO;
import org.eevolution.api.IDDOrderMovementBuilder;
import org.eevolution.model.I_DD_Order;
import org.eevolution.model.I_DD_OrderLine;
import org.eevolution.model.I_DD_OrderLine_Alternative;
import org.eevolution.model.I_DD_OrderLine_Or_Alternative;
import org.slf4j.Logger;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

/**
* Allocate {@link IHUProductStorage}s to a set of given {@link I_DD_OrderLine_Alternative}s and generate material movements.
Expand Down

0 comments on commit ad9ea51

Please sign in to comment.