[14.0][IMP] shopfloor: zone picking handle complete mix package #621

TDu · 2023-04-24T10:14:32Z

When a package has different product in it, it will be displayed with multiple move lines in the select_line step. And they will need to be move one after an other.

For such package, this change allows to move such package in one step.

ref.: rau-145

OCA-git-bot · 2023-04-24T10:14:41Z

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

shopfloor_mobile/static/wms/src/scenario/zone_picking.js

shopfloor/services/zone_picking.py

shopfloor_mobile/static/wms/src/scenario/zone_picking.js

TDu · 2023-04-28T06:45:14Z

@mt-software-de thanks for your review. I updated the code for both of your comments.

shopfloor/services/zone_picking.py

jbaudoux

The mobile version is not displaying correctly that a complete package is being moved. Only the desktop version is changed.

shopfloor/actions/packaging.py

jbaudoux

I was not able to validate the move anymore. Odoo is complaining the package cannot be on 2 different locations

TDu · 2023-06-16T10:49:27Z

I was not able to validate the move anymore. Odoo is complaining the package cannot be on 2 different locations

I pretty sure I fixed that error after the rebase.

TDu · 2023-07-18T13:11:48Z

shopfloor/services/zone_picking.py

+        self._actions_for("packaging")
+        data["handle_complete_mix_pack"] = (
+            self._handle_complete_mix_pack(move_line.package_id)
+            and not self.work.menu.no_prefill_qty


This line seems to be redundant with what is in the _handle_complete_mix_pack function

jbaudoux · 2023-07-18T13:12:41Z

shopfloor/actions/packaging.py

+        all the package quantities are reserved.
+        """
+        return self.package_has_several_products(package) and all(
+            [quant.quantity == quant.reserved_quantity for quant in package.quant_ids]


Suggested change

[quant.quantity == quant.reserved_quantity for quant in package.quant_ids]

quant.quantity == quant.reserved_quantity for quant in package.quant_ids

jbaudoux

Also in change_package_lot.change_package here https://github.com/OCA/wms/pull/621/files#diff-81fce66279454c4c0be2adf1f46eb4e629c63edfe409c4cf6bda95940686f9bcR676
it is lacking the new package in the ok func (response for set line destination) in case of complete mix pack

Btw, it is also lacking the qty_done there but not related to this PR

cc @mt-software-de

shopfloor/services/zone_picking.py

jbaudoux · 2023-07-18T15:46:41Z

shopfloor/services/zone_picking.py

+            if (
+                packaging.package_has_several_products(package)
+                and not handle_complete_mix_pack
+            ):


With above suggestion, you can drop this change

shopfloor/services/zone_picking.py

mt-software-de · 2023-07-19T02:22:44Z

shopfloor/services/zone_picking.py

        try:
-            stock.mark_move_line_as_picked(move_line, quantity, check_user=True)
+            stock.mark_move_line_as_picked(move_lines, quantity, check_user=True)
        except ConcurentWorkOnTransfer as error:
            response = self._response_for_set_line_destination(


Because of line 938 where you set the quantity = None
we should not pass qty_done as argument.
Because we can not set qty_done to None, also it is not needed because it is already done.

kwargs = {} if not package: kwargs["qty_done"] = quantity response = self._response_for_set_line_destination( move_line, message={ "message_type": "error", "body": str(error), }, **kwargs ) return (location_changed, response)```

TDu · 2023-07-19T07:39:01Z

Last fixup updates all the previous comments

shopfloor/services/zone_picking.py

TDu · 2023-07-24T13:28:18Z

Also in change_package_lot.change_package here https://github.com/OCA/wms/pull/621/files#diff-81fce66279454c4c0be2adf1f46eb4e629c63edfe409c4cf6bda95940686f9bcR676 it is lacking the new package in the ok func (response for set line destination) in case of complete mix pack

This pr has been refactored a few times. And I could not find a reason for passing that package to _response_for_set_line_destination , it actually does not make sense because this is an odoo record that was passed and not some json data.

So it is not needed and removed from previous implementation.

jbaudoux

Tested

TDu · 2023-08-02T08:11:40Z

I squashed the commits and rebased.

jbaudoux

The move can be partially available

cc @mt-software-de

jbaudoux · 2023-08-08T13:05:26Z

shopfloor/services/zone_picking.py

+            quantity = None
+            # Handling all move lines from a complete mix pack
+            for _move_line in package.move_line_ids:
+                if _move_line.state != "assigned":


Suggested change

if _move_line.state != "assigned":

if _move_line.state not in ("assigned", "partially_available"):

jbaudoux · 2023-08-16T17:23:45Z

@mt-software-de Can you update your review?

mt-software-de · 2023-08-16T20:03:44Z

shopfloor/actions/data.py

+            (
+                "quant_ids:total_quantity",
+                lambda rec, fname: sum(rec.quant_ids.mapped("quantity")),
+            ),


Due to the mass test, performance problems are gradually appearing. One performance problem is the data loading. Because of that, we should only load the data that is really needed, in the screen. With this change, total_quantity is always loaded for the package data, also in other scenarios where it is not needed.

We could create a separate method, like _get_package_parser which is getting as argument the record to load and kwargs. And there we can add a kwarg like with_total_quantity.

can we do this improvement in another PR?

yes we can do this.
I think we should create a PR which is doing it for all scenarios then.

jbaudoux · 2023-08-23T03:56:21Z

@TDu can you squash the last fixup commit?

TDu · 2023-08-23T14:47:37Z

squashed and rebased.

When a package has different product in it, it will be displayed with multiple move lines in the `select_line` step. And they will need to be move one after an other. For such package, this change allows to move such package in one step. In the selection of a line only one line for such package will be displayed. The quantity picker will not be displayed.

TDu · 2023-08-23T15:20:24Z

I had to fix a test after the rebase on test_actions_data.py

jbaudoux · 2023-08-23T15:45:46Z

/ocabot merge minor

OCA-git-bot · 2023-08-23T15:48:35Z

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

OCA-git-bot · 2023-08-23T16:08:34Z

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

TDu force-pushed the 14.0-shopfloor-zp-pick-mix-pack branch 4 times, most recently from 324f2bf to 6b69945 Compare April 25, 2023 07:50

mt-software-de suggested changes Apr 27, 2023

View reviewed changes

shopfloor_mobile/static/wms/src/scenario/zone_picking.js Outdated Show resolved Hide resolved

mt-software-de suggested changes Apr 27, 2023

View reviewed changes

shopfloor/services/zone_picking.py Outdated Show resolved Hide resolved

mt-software-de suggested changes Apr 27, 2023

View reviewed changes

shopfloor_mobile/static/wms/src/scenario/zone_picking.js Outdated Show resolved Hide resolved

mt-software-de suggested changes Apr 28, 2023

View reviewed changes

shopfloor/services/zone_picking.py Outdated Show resolved Hide resolved

mt-software-de reviewed May 20, 2023

View reviewed changes

shopfloor/services/zone_picking.py Outdated Show resolved Hide resolved

jbaudoux changed the title ~~shopfloor: zone picking handle complete mix package~~ [14.0][FIX] shopfloor: zone picking handle complete mix package May 29, 2023

jbaudoux changed the title ~~[14.0][FIX] shopfloor: zone picking handle complete mix package~~ [14.0][IMP] shopfloor: zone picking handle complete mix package May 29, 2023

jbaudoux requested changes Jun 15, 2023

View reviewed changes

shopfloor/actions/packaging.py Outdated Show resolved Hide resolved

jbaudoux requested changes Jun 15, 2023

View reviewed changes

TDu force-pushed the 14.0-shopfloor-zp-pick-mix-pack branch from d605b53 to 0782202 Compare June 16, 2023 10:46

TDu force-pushed the 14.0-shopfloor-zp-pick-mix-pack branch from 0782202 to 010492b Compare June 19, 2023 04:01

TDu commented Jul 18, 2023

View reviewed changes

jbaudoux reviewed Jul 18, 2023

View reviewed changes

jbaudoux requested changes Jul 18, 2023

View reviewed changes

mt-software-de suggested changes Jul 19, 2023

View reviewed changes

mt-software-de reviewed Jul 19, 2023

View reviewed changes

shopfloor/services/zone_picking.py Outdated Show resolved Hide resolved

TDu force-pushed the 14.0-shopfloor-zp-pick-mix-pack branch from fa254b4 to 5b8338b Compare July 20, 2023 12:19

jbaudoux approved these changes Jul 30, 2023

View reviewed changes

TDu force-pushed the 14.0-shopfloor-zp-pick-mix-pack branch from cfba907 to 5727e3f Compare August 2, 2023 08:11

jbaudoux requested changes Aug 8, 2023

View reviewed changes

jbaudoux approved these changes Aug 16, 2023

View reviewed changes

mt-software-de suggested changes Aug 16, 2023

View reviewed changes

mt-software-de approved these changes Aug 23, 2023

View reviewed changes

OCA-git-bot added approved ready to merge labels Aug 23, 2023

TDu force-pushed the 14.0-shopfloor-zp-pick-mix-pack branch 2 times, most recently from 3bb18b8 to 564cd6b Compare August 23, 2023 14:47

TDu added 4 commits August 23, 2023 17:18

shopfloor: add total quantity on package data

5cb8fb2

shopfloor_mobile_base: add function for action path

eddfb9b

shopfloor_mobile: zone picking handle complete mix package

7962b3c

TDu force-pushed the 14.0-shopfloor-zp-pick-mix-pack branch from 564cd6b to 7962b3c Compare August 23, 2023 15:18

OCA-git-bot added the bot is merging ⏳ label Aug 23, 2023

OCA-git-bot merged commit fc2c45b into OCA:14.0 Aug 23, 2023
7 checks passed

OCA-git-bot added merged 🎉 and removed bot is merging ⏳ labels Aug 23, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[14.0][IMP] shopfloor: zone picking handle complete mix package #621

[14.0][IMP] shopfloor: zone picking handle complete mix package #621

TDu commented Apr 24, 2023

OCA-git-bot commented Apr 24, 2023

TDu commented Apr 28, 2023

jbaudoux left a comment

jbaudoux left a comment

TDu commented Jun 16, 2023

TDu Jul 18, 2023

jbaudoux Jul 18, 2023

jbaudoux left a comment •

edited

Loading

jbaudoux Jul 18, 2023

mt-software-de Jul 19, 2023

TDu commented Jul 19, 2023

TDu commented Jul 24, 2023

jbaudoux left a comment

TDu commented Aug 2, 2023

jbaudoux left a comment

jbaudoux Aug 8, 2023 •

edited

Loading

TDu Aug 14, 2023

jbaudoux commented Aug 16, 2023

mt-software-de Aug 16, 2023

mt-software-de Aug 16, 2023

jbaudoux Aug 23, 2023

mt-software-de Aug 23, 2023

jbaudoux commented Aug 23, 2023

TDu commented Aug 23, 2023

TDu commented Aug 23, 2023

jbaudoux commented Aug 23, 2023

OCA-git-bot commented Aug 23, 2023

OCA-git-bot commented Aug 23, 2023

	[quant.quantity == quant.reserved_quantity for quant in package.quant_ids]
	quant.quantity == quant.reserved_quantity for quant in package.quant_ids

	if _move_line.state != "assigned":
	if _move_line.state not in ("assigned", "partially_available"):

[14.0][IMP] shopfloor: zone picking handle complete mix package #621

[14.0][IMP] shopfloor: zone picking handle complete mix package #621

Conversation

TDu commented Apr 24, 2023

OCA-git-bot commented Apr 24, 2023

TDu commented Apr 28, 2023

jbaudoux left a comment

Choose a reason for hiding this comment

jbaudoux left a comment

Choose a reason for hiding this comment

TDu commented Jun 16, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jbaudoux left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TDu commented Jul 19, 2023

TDu commented Jul 24, 2023

jbaudoux left a comment

Choose a reason for hiding this comment

TDu commented Aug 2, 2023

jbaudoux left a comment

Choose a reason for hiding this comment

jbaudoux Aug 8, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jbaudoux commented Aug 16, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jbaudoux commented Aug 23, 2023

TDu commented Aug 23, 2023

TDu commented Aug 23, 2023

jbaudoux commented Aug 23, 2023

OCA-git-bot commented Aug 23, 2023

OCA-git-bot commented Aug 23, 2023

jbaudoux left a comment •

edited

Loading

jbaudoux Aug 8, 2023 •

edited

Loading