Quellcode durchsuchen

上傳檔案到 'app'

rita vor 2 Jahren
Ursprung
Commit
0719558b1e
1 geänderte Dateien mit 511 neuen und 8 gelöschten Zeilen
  1. 511 8
      app/models.py

+ 511 - 8
app/models.py

@@ -10,7 +10,7 @@ from flask_sqlalchemy import SQLAlchemy
 
 #與當前項目相關的模型文件,即所有的實體類在此編寫
 from coffee_manage import db
-from werkzeug.utils import send_file
+# from werkzeug.utils import send_file
 
 #用戶表
 class User(db.Model):
@@ -26,12 +26,84 @@ class User(db.Model):
     status = db.Column(db.Integer, nullable=False, info='0:admin;1:new;9:disable')
 
 # ////////////////////////////////////////////////////////////////////////////////
-# dry_block 取值測試
+# coffee 1.0 板子燒錄 腳位存值
+class coffee1_0_pin(db.Model):
+    __tablename__ = 'coffee1_0_pin'
+    sn = db.Column(db.Integer, primary_key=True)
+    datetime = db.Column(db.DateTime, default=datetime.now(), nullable=False)
+    tid = db.Column(db.Text, nullable=True)
+    ethernet = db.Column(db.Text, nullable=True)
+    wifi = db.Column(db.Text, nullable=True)
+    zigbee = db.Column(db.Text, nullable=True)
+    R1 = db.Column(db.Text, nullable=True)
+    R2 = db.Column(db.Text, nullable=True)
+    R3 = db.Column(db.Text, nullable=True)
+    R4 = db.Column(db.Text, nullable=True)
+    R5 = db.Column(db.Text, nullable=True)
+    R6 = db.Column(db.Text, nullable=True)
+    R7  = db.Column(db.Text, nullable=True)
+    R8 = db.Column(db.Text, nullable=True)
+    R9 = db.Column(db.Text, nullable=True)
+    R10 = db.Column(db.Text, nullable=True)
+    R11 = db.Column(db.Text, nullable=True)
+    R12 = db.Column(db.Text, nullable=True)
+    R13 = db.Column(db.Text, nullable=True)
+    R14 = db.Column(db.Text, nullable=True)
+    R15 = db.Column(db.Text, nullable=True)
+    R16 = db.Column(db.Text, nullable=True)
+    R17 = db.Column(db.Text, nullable=True)
+    R18 = db.Column(db.Text, nullable=True)
+    R19 = db.Column(db.Text, nullable=True)
+    R20 = db.Column(db.Text, nullable=True)
+    M1= db.Column(db.Text, nullable=True)
+    M2= db.Column(db.Text, nullable=True)
+    M3= db.Column(db.Text, nullable=True)
+    M4= db.Column(db.Text, nullable=True)
+    M5= db.Column(db.Text, nullable=True)
+    M6= db.Column(db.Text, nullable=True)
+    M7= db.Column(db.Text, nullable=True)
+    M8= db.Column(db.Text, nullable=True)
+    M9= db.Column(db.Text, nullable=True)
+    M10= db.Column(db.Text, nullable=True)
+    M11= db.Column(db.Text, nullable=True)
+    M12= db.Column(db.Text, nullable=True)
+    M13= db.Column(db.Text, nullable=True)
+    M14= db.Column(db.Text, nullable=True)
+    M15= db.Column(db.Text, nullable=True)
+    M16= db.Column(db.Text, nullable=True)
+    M17= db.Column(db.Text, nullable=True)
+    M18= db.Column(db.Text, nullable=True)
+    M19= db.Column(db.Text, nullable=True)
+    M1_Hz= db.Column(db.Text, nullable=True)
+    M2_Hz= db.Column(db.Text, nullable=True)
+    M3_Hz= db.Column(db.Text, nullable=True)
+    M4_Hz= db.Column(db.Text, nullable=True)
+    M5_Hz= db.Column(db.Text, nullable=True)
+    M6_Hz= db.Column(db.Text, nullable=True)
+    M7_Hz= db.Column(db.Text, nullable=True)
+    M8_Hz= db.Column(db.Text, nullable=True)
+    M9_Hz= db.Column(db.Text, nullable=True)
+    M10_Hz= db.Column(db.Text, nullable=True)
+    M11_Hz= db.Column(db.Text, nullable=True)
+    M12_Hz= db.Column(db.Text, nullable=True)
+    M13_Hz= db.Column(db.Text, nullable=True)
+    M14_Hz= db.Column(db.Text, nullable=True)
+    M15_Hz= db.Column(db.Text, nullable=True)
+    M16_Hz= db.Column(db.Text, nullable=True)
+    M17_Hz= db.Column(db.Text, nullable=True)
+    M18_Hz= db.Column(db.Text, nullable=True)
+    M19_Hz= db.Column(db.Text, nullable=True)
+
+    # =============================================================================
+
 class dry_block_waiting(db.Model):
     __tablename__ = 'dry_block_waiting'
+    __table_args__ = {
+        'mysql_row_format':'DYNAMIC'
+    }
     datetime = db.Column(db.DateTime, default=datetime.now(), nullable=False, primary_key=True)
     cond_z1_1 = db.Column(db.Text, nullable=True)
-    cond_tank1_1 = db.Column(db.Text, nullable=True)
+    # cond_tank1_1 = db.Column(db.Text, nullable=True)
     cond_a1_1 = db.Column(db.Text, nullable=True)
     cond_b1_1 = db.Column(db.Text, nullable=True)
     cond_c1_1 = db.Column(db.Text, nullable=True)
@@ -62,7 +134,7 @@ class dry_block_waiting(db.Model):
     do_obj1_5 = db.Column(db.Text, nullable=True)
     do_act1_5 = db.Column(db.Text, nullable=True)
     cond_z2_1 = db.Column(db.Text, nullable=True)
-    cond_tank2_1 = db.Column(db.Text, nullable=True)
+    # cond_tank2_1 = db.Column(db.Text, nullable=True)
     cond_a2_1 = db.Column(db.Text, nullable=True)
     cond_b2_1 = db.Column(db.Text, nullable=True)
     cond_c2_1 = db.Column(db.Text, nullable=True)
@@ -93,7 +165,7 @@ class dry_block_waiting(db.Model):
     do_obj2_5 = db.Column(db.Text, nullable=True)
     do_act2_5 = db.Column(db.Text, nullable=True)
     cond_z3_1 = db.Column(db.Text, nullable=True)
-    cond_tank3_1 = db.Column(db.Text, nullable=True)
+    # cond_tank3_1 = db.Column(db.Text, nullable=True)
     cond_a3_1 = db.Column(db.Text, nullable=True)
     cond_b3_1 = db.Column(db.Text, nullable=True)
     cond_c3_1 = db.Column(db.Text, nullable=True)
@@ -124,7 +196,7 @@ class dry_block_waiting(db.Model):
     do_obj3_5 = db.Column(db.Text, nullable=True)
     do_act3_5 = db.Column(db.Text, nullable=True)
     cond_z4_1 = db.Column(db.Text, nullable=True)
-    cond_tank4_1 = db.Column(db.Text, nullable=True)
+    # cond_tank4_1 = db.Column(db.Text, nullable=True)
     cond_a4_1 = db.Column(db.Text, nullable=True)
     cond_b4_1 = db.Column(db.Text, nullable=True)
     cond_c4_1 = db.Column(db.Text, nullable=True)
@@ -155,7 +227,7 @@ class dry_block_waiting(db.Model):
     do_obj4_5 = db.Column(db.Text, nullable=True)
     do_act4_5 = db.Column(db.Text, nullable=True)
     cond_z5_1 = db.Column(db.Text, nullable=True)
-    cond_tank5_1 = db.Column(db.Text, nullable=True)
+    # cond_tank5_1 = db.Column(db.Text, nullable=True)
     cond_a5_1 = db.Column(db.Text, nullable=True)
     cond_b5_1 = db.Column(db.Text, nullable=True)
     cond_c5_1 = db.Column(db.Text, nullable=True)
@@ -185,7 +257,438 @@ class dry_block_waiting(db.Model):
     do_act5_4 = db.Column(db.Text, nullable=True)
     do_obj5_5 = db.Column(db.Text, nullable=True)
     do_act5_5 = db.Column(db.Text, nullable=True)
-
+    
+class dry_block_waiting1(db.Model):
+    __tablename__ = 'dry_block_waiting1'
+    __table_args__ = {
+    'mysql_row_format':'DYNAMIC'
+    }
+    datetime = db.Column(db.DateTime, default=datetime.now(), nullable=False, primary_key=True)
+    IP = db.Column(db.Text, nullable=True)
+    cond_z1_1 = db.Column(db.Text, nullable=True)
+    cond_a1_1 = db.Column(db.Text, nullable=True)
+    cond_b1_1 = db.Column(db.Text, nullable=True)
+    cond_c1_1 = db.Column(db.Text, nullable=True)
+    cond_a1_2 = db.Column(db.Text, nullable=True)
+    cond_b1_2 = db.Column(db.Text, nullable=True)
+    cond_c1_2 = db.Column(db.Text, nullable=True)
+    cond_d1_2 = db.Column(db.Text, nullable=True)
+    cond_a1_3 = db.Column(db.Text, nullable=True)
+    cond_b1_3 = db.Column(db.Text, nullable=True)
+    cond_c1_3 = db.Column(db.Text, nullable=True)
+    cond_d1_3 = db.Column(db.Text, nullable=True)
+    cond_a1_4 = db.Column(db.Text, nullable=True)
+    cond_b1_4 = db.Column(db.Text, nullable=True)
+    cond_c1_4 = db.Column(db.Text, nullable=True)
+    cond_d1_4 = db.Column(db.Text, nullable=True)
+    cond_a1_5 = db.Column(db.Text, nullable=True)
+    cond_b1_5 = db.Column(db.Text, nullable=True)
+    cond_c1_5 = db.Column(db.Text, nullable=True)
+    cond_d1_5 = db.Column(db.Text, nullable=True)
+    cond_a1_6 = db.Column(db.Text, nullable=True)
+    cond_b1_6 = db.Column(db.Text, nullable=True)
+    cond_c1_6 = db.Column(db.Text, nullable=True)
+    cond_d1_6 = db.Column(db.Text, nullable=True)
+    cond_a1_7 = db.Column(db.Text, nullable=True)
+    cond_b1_7 = db.Column(db.Text, nullable=True)
+    cond_c1_7 = db.Column(db.Text, nullable=True)
+    cond_d1_7 = db.Column(db.Text, nullable=True)
+    cond_a1_8 = db.Column(db.Text, nullable=True)
+    cond_b1_8 = db.Column(db.Text, nullable=True)
+    cond_c1_8 = db.Column(db.Text, nullable=True)
+    cond_d1_8 = db.Column(db.Text, nullable=True)
+    cond_a1_9 = db.Column(db.Text, nullable=True)
+    cond_b1_9 = db.Column(db.Text, nullable=True)
+    cond_c1_9 = db.Column(db.Text, nullable=True)
+    cond_d1_9 = db.Column(db.Text, nullable=True)
+    cond_a1_10 = db.Column(db.Text, nullable=True)
+    cond_b1_10 = db.Column(db.Text, nullable=True)
+    cond_c1_10 = db.Column(db.Text, nullable=True)
+    cond_d1_10 = db.Column(db.Text, nullable=True)
+    cond_a1_11 = db.Column(db.Text, nullable=True)
+    cond_b1_11 = db.Column(db.Text, nullable=True)
+    cond_c1_11 = db.Column(db.Text, nullable=True)
+    cond_d1_11 = db.Column(db.Text, nullable=True)
+    cond_a1_12 = db.Column(db.Text, nullable=True)
+    cond_b1_12 = db.Column(db.Text, nullable=True)
+    cond_c1_12 = db.Column(db.Text, nullable=True)
+    cond_d1_12 = db.Column(db.Text, nullable=True)
+    cond_a1_13 = db.Column(db.Text, nullable=True)
+    cond_b1_13 = db.Column(db.Text, nullable=True)
+    cond_c1_13 = db.Column(db.Text, nullable=True)
+    cond_d1_13 = db.Column(db.Text, nullable=True)
+    do_obj1_1 = db.Column(db.Text, nullable=True)
+    do_act1_1 = db.Column(db.Text, nullable=True)
+    do_obj1_2 = db.Column(db.Text, nullable=True)
+    do_act1_2 = db.Column(db.Text, nullable=True)
+    do_obj1_3 = db.Column(db.Text, nullable=True)
+    do_act1_3 = db.Column(db.Text, nullable=True)
+    do_obj1_4 = db.Column(db.Text, nullable=True)
+    do_act1_4 = db.Column(db.Text, nullable=True)
+    do_obj1_5 = db.Column(db.Text, nullable=True)
+    do_act1_5 = db.Column(db.Text, nullable=True)
+    do_obj1_6 = db.Column(db.Text, nullable=True)
+    do_act1_6 = db.Column(db.Text, nullable=True)
+    do_obj1_7 = db.Column(db.Text, nullable=True)
+    do_act1_7 = db.Column(db.Text, nullable=True)
+    do_obj1_8 = db.Column(db.Text, nullable=True)
+    do_act1_8 = db.Column(db.Text, nullable=True)
+    do_obj1_9 = db.Column(db.Text, nullable=True)
+    do_act1_9 = db.Column(db.Text, nullable=True)
+    do_obj1_10 = db.Column(db.Text, nullable=True)
+    do_act1_10 = db.Column(db.Text, nullable=True)
+    do_obj1_11 = db.Column(db.Text, nullable=True)
+    do_act1_11 = db.Column(db.Text, nullable=True)
+    do_obj1_12 = db.Column(db.Text, nullable=True)
+    do_act1_12 = db.Column(db.Text, nullable=True)
+    do_obj1_13 = db.Column(db.Text, nullable=True)
+    do_act1_13 = db.Column(db.Text, nullable=True)
+    do_obj1_14 = db.Column(db.Text, nullable=True)
+    do_act1_14 = db.Column(db.Text, nullable=True)
+    do_obj1_15 = db.Column(db.Text, nullable=True)
+    do_act1_15 = db.Column(db.Text, nullable=True)
+    do_obj1_16 = db.Column(db.Text, nullable=True)
+    do_act1_16 = db.Column(db.Text, nullable=True)
+    do_obj1_17 = db.Column(db.Text, nullable=True)
+    do_act1_17 = db.Column(db.Text, nullable=True)
+    do_obj1_18 = db.Column(db.Text, nullable=True)
+    do_act1_18 = db.Column(db.Text, nullable=True)
+    do_obj1_19 = db.Column(db.Text, nullable=True)
+    do_act1_19 = db.Column(db.Text, nullable=True)
+    do_obj1_20 = db.Column(db.Text, nullable=True)
+    do_act1_20 = db.Column(db.Text, nullable=True)
+
+class block_cond_d1_1(db.Model):
+    __tablename__ = 'block_cond_d1_1'
+    datetime = db.Column(db.DateTime, default=datetime.now(), nullable=False, primary_key=True)
+    IP = db.Column(db.Text, nullable=True)
+    cond_z1_1 = db.Column(db.Text, nullable=True)
+    cond_a1_1 = db.Column(db.Text, nullable=True)
+    cond_b1_1 = db.Column(db.Text, nullable=True)
+    cond_c1_1 = db.Column(db.Text, nullable=True)
+    cond_a1_2 = db.Column(db.Text, nullable=True)
+    cond_b1_2 = db.Column(db.Text, nullable=True)
+    cond_c1_2 = db.Column(db.Text, nullable=True)
+    cond_d1_2 = db.Column(db.Text, nullable=True)
+    cond_a1_3 = db.Column(db.Text, nullable=True)
+    cond_b1_3 = db.Column(db.Text, nullable=True)
+    cond_c1_3 = db.Column(db.Text, nullable=True)
+    cond_d1_3 = db.Column(db.Text, nullable=True)
+    cond_a1_4 = db.Column(db.Text, nullable=True)
+    cond_b1_4 = db.Column(db.Text, nullable=True)
+    cond_c1_4 = db.Column(db.Text, nullable=True)
+    cond_d1_4 = db.Column(db.Text, nullable=True)
+    cond_a1_5 = db.Column(db.Text, nullable=True)
+    cond_b1_5 = db.Column(db.Text, nullable=True)
+    cond_c1_5 = db.Column(db.Text, nullable=True)
+    cond_d1_5 = db.Column(db.Text, nullable=True)
+    cond_a1_6 = db.Column(db.Text, nullable=True)
+    cond_b1_6 = db.Column(db.Text, nullable=True)
+    cond_c1_6 = db.Column(db.Text, nullable=True)
+    cond_d1_6 = db.Column(db.Text, nullable=True)
+    cond_a1_7 = db.Column(db.Text, nullable=True)
+    cond_b1_7 = db.Column(db.Text, nullable=True)
+    cond_c1_7 = db.Column(db.Text, nullable=True)
+    cond_d1_7 = db.Column(db.Text, nullable=True)
+    cond_a1_8 = db.Column(db.Text, nullable=True)
+    cond_b1_8 = db.Column(db.Text, nullable=True)
+    cond_c1_8 = db.Column(db.Text, nullable=True)
+    cond_d1_8 = db.Column(db.Text, nullable=True)
+    cond_a1_9 = db.Column(db.Text, nullable=True)
+    cond_b1_9 = db.Column(db.Text, nullable=True)
+    cond_c1_9 = db.Column(db.Text, nullable=True)
+    cond_d1_9 = db.Column(db.Text, nullable=True)
+    cond_a1_10 = db.Column(db.Text, nullable=True)
+    cond_b1_10 = db.Column(db.Text, nullable=True)
+    cond_c1_10 = db.Column(db.Text, nullable=True)
+    cond_d1_10 = db.Column(db.Text, nullable=True)
+    cond_a1_11 = db.Column(db.Text, nullable=True)
+    cond_b1_11 = db.Column(db.Text, nullable=True)
+    cond_c1_11 = db.Column(db.Text, nullable=True)
+    cond_d1_11 = db.Column(db.Text, nullable=True)
+    cond_a1_12 = db.Column(db.Text, nullable=True)
+    cond_b1_12 = db.Column(db.Text, nullable=True)
+    cond_c1_12 = db.Column(db.Text, nullable=True)
+    cond_d1_12 = db.Column(db.Text, nullable=True)
+    cond_a1_13 = db.Column(db.Text, nullable=True)
+    cond_b1_13 = db.Column(db.Text, nullable=True)
+    cond_c1_13 = db.Column(db.Text, nullable=True)
+    cond_d1_13 = db.Column(db.Text, nullable=True)
+    do_obj1_1 = db.Column(db.Text, nullable=True)
+    do_act1_1 = db.Column(db.Text, nullable=True)
+    do_obj1_2 = db.Column(db.Text, nullable=True)
+    do_act1_2 = db.Column(db.Text, nullable=True)
+    do_obj1_3 = db.Column(db.Text, nullable=True)
+    do_act1_3 = db.Column(db.Text, nullable=True)
+    do_obj1_4 = db.Column(db.Text, nullable=True)
+    do_act1_4 = db.Column(db.Text, nullable=True)
+    do_obj1_5 = db.Column(db.Text, nullable=True)
+    do_act1_5 = db.Column(db.Text, nullable=True)
+    do_obj1_6 = db.Column(db.Text, nullable=True)
+    do_act1_6 = db.Column(db.Text, nullable=True)
+    do_obj1_7 = db.Column(db.Text, nullable=True)
+    do_act1_7 = db.Column(db.Text, nullable=True)
+    do_obj1_8 = db.Column(db.Text, nullable=True)
+    do_act1_8 = db.Column(db.Text, nullable=True)
+    do_obj1_9 = db.Column(db.Text, nullable=True)
+    do_act1_9 = db.Column(db.Text, nullable=True)
+    do_obj1_10 = db.Column(db.Text, nullable=True)
+    do_act1_10 = db.Column(db.Text, nullable=True)
+    do_obj1_11 = db.Column(db.Text, nullable=True)
+    do_act1_11 = db.Column(db.Text, nullable=True)
+    do_obj1_12 = db.Column(db.Text, nullable=True)
+    do_act1_12 = db.Column(db.Text, nullable=True)
+    do_obj1_13 = db.Column(db.Text, nullable=True)
+    do_act1_13 = db.Column(db.Text, nullable=True)
+    do_obj1_14 = db.Column(db.Text, nullable=True)
+    do_act1_14 = db.Column(db.Text, nullable=True)
+    do_obj1_15 = db.Column(db.Text, nullable=True)
+    do_act1_15 = db.Column(db.Text, nullable=True)
+    do_obj1_16 = db.Column(db.Text, nullable=True)
+    do_act1_16 = db.Column(db.Text, nullable=True)
+    do_obj1_17 = db.Column(db.Text, nullable=True)
+    do_act1_17 = db.Column(db.Text, nullable=True)
+    do_obj1_18 = db.Column(db.Text, nullable=True)
+    do_act1_18 = db.Column(db.Text, nullable=True)
+    do_obj1_19 = db.Column(db.Text, nullable=True)
+    do_act1_19 = db.Column(db.Text, nullable=True)
+    do_obj1_20 = db.Column(db.Text, nullable=True)
+    do_act1_20 = db.Column(db.Text, nullable=True)
+
+class block_cond_d1_2(db.Model):
+    __tablename__ = 'block_cond_d1_2'
+    datetime = db.Column(db.DateTime, default=datetime.now(), nullable=False, primary_key=True)
+    IP = db.Column(db.Text, nullable=False)
+    cond_z2_1 = db.Column(db.Text, nullable=True)
+    cond_a2_1 = db.Column(db.Text, nullable=True)
+    cond_b2_1 = db.Column(db.Text, nullable=True)
+    cond_c2_1 = db.Column(db.Text, nullable=True)
+    cond_a2_2 = db.Column(db.Text, nullable=True)
+    cond_b2_2 = db.Column(db.Text, nullable=True)
+    cond_c2_2 = db.Column(db.Text, nullable=True)
+    cond_d2_2 = db.Column(db.Text, nullable=True)
+    cond_a2_3 = db.Column(db.Text, nullable=True)
+    cond_b2_3 = db.Column(db.Text, nullable=True)
+    cond_c2_3 = db.Column(db.Text, nullable=True)
+    cond_d2_3 = db.Column(db.Text, nullable=True)
+    cond_a2_4 = db.Column(db.Text, nullable=True)
+    cond_b2_4 = db.Column(db.Text, nullable=True)
+    cond_c2_4 = db.Column(db.Text, nullable=True)
+    cond_d2_4 = db.Column(db.Text, nullable=True)
+    cond_a2_5 = db.Column(db.Text, nullable=True)
+    cond_b2_5 = db.Column(db.Text, nullable=True)
+    cond_c2_5 = db.Column(db.Text, nullable=True)
+    cond_d2_5 = db.Column(db.Text, nullable=True)
+    cond_a2_6 = db.Column(db.Text, nullable=True)
+    cond_b2_6 = db.Column(db.Text, nullable=True)
+    cond_c2_6 = db.Column(db.Text, nullable=True)
+    cond_d2_6 = db.Column(db.Text, nullable=True)
+    cond_a2_7 = db.Column(db.Text, nullable=True)
+    cond_b2_7 = db.Column(db.Text, nullable=True)
+    cond_c2_7 = db.Column(db.Text, nullable=True)
+    cond_d2_7 = db.Column(db.Text, nullable=True)
+    cond_a2_8 = db.Column(db.Text, nullable=True)
+    cond_b2_8 = db.Column(db.Text, nullable=True)
+    cond_c2_8 = db.Column(db.Text, nullable=True)
+    cond_d2_8 = db.Column(db.Text, nullable=True)
+    cond_a2_9 = db.Column(db.Text, nullable=True)
+    cond_b2_9 = db.Column(db.Text, nullable=True)
+    cond_c2_9 = db.Column(db.Text, nullable=True)
+    cond_d2_9 = db.Column(db.Text, nullable=True)
+    cond_a2_10 = db.Column(db.Text, nullable=True)
+    cond_b2_10 = db.Column(db.Text, nullable=True)
+    cond_c2_10 = db.Column(db.Text, nullable=True)
+    cond_d2_10 = db.Column(db.Text, nullable=True)
+    cond_a2_11 = db.Column(db.Text, nullable=True)
+    cond_b2_11 = db.Column(db.Text, nullable=True)
+    cond_c2_11 = db.Column(db.Text, nullable=True)
+    cond_d2_11 = db.Column(db.Text, nullable=True)
+    cond_a2_12 = db.Column(db.Text, nullable=True)
+    cond_b2_12 = db.Column(db.Text, nullable=True)
+    cond_c2_12 = db.Column(db.Text, nullable=True)
+    cond_d2_12 = db.Column(db.Text, nullable=True)
+    cond_a2_13 = db.Column(db.Text, nullable=True)
+    cond_b2_13 = db.Column(db.Text, nullable=True)
+    cond_c2_13 = db.Column(db.Text, nullable=True)
+    cond_d2_13 = db.Column(db.Text, nullable=True)
+    do_obj2_1 = db.Column(db.Text, nullable=True)
+    do_act2_1 = db.Column(db.Text, nullable=True)
+    do_obj2_2 = db.Column(db.Text, nullable=True)
+    do_act2_2 = db.Column(db.Text, nullable=True)
+    do_obj2_3 = db.Column(db.Text, nullable=True)
+    do_act2_3 = db.Column(db.Text, nullable=True)
+    do_obj2_4 = db.Column(db.Text, nullable=True)
+    do_act2_4 = db.Column(db.Text, nullable=True)
+    do_obj2_5 = db.Column(db.Text, nullable=True)
+    do_act2_5 = db.Column(db.Text, nullable=True)
+    do_obj2_6 = db.Column(db.Text, nullable=True)
+    do_act2_6 = db.Column(db.Text, nullable=True)
+    do_obj2_7 = db.Column(db.Text, nullable=True)
+    do_act2_7 = db.Column(db.Text, nullable=True)
+    do_obj2_8 = db.Column(db.Text, nullable=True)
+    do_act2_8 = db.Column(db.Text, nullable=True)
+    do_obj2_9 = db.Column(db.Text, nullable=True)
+    do_act2_9 = db.Column(db.Text, nullable=True)
+    do_obj2_10 = db.Column(db.Text, nullable=True)
+    do_act2_10 = db.Column(db.Text, nullable=True)
+    do_obj2_11 = db.Column(db.Text, nullable=True)
+    do_act2_11 = db.Column(db.Text, nullable=True)
+    do_obj2_12 = db.Column(db.Text, nullable=True)
+    do_act2_12 = db.Column(db.Text, nullable=True)
+    do_obj2_13 = db.Column(db.Text, nullable=True)
+    do_act2_13 = db.Column(db.Text, nullable=True)
+    do_obj2_14 = db.Column(db.Text, nullable=True)
+    do_act2_14 = db.Column(db.Text, nullable=True)
+    do_obj2_15 = db.Column(db.Text, nullable=True)
+    do_act2_15 = db.Column(db.Text, nullable=True)
+    do_obj2_16 = db.Column(db.Text, nullable=True)
+    do_act2_16 = db.Column(db.Text, nullable=True)
+    do_obj2_17 = db.Column(db.Text, nullable=True)
+    do_act2_17 = db.Column(db.Text, nullable=True)
+    do_obj2_18 = db.Column(db.Text, nullable=True)
+    do_act2_18 = db.Column(db.Text, nullable=True)
+    do_obj2_19 = db.Column(db.Text, nullable=True)
+    do_act2_19 = db.Column(db.Text, nullable=True)
+    do_obj2_20 = db.Column(db.Text, nullable=True)
+    do_act2_20 = db.Column(db.Text, nullable=True)
+
+class block_cond_d1_3(db.Model):
+    __tablename__ = 'block_cond_d1_3'
+    datetime = db.Column(db.DateTime, default=datetime.now(), nullable=False, primary_key=True)
+    IP = db.Column(db.Text, nullable=False)
+    cond_z3_1 = db.Column(db.Text, nullable=True)
+    cond_a3_1 = db.Column(db.Text, nullable=True)
+    cond_b3_1 = db.Column(db.Text, nullable=True)
+    cond_c3_1 = db.Column(db.Text, nullable=True)
+    cond_a3_2 = db.Column(db.Text, nullable=True)
+    cond_b3_2 = db.Column(db.Text, nullable=True)
+    cond_c3_2 = db.Column(db.Text, nullable=True)
+    cond_d3_2 = db.Column(db.Text, nullable=True)
+    cond_a3_3 = db.Column(db.Text, nullable=True)
+    cond_b3_3 = db.Column(db.Text, nullable=True)
+    cond_c3_3 = db.Column(db.Text, nullable=True)
+    cond_d3_3 = db.Column(db.Text, nullable=True)
+    cond_a3_4 = db.Column(db.Text, nullable=True)
+    cond_b3_4 = db.Column(db.Text, nullable=True)
+    cond_c3_4 = db.Column(db.Text, nullable=True)
+    cond_d3_4 = db.Column(db.Text, nullable=True)
+    cond_a3_5 = db.Column(db.Text, nullable=True)
+    cond_b3_5 = db.Column(db.Text, nullable=True)
+    cond_c3_5 = db.Column(db.Text, nullable=True)
+    cond_d3_5 = db.Column(db.Text, nullable=True)
+    cond_a3_6 = db.Column(db.Text, nullable=True)
+    cond_b3_6 = db.Column(db.Text, nullable=True)
+    cond_c3_6 = db.Column(db.Text, nullable=True)
+    cond_d3_6 = db.Column(db.Text, nullable=True)
+    cond_a3_7 = db.Column(db.Text, nullable=True)
+    cond_b3_7 = db.Column(db.Text, nullable=True)
+    cond_c3_7 = db.Column(db.Text, nullable=True)
+    cond_d3_7 = db.Column(db.Text, nullable=True)
+    cond_a3_8 = db.Column(db.Text, nullable=True)
+    cond_b3_8 = db.Column(db.Text, nullable=True)
+    cond_c3_8 = db.Column(db.Text, nullable=True)
+    cond_d3_8 = db.Column(db.Text, nullable=True)
+    cond_a3_9 = db.Column(db.Text, nullable=True)
+    cond_b3_9 = db.Column(db.Text, nullable=True)
+    cond_c3_9 = db.Column(db.Text, nullable=True)
+    cond_d3_9 = db.Column(db.Text, nullable=True)
+    cond_a3_10 = db.Column(db.Text, nullable=True)
+    cond_b3_10 = db.Column(db.Text, nullable=True)
+    cond_c3_10 = db.Column(db.Text, nullable=True)
+    cond_d3_10 = db.Column(db.Text, nullable=True)
+    cond_a3_11 = db.Column(db.Text, nullable=True)
+    cond_b3_11 = db.Column(db.Text, nullable=True)
+    cond_c3_11 = db.Column(db.Text, nullable=True)
+    cond_d3_11 = db.Column(db.Text, nullable=True)
+    cond_a3_12 = db.Column(db.Text, nullable=True)
+    cond_b3_12 = db.Column(db.Text, nullable=True)
+    cond_c3_12 = db.Column(db.Text, nullable=True)
+    cond_d3_12 = db.Column(db.Text, nullable=True)
+    cond_a3_13 = db.Column(db.Text, nullable=True)
+    cond_b3_13 = db.Column(db.Text, nullable=True)
+    cond_c3_13 = db.Column(db.Text, nullable=True)
+    cond_d3_13 = db.Column(db.Text, nullable=True)
+    do_obj3_1 = db.Column(db.Text, nullable=True)
+    do_act3_1 = db.Column(db.Text, nullable=True)
+    do_obj3_2 = db.Column(db.Text, nullable=True)
+    do_act3_2 = db.Column(db.Text, nullable=True)
+    do_obj3_3 = db.Column(db.Text, nullable=True)
+    do_act3_3 = db.Column(db.Text, nullable=True)
+    do_obj3_4 = db.Column(db.Text, nullable=True)
+    do_act3_4 = db.Column(db.Text, nullable=True)
+    do_obj3_5 = db.Column(db.Text, nullable=True)
+    do_act3_5 = db.Column(db.Text, nullable=True)
+    do_obj3_6 = db.Column(db.Text, nullable=True)
+    do_act3_6 = db.Column(db.Text, nullable=True)
+    do_obj3_7 = db.Column(db.Text, nullable=True)
+    do_act3_7 = db.Column(db.Text, nullable=True)
+    do_obj3_8 = db.Column(db.Text, nullable=True)
+    do_act3_8 = db.Column(db.Text, nullable=True)
+    do_obj3_9 = db.Column(db.Text, nullable=True)
+    do_act3_9 = db.Column(db.Text, nullable=True)
+    do_obj3_10 = db.Column(db.Text, nullable=True)
+    do_act3_10 = db.Column(db.Text, nullable=True)
+    do_obj3_11 = db.Column(db.Text, nullable=True)
+    do_act3_11 = db.Column(db.Text, nullable=True)
+    do_obj3_12 = db.Column(db.Text, nullable=True)
+    do_act3_12 = db.Column(db.Text, nullable=True)
+    do_obj3_13 = db.Column(db.Text, nullable=True)
+    do_act3_13 = db.Column(db.Text, nullable=True)
+    do_obj3_14 = db.Column(db.Text, nullable=True)
+    do_act3_14 = db.Column(db.Text, nullable=True)
+    do_obj3_15 = db.Column(db.Text, nullable=True)
+    do_act3_15 = db.Column(db.Text, nullable=True)
+    do_obj3_16 = db.Column(db.Text, nullable=True)
+    do_act3_16 = db.Column(db.Text, nullable=True)
+    do_obj3_17 = db.Column(db.Text, nullable=True)
+    do_act3_17 = db.Column(db.Text, nullable=True)
+    do_obj3_18 = db.Column(db.Text, nullable=True)
+    do_act3_18 = db.Column(db.Text, nullable=True)
+    do_obj3_19 = db.Column(db.Text, nullable=True)
+    do_act3_19 = db.Column(db.Text, nullable=True)
+    do_obj3_20 = db.Column(db.Text, nullable=True)
+    do_act3_20 = db.Column(db.Text, nullable=True)
+
+class block_cond_d1_t(db.Model):
+    __tablename__ = 'block_cond_d1_t'
+    datetime = db.Column(db.DateTime, default=datetime.now(), nullable=False, primary_key=True)
+    IP = db.Column(db.Text, nullable=False)
+    tank_num = db.Column(db.Text, nullable=False)
+    cond1= db.Column(db.Text, nullable=True)
+    cond2= db.Column(db.Text, nullable=True)
+    cond3= db.Column(db.Text, nullable=True)
+    cond4= db.Column(db.Text, nullable=True)
+    cond5= db.Column(db.Text, nullable=True)
+    cond6= db.Column(db.Text, nullable=True)
+    cond7= db.Column(db.Text, nullable=True)
+    cond8= db.Column(db.Text, nullable=True)
+    cond9= db.Column(db.Text, nullable=True)
+    cond10= db.Column(db.Text, nullable=True)
+    cond11= db.Column(db.Text, nullable=True)
+    cond12= db.Column(db.Text, nullable=True)
+    cond13= db.Column(db.Text, nullable=True)
+    cond14= db.Column(db.Text, nullable=True)
+    cond15= db.Column(db.Text, nullable=True)
+    cond16= db.Column(db.Text, nullable=True)
+    cond17= db.Column(db.Text, nullable=True)
+    cond18= db.Column(db.Text, nullable=True)
+    cond19= db.Column(db.Text, nullable=True)
+    cond20= db.Column(db.Text, nullable=True)
+
+class block_cond_dry_t(db.Model):
+    __tablename__ = 'block_cond_dry_t'
+    datetime = db.Column(db.DateTime, default=datetime.now(), nullable=False, primary_key=True)
+    UserName = db.Column(db.Text, nullable=False)
+    tank_num = db.Column(db.Text, nullable=False)
+    cond= db.Column(db.Text, nullable=True)
+
+class dry_tank_relation(db.Model):
+    __tablename__ = 'dry_tank_relation'
+    tank_id = db.Column(db.String(5), nullable=False, primary_key=True)
+    tank_type = db.Column(db.Text, nullable=False)
+    tank_import = db.Column(db.Text, nullable=False)
+    tank_export = db.Column(db.Text, nullable=False)
+    datetime = db.Column(db.DateTime, default=datetime.now(), nullable=False)
 # # ////////////////////////////////////////////////////////////////////////////////
 # 乾燥槽
 # 乾燥桶入料_感測器_超音波感測器