Sfoglia il codice sorgente

Updated transaction_model and warehouse_model

Vsevolod Levitan 1 anno fa
parent
commit
153f743107
2 ha cambiato i file con 23 aggiunte e 6 eliminazioni
  1. 17 1
      src/models/transaction_model.py
  2. 6 5
      src/models/warehouse_model.py

+ 17 - 1
src/models/transaction_model.py

@@ -7,8 +7,24 @@ from src.validation.validator import validator
 
 
 class transaction_model(abstract_reference):
-    def __init__(self):
+    def __init__(
+        self,
+        name,
+        warehouse,
+        nomenclature,
+        amount,
+        transactionType,
+        measurementUnit,
+        timeSpan,
+    ):
         self.__vtor = validator()
+        self.Warehouse = warehouse
+        self.Nomenclature = nomenclature
+        self.Amount = amount
+        self.TransactionType = transactionType
+        self.MeasurementUnit = measurementUnit
+        self.TimeSpan = timeSpan
+        super().__init__(name)
 
     __warehouse = None
 

+ 6 - 5
src/models/warehouse_model.py

@@ -6,17 +6,18 @@ class warehouse_model(abstract_reference):
     # Адрес
     __address = ""
 
-    def __init__(self, name):
-        super().__init__(name)
+    def __init__(self, name, address):
         self.__vtor = validator()
+        self.Address = address
+        super().__init__(name)
 
     @property
-    def address(self):
+    def Address(self):
         """Адрес склада"""
         return self.__address
 
-    @address.setter
-    def address(self, value):
+    @Address.setter
+    def Address(self, value):
         """Адрес склада"""
         self.__vtor.check_type(value, str)
         self.__vtor.check_length_greater(str, 0)