Misc changes

#6975
metasfresh · Jul 8, 2020 · 7703e94 · 7703e94
1 parent 9c1da26
commit 7703e94
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 27 deletions.
diff --git a/...esh-webui-api/src/main/java/de/metas/ui/web/pporder/process/PackingInfoProcessParams.java b/...esh-webui-api/src/main/java/de/metas/ui/web/pporder/process/PackingInfoProcessParams.java
@@ -382,13 +382,13 @@ public I_M_HU_LUTU_Configuration createAndSaveNewLUTUConfig()
 		configureLUTUConfigTU(lutuConfigNew, M_HU_PI_Item_Product_ID, qtyTU);
 
 		// LU
-		configureLUTUConfigLU(lutuConfigNew, lu_PI_Item_ID);
+		configureLUTUConfigLU(lutuConfigNew, lu_PI_Item_ID, getQtyLU());
 
 		lutuConfigurationFactory.save(lutuConfigNew);
 		return lutuConfigNew;
 	}
 
-	private void configureLUTUConfigTU(
+	private static void configureLUTUConfigTU(
 			@NonNull final I_M_HU_LUTU_Configuration lutuConfigNew,
 			final HUPIItemProductId M_HU_PI_Item_Product_ID,
 			@NonNull final BigDecimal qtyTU)
@@ -402,13 +402,13 @@ private void configureLUTUConfigTU(
 		lutuConfigNew.setIsInfiniteQtyTU(false);
 	}
 
-	private void configureLUTUConfigLU(
+	private static void configureLUTUConfigLU(
 			@NonNull final I_M_HU_LUTU_Configuration lutuConfigNew,
-			final int lu_PI_Item_ID)
+			final int lu_PI_Item_ID,
+			final BigDecimal qtyLU)
 	{
 		if (lu_PI_Item_ID > 0)
 		{
-			final BigDecimal qtyLU = getQtyLU();
 			if (qtyLU == null || qtyLU.signum() <= 0)
 			{
 				throw new FillMandatoryException(PARAM_QtyLU);

diff --git a/...fresh-webui-api/src/main/java/de/metas/ui/web/pporder/process/WEBUI_PP_Order_Receipt.java b/...fresh-webui-api/src/main/java/de/metas/ui/web/pporder/process/WEBUI_PP_Order_Receipt.java
@@ -136,27 +136,6 @@ else if (type == PPOrderLineType.BOMLine_ByCoProduct)
 		}
 	}
 
-	private final IPPOrderReceiptHUProducer newReceiptCandidatesProducer()
-	{
-		final PPOrderLineRow row = getSingleSelectedRow();
-
-		final PPOrderLineType type = row.getType();
-		if (type == PPOrderLineType.MainProduct)
-		{
-			final PPOrderId ppOrderId = row.getOrderId();
-			return huPPOrderBL.receivingMainProduct(ppOrderId);
-		}
-		else if (type == PPOrderLineType.BOMLine_ByCoProduct)
-		{
-			final PPOrderBOMLineId ppOrderBOMLineId = row.getOrderBOMLineId();
-			return huPPOrderBL.receivingByOrCoProduct(ppOrderBOMLineId);
-		}
-		else
-		{
-			throw new AdempiereException("Receiving is not allowed");
-		}
-	}
-
 	@Override
 	protected ProcessPreconditionsResolution checkPreconditionsApplicable()
 	{
@@ -216,7 +195,7 @@ public LookupValuesList getM_HU_PI_Item_Products()
 
 	/**
 	 * For the currently selected pip this method loads att
-	 * 
+	 *
 	 * @return
 	 */
 	@ProcessParamLookupValuesProvider(parameterName = PackingInfoProcessParams.PARAM_M_HU_PI_Item_ID, dependsOn = PackingInfoProcessParams.PARAM_M_HU_PI_Item_Product_ID, numericKey = true, lookupTableName = I_M_HU_PI_Item.Table_Name)
@@ -248,4 +227,25 @@ protected void postProcess(boolean success)
 
 		getViewsRepo().notifyRecordChanged(I_PP_Order.Table_Name, ppOrderLinesView.getPpOrderId().getRepoId());
 	}
+
+	private final IPPOrderReceiptHUProducer newReceiptCandidatesProducer()
+	{
+		final PPOrderLineRow row = getSingleSelectedRow();
+
+		final PPOrderLineType type = row.getType();
+		if (type == PPOrderLineType.MainProduct)
+		{
+			final PPOrderId ppOrderId = row.getOrderId();
+			return huPPOrderBL.receivingMainProduct(ppOrderId);
+		}
+		else if (type == PPOrderLineType.BOMLine_ByCoProduct)
+		{
+			final PPOrderBOMLineId ppOrderBOMLineId = row.getOrderBOMLineId();
+			return huPPOrderBL.receivingByOrCoProduct(ppOrderBOMLineId);
+		}
+		else
+		{
+			throw new AdempiereException("Receiving is not allowed");
+		}
+	}
 }