Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[14.0][IMP] shopfloor zone picking improve select_line endpoint/state #727

Merged
merged 2 commits into from
Aug 28, 2023

Conversation

TDu
Copy link
Member

@TDu TDu commented Aug 17, 2023

ref.: rau-214 rau-215

@OCA-git-bot
Copy link
Contributor

Hi @simahawk, @sebalix, @guewen,
some modules you are maintaining are being modified, check this out!

Comment on lines 632 to 641
if (
this.state.data.scan_location_or_pack_first &&
!sublocation
!sublocation &&
!pack
) {
if (this.all_lines_with_package()) {
return "Scan pack";
}
return "Scan location / pack";
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

                            if (this.state.data.scan_location_or_pack_first)
                                if (!pack && this.all_lines_with_package() {
                                    return "Scan pack";
                                }
                                if (!sublocation && !pack) {
                                    return "Scan location / pack";
                                }
                                if (any_line_with_lot) {
                                    return "Scan product / lot";
                                } else {
                                    return "Scan product";
                                }
                            }

shopfloor_mobile/static/wms/src/scenario/zone_picking.js Outdated Show resolved Hide resolved
@TDu TDu force-pushed the 14-sf-zp-scan-at-least-one-prodcut branch from 776f2ca to 8e31839 Compare August 22, 2023 08:57
Comment on lines 661 to 788
return "Scan product / pack / lot";
}
return "Scan product / pack";
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pack / product / lot
Why having pack after product? Or product / lot / pack

pack / product ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed

@jbaudoux
Copy link
Contributor

@TDu Can you squash the fixups?

@TDu TDu force-pushed the 14-sf-zp-scan-at-least-one-prodcut branch from f8a60b5 to 1863d4c Compare August 23, 2023 14:55
@TDu
Copy link
Member Author

TDu commented Aug 23, 2023

squashed

On line selection for the zone picking scenario.

Without this change the user may move a product without ever
scanning the product barcode or lot.
Because after scanning scanning a packge if only one line is left
the next screen with the quantity picker is shown to the user, where
the quantity can be changed manually or by scanning a product.
@jbaudoux jbaudoux force-pushed the 14-sf-zp-scan-at-least-one-prodcut branch from e9d295c to 9fb2f85 Compare August 23, 2023 21:28
@jbaudoux
Copy link
Contributor

rebased

@OCA-git-bot
Copy link
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

@jbaudoux
Copy link
Contributor

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 14.0-ocabot-merge-pr-727-by-jbaudoux-bump-minor, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 0d6f58a into OCA:14.0 Aug 28, 2023
7 checks passed
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at d5cb57d. Thanks a lot for contributing to OCA. ❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants