From a77b9733e9f6f4b6a2b889097db8ad1ff8cba0e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Sch=C3=B6neberg?= Date: Fri, 15 Sep 2017 08:46:43 +0200 Subject: [PATCH] Adapt PPOrderLinesView to api change in metasfresh also *very* minor changes in PPOrderLinesViewData and PPOrderHUsToIssueActions Filter by warehouse when selecting HUs to issue https://github.com/metasfresh/metasfresh-webui-api/issues/591 --- .../de/metas/ui/web/pporder/PPOrderHUsToIssueActions.java | 2 +- .../java/de/metas/ui/web/pporder/PPOrderLinesView.java | 5 ++++- .../java/de/metas/ui/web/pporder/PPOrderLinesViewData.java | 7 +++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/metas/ui/web/pporder/PPOrderHUsToIssueActions.java b/src/main/java/de/metas/ui/web/pporder/PPOrderHUsToIssueActions.java index a661cc7f1..52a4cd4d3 100644 --- a/src/main/java/de/metas/ui/web/pporder/PPOrderHUsToIssueActions.java +++ b/src/main/java/de/metas/ui/web/pporder/PPOrderHUsToIssueActions.java @@ -128,7 +128,7 @@ else if (row.isTU()) } /** - * Action to issue selected HUs to currenty selected manufacturing order BOM line + * Action to issue selected HUs to currently selected manufacturing order BOM line * * @param husView * @param selectedHURowIds diff --git a/src/main/java/de/metas/ui/web/pporder/PPOrderLinesView.java b/src/main/java/de/metas/ui/web/pporder/PPOrderLinesView.java index fb61f744a..4f53a021a 100644 --- a/src/main/java/de/metas/ui/web/pporder/PPOrderLinesView.java +++ b/src/main/java/de/metas/ui/web/pporder/PPOrderLinesView.java @@ -381,8 +381,11 @@ public OpenIncludedViewAction actionOpenViewForHUsToIssue(final DocumentIdsSelec { throw new IllegalStateException("Row processed"); } + + final I_PP_Order_BOMLine ppOrderBomLine = load(selectedRow.getPP_Order_BOMLine_ID(), I_PP_Order_BOMLine.class); + final IHUPPOrderBL huppOrderBL = Services.get(IHUPPOrderBL.class); - final IHUQueryBuilder huIdsToAvailableToIssueQuery = huppOrderBL.createHUsAvailableToIssueQuery(selectedRow.getM_Product_ID()); + final IHUQueryBuilder huIdsToAvailableToIssueQuery = huppOrderBL.createHUsAvailableToIssueQuery(ppOrderBomLine); final IViewsRepository viewsRepo = Adempiere.getSpringApplicationContext().getBean(IViewsRepository.class); // TODO dirty workaround final IView husToIssueView = viewsRepo.createView(CreateViewRequest.builder(WEBUI_HU_Constants.WEBUI_HU_Window_ID, JSONViewDataType.includedView) diff --git a/src/main/java/de/metas/ui/web/pporder/PPOrderLinesViewData.java b/src/main/java/de/metas/ui/web/pporder/PPOrderLinesViewData.java index e9dec7415..aef545d1b 100644 --- a/src/main/java/de/metas/ui/web/pporder/PPOrderLinesViewData.java +++ b/src/main/java/de/metas/ui/web/pporder/PPOrderLinesViewData.java @@ -53,12 +53,15 @@ /** All records (included ones too) indexed by DocumentId */ private final ImmutableMap allRecordsById; - PPOrderLinesViewData(@NonNull final ITranslatableString description, @NonNull final String planningStatus, final List records) + PPOrderLinesViewData( + @NonNull final ITranslatableString description, + @NonNull final String planningStatus, + @NonNull final List records) { - super(); this.description = description; this.planningStatus = planningStatus; this.records = ImmutableList.copyOf(records); + allRecordsById = buildRecordsByIdMap(this.records); }