deshitting
This commit is contained in:
		@@ -1 +1 @@
 | 
			
		||||
from .assebmlr.models import *
 | 
			
		||||
from database.models import *
 | 
			
		||||
 
 | 
			
		||||
 Submodule database/assebmlr deleted from 4096f3f868
									
								
							
							
								
								
									
										10
									
								
								database/enums.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								database/enums.py
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,10 @@
 | 
			
		||||
from enum import unique, IntEnum
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@unique
 | 
			
		||||
class AssemblyState(IntEnum):
 | 
			
		||||
    NOT_STARTED = 0,
 | 
			
		||||
    ASSEMBLING_PRODUCTS = 1,
 | 
			
		||||
    ALL_PRODUCTS_ASSEMBLED = 2,
 | 
			
		||||
    CONFIRMED = 3,
 | 
			
		||||
    ENDED = 4
 | 
			
		||||
@@ -1,4 +1,5 @@
 | 
			
		||||
import mariadb
 | 
			
		||||
 | 
			
		||||
import settings
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										44
									
								
								database/models.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										44
									
								
								database/models.py
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,44 @@
 | 
			
		||||
from flask_sqlalchemy import SQLAlchemy
 | 
			
		||||
 | 
			
		||||
db = SQLAlchemy()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class User(db.Model):
 | 
			
		||||
    __tablename__ = 'users'
 | 
			
		||||
    id = db.Column(db.Integer, primary_key=True, comment='ID пользователя')
 | 
			
		||||
 | 
			
		||||
    login = db.Column(db.String, nullable=False, comment='Логин')
 | 
			
		||||
    password_hash = db.Column(db.String, nullable=False, comment='Пароль')
 | 
			
		||||
 | 
			
		||||
    sipro_id = db.Column(db.Integer, nullable=True, comment='ID пользователя в SIPRO')
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class Assembly(db.Model):
 | 
			
		||||
    __tablename__ = 'assemblies'
 | 
			
		||||
    id = db.Column(db.Integer, primary_key=True, comment='ID сборки')
 | 
			
		||||
 | 
			
		||||
    created_at = db.Column(db.DateTime, nullable=True, comment='Дата и время начала сборки')
 | 
			
		||||
    ended_at = db.Column(db.DateTime, nullable=True, comment='Дата и время конца сборки')
 | 
			
		||||
 | 
			
		||||
    user_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
 | 
			
		||||
    user = db.relationship('User', backref='assemblies')
 | 
			
		||||
 | 
			
		||||
    order_id = db.Column(db.Integer, nullable=False, comment='ID заказа в базе данных')
 | 
			
		||||
    is_active = db.Column(db.Boolean, nullable=False, comment='Активная ли сборка')
 | 
			
		||||
    state = db.Column(db.Integer, nullable=False, comment='Состояние сборки')
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class Barcode(db.Model):
 | 
			
		||||
    __tablename__ = 'barcodes'
 | 
			
		||||
    id = db.Column(db.Integer, primary_key=True, comment='ID пользователя')
 | 
			
		||||
    denco_article = db.Column(db.Integer, nullable=False, comment='Артикул', index=True)
 | 
			
		||||
    barcode = db.Column(db.String, nullable=False, comment='Баркод', index=True)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class Application(db.Model):
 | 
			
		||||
    __tablename__ = 'applications'
 | 
			
		||||
    id = db.Column(db.Integer, primary_key=True, comment='')
 | 
			
		||||
    name = db.Column(db.String(40), nullable=False)
 | 
			
		||||
    version = db.Column(db.String(10), nullable=False)
 | 
			
		||||
    uploaded = db.Column(db.DateTime, nullable=False)
 | 
			
		||||
    filename = db.Column(db.String, nullable=False)
 | 
			
		||||
		Reference in New Issue
	
	Block a user