[IMP] extend logic to multiple WMS support

Author: sergiocorato

connector_whs/models/base_external_dbsource.py

@@ -408,7 +408,9 @@ def whs_insert_read_and_synchronize_list(self):
                     insert_order_line_params,
                 ) = hyddemo_whs_lists.filtered(
                     lambda x: x.num_lista == num_lista
-                ).whs_prepare_host_liste_values()
+                ).whs_prepare_host_liste_values(
+                    dbsource
+                )
                 if insert_order_params:
                     if not insert_order_line_params:
                         # there is a unique table for order and order line
@@ -461,7 +463,7 @@ def whs_insert_read_and_synchronize_list(self):
             # same time
             if hyddemo_whs_lists:
                 set_liste_to_elaborate_query = (
-                    hyddemo_whs_lists._get_set_liste_to_elaborate_query()
+                    hyddemo_whs_lists._get_set_liste_to_elaborate_query(dbsource)
                 )
                 if set_liste_to_elaborate_query:
                     dbsource.with_context(no_return=True).execute_mssql(

connector_whs/models/hyddemo_whs_liste.py

@@ -188,11 +188,11 @@ def _get_insert_host_liste_query(params):
         # overridable method
         return "".replace("\n", " ")
 
-    def whs_prepare_host_liste_values(self):
+    def whs_prepare_host_liste_values(self, dbsource):
         # overridable method
         execute_params_order, execute_params_order_line = {}, {}
         return execute_params_order, execute_params_order_line
 
-    def _get_set_liste_to_elaborate_query(self):
+    def _get_set_liste_to_elaborate_query(self, dbsource):
         # overridable method
         return ""

connector_whs/wizard/wizard_sync_stock_whs_mssql.py

@@ -12,7 +12,7 @@ class WizardSyncStockWhsMssql(models.TransientModel):
     product_id = fields.Many2one("product.product", string="Product to sync")
 
     @staticmethod
-    def _prepare_giacenze_query(i):
+    def _prepare_giacenze_query(i, dbsource):
         # overridable method
         # respect order of fields retrieved!
         query = ""

connector_wms_whs/models/base_external_dbsource.py

@@ -2,7 +2,7 @@
 
 from sqlalchemy import text as sql_text
 
-from odoo import _, models
+from odoo import _, fields, models
 from odoo.exceptions import UserError
 
 _logger = logging.getLogger(__name__)
@@ -11,24 +11,49 @@
 class BaseExternalDbsource(models.Model):
     _inherit = "base.external.dbsource"
 
+    name = fields.Char(
+        size=10,
+    )
+
+    _sql_constraints = [
+        (
+            "dbsource_unique_name",
+            "UNIQUE (name)",
+            _("The Name must be unique!"),
+        )
+    ]
+
+    def copy(self, default=None):
+        default = dict(
+            default or {},
+            name=_("%s (copy)") % self.name,
+        )
+        return super().copy(default=default)
+
     def _pre_insert_product_query(self):
         self.ensure_one()
         pre_insert_product_query = (
-            "DELETE FROM HOST_ARTICOLI WHERE Elaborato = 2 OR Elaborato = 0"
+            "DELETE FROM HOST_ARTICOLI WHERE idHost=:idHost AND "
+            "(Elaborato = 2 OR Elaborato = 0)"
         )
         self.with_context(no_return=True).execute_mssql(
-            sqlquery=sql_text(pre_insert_product_query), sqlparams=None, metadata=None
+            sqlquery=sql_text(pre_insert_product_query),
+            sqlparams=dict(idHost=self.name),
+            metadata=None,
         )
         return True
 
     def _post_insert_product_query(self, last_id):
         # Set record from Elaborato=0 to Elaborato=1 to be processable from WHS
         self.ensure_one()
         update_product_query = (
-            "UPDATE HOST_ARTICOLI SET Elaborato = 1 WHERE Elaborato = 0"
+            "UPDATE HOST_ARTICOLI SET Elaborato = 1 "
+            "WHERE idHost=:idHost AND Elaborato = 0"
         )
         self.with_context(no_return=True).execute_mssql(
-            sqlquery=sql_text(update_product_query), sqlparams=None, metadata=None
+            sqlquery=sql_text(update_product_query),
+            sqlparams=dict(idHost=self.name),
+            metadata=None,
         )
         return True
 
@@ -51,7 +76,8 @@ def _get_insert_product_query(self):
         Profondita,
         DescrizioneBreve,
         ScortaMin,
-        Id
+        Id,
+        idHost
         )
         VALUES (
         :Elaborato,
@@ -70,7 +96,8 @@ def _get_insert_product_query(self):
         :Profondita,
         :DescrizioneBreve,
         :ScortaMin,
-        :Id
+        :Id,
+        :idHost
         )
         """
         return insert_product_query
@@ -122,6 +149,7 @@ def _prepare_host_articoli_values(
             "DescrizioneBreve": " ",
             "ScortaMin": product_min_qty,  # digits=(18, 3)
             "Id": last_id + 1,
+            "idHost": self.name,
         }
         return execute_params
 
@@ -148,11 +176,16 @@ def whs_check_lists(self):
                 whs_liste_query = (
                     "SELECT NumLista, NumRiga, Qta, QtaMovimentata, Elaborato "
                     "FROM HOST_LISTE "
-                    "WHERE NumLista = '%s' AND NumRiga = '%s'"
-                    % (whs_list.num_lista, whs_list.riga)
+                    "WHERE idHost=:idHost NumLista=:NumLista AND NumRiga=:NumRiga"
                 )
                 esiti_liste = dbsource.execute_mssql(
-                    sqlquery=sql_text(whs_liste_query), sqlparams=None, metadata=None
+                    sqlquery=sql_text(whs_liste_query),
+                    sqlparams=dict(
+                        idHost=dbsource.name,
+                        NumLista=whs_list.num_lista,
+                        NumRiga=whs_list.riga,
+                    ),
+                    metadata=None,
                 )
                 # esiti_liste[0] contains result
                 if not esiti_liste[0]: