Bugfixes and minor changes
This commit is contained in:
3
DB.py
3
DB.py
@@ -285,12 +285,13 @@ class DB:
|
||||
self.errlog ('PD99 for %s already exists - Overwrite' % data['dmc'])
|
||||
|
||||
try:
|
||||
cursor = self.executesql ("INSERT OR REPLACE INTO chiron (dmc, startts, endts, chiron) VALUES ('%(dmc)s', '%(startts)s', '%(endts)s', '%(chiron)s';" % data)
|
||||
cursor = self.executesql ("INSERT OR REPLACE INTO chiron (dmc, startts, endts, chiron) VALUES ('%(dmc)s', '%(startts)s', '%(endts)s', '%(chiron)s');" % data)
|
||||
except:
|
||||
print ("Couldnt insert PD99 chiron")
|
||||
raise Warning
|
||||
|
||||
self.updatebde (data['dmc'], 'chiron', data['bauteilstatus'])
|
||||
#self.updatebde (data['dmc'], 'variante', data['variante'])
|
||||
self.updatebde (data['dmc'], 'variante', data['bauteil'] + '-' + data['variante'])
|
||||
self.log (1,'PD99 - Change variante')
|
||||
self.updatebde (data['dmc'], 'ladungstraeger', data['ladungstraeger'])
|
||||
|
||||
248
Navision.py
248
Navision.py
@@ -3,6 +3,7 @@
|
||||
import sys, os
|
||||
sys.path.append (".")
|
||||
from time import time, strftime, sleep
|
||||
from states import *
|
||||
|
||||
|
||||
|
||||
@@ -20,6 +21,7 @@ class NAV:
|
||||
create CSV for BDE Data
|
||||
"""
|
||||
csvdata = ['']*155
|
||||
csvheader = ['']*155
|
||||
#1st check for BDE date
|
||||
bdefield = ['dmc', 'startts', 'endts', 'ladungstraeger', 'seriennr', 'variante', 'pruefzelle1', 'putzzelle', 'chiron', 'blindniet', 'bajonettclip', 'cclip', 'masseblech', 'pruefzelle2', 'nacharbeit', 'csv']
|
||||
ret = self.dbcon.getbde (dmc)
|
||||
@@ -30,17 +32,41 @@ class NAV:
|
||||
for i in range (len (bdefield)):
|
||||
bdedata [bdefield [i]] = ret[0][i]
|
||||
|
||||
#1 StatusBlob
|
||||
#2 Lfd Nummer
|
||||
#3 DMC
|
||||
csvdata [2] = bdedata ['dmc']
|
||||
#4 Zeitstempel Start
|
||||
csvdata [3] = bdedata ['startts']
|
||||
#5 Status BMW DMC FixMe muss imer i.O. sein eigtl.
|
||||
csvdata [4] = 'i.O.'
|
||||
#6 Reserve
|
||||
#7 Status Pruefzelle 1
|
||||
csvdata [6] = bdedata ['pruefzelle1']
|
||||
#1 ID
|
||||
csvheader [0] = 'ID'
|
||||
#2 DMC
|
||||
csvheader [1] = 'BMWDMC'
|
||||
csvdata [1] = bdedata ['dmc']
|
||||
#3 FINOBADMC
|
||||
csvheader [2] = 'FINOBADMC'
|
||||
#4 Typ FiXme
|
||||
csvheader [3] = 'Typ'
|
||||
#5 Zeitstempel Start
|
||||
csvheader [4] = 'Zeitstempel_Start'
|
||||
csvdata [4] = bdedata ['startts']
|
||||
#6 Zeitstempel Ende
|
||||
csvheader [5] = 'Zeitstempel_Ende'
|
||||
csvdata [5] = bdedata ['endts']
|
||||
#7 Seriennummer
|
||||
csvheader [6] = 'Seriennummer'
|
||||
csvdata [6] = bdedata ['seriennr']
|
||||
#8 Ladungstraeger
|
||||
csvheader [7] = 'Ladungstraeger'
|
||||
csvdata [7] = bdedata ['ladungstraeger']
|
||||
#9 Status BMW DMC FixMe muss imer i.O. sein eigtl.
|
||||
csvheader [8] = 'Status_BMW_DMC'
|
||||
csvdata [8] = 'i.o durchlaufen'
|
||||
#10 Status Finoba DMC FixMe gibts nimma
|
||||
csvheader [9] = 'Status_Finoba_DMC'
|
||||
csvdata [9] = 'nicht durchlaufen'
|
||||
|
||||
#11 Status Pruefzelle 1
|
||||
csvheader [10] = 'Pruefzelle_1_Status'
|
||||
csvheader [96] = 'Pruefzelle_1_Start'
|
||||
csvheader [97] = 'Pruefzelle_1_Ende'
|
||||
for i in range (40):
|
||||
csvheader [114 + i] = 'Pruefzelle_1_PP%02d' % (i + 1)
|
||||
csvdata [10] = bauteilstatusNav [bdedata ['pruefzelle1']]
|
||||
if bdedata ['pruefzelle1'] in ['i.O.', 'n.i.O.']:
|
||||
pz1field = ['dmc', 'startts', 'endts', 'pp01', 'pp02', 'pp03', 'pp04', 'pp05', 'pp06', 'pp07', 'pp08', 'pp08', 'pp09', 'pp10', 'pp11', 'pp12', 'pp13', 'pp14', 'pp15', 'pp16', 'pp17', 'pp18', 'pp19', 'pp20', 'pp21', 'pp22', 'pp23', 'pp24', 'pp25', 'pp26', 'pp27', 'pp28', 'pp29', 'pp30', 'pp31', 'pp32', 'pp33', 'pp34', 'pp35', 'pp36', 'pp37', 'pp38', 'pp39', 'pp40']
|
||||
ret = self.dbcon.getpruefzelle1 (dmc)
|
||||
@@ -52,10 +78,10 @@ class NAV:
|
||||
for i in range (len (pz1field)):
|
||||
pz1data [pz1field [i]] = ret[0][i]
|
||||
|
||||
#98 PZ1 Zeitstempel Start
|
||||
csvdata [97] = pz1data ['startts']
|
||||
#99 PZ1 Zeitstempel Ende
|
||||
csvdata [98] = pz1data ['endts']
|
||||
#97 PZ1 Zeitstempel Start
|
||||
csvdata [96] = pz1data ['startts']
|
||||
#98 PZ1 Zeitstempel Ende
|
||||
csvdata [97] = pz1data ['endts']
|
||||
#115 - 154
|
||||
for i in range (40):
|
||||
csvdata [114 + i] = pz1data ['pp%02d' % (i + 1)]
|
||||
@@ -64,9 +90,12 @@ class NAV:
|
||||
del pz1data
|
||||
|
||||
|
||||
#8 Reserve
|
||||
#9 Status Putzzelle
|
||||
csvdata [8] = bdedata ['putzzelle']
|
||||
#12 Status Putzzelle
|
||||
csvheader [11] = 'Putzzelle_Status'
|
||||
csvheader [98] = 'Putzzelle_Aufnahme'
|
||||
csvheader [99] = 'Putzzelle_Start'
|
||||
csvheader [100] = 'Putzzelle_Ende'
|
||||
csvdata [11] = bauteilstatusNav [bdedata ['putzzelle']]
|
||||
if bdedata ['putzzelle'] in ['i.O.', 'n.i.O.']:
|
||||
pufield = ['dmc', 'startts', 'endts', 'aufnahme']
|
||||
ret = self.dbcon.getputzzelle (dmc)
|
||||
@@ -78,8 +107,8 @@ class NAV:
|
||||
for i in range (len (pufield)):
|
||||
pudata [pufield [i]] = ret[0][i]
|
||||
|
||||
#10 Putzzelle Aufnahme
|
||||
csvdata [9] = pudata ['aufnahme']
|
||||
#99 Putzzelle Aufnahme
|
||||
csvdata [98] = pudata ['aufnahme']
|
||||
#100 Putzzelle Zeitstempel Start
|
||||
csvdata [99] = pudata ['startts']
|
||||
#101 Putzzelle Zeitstempel Ende
|
||||
@@ -89,8 +118,12 @@ class NAV:
|
||||
del pudata
|
||||
|
||||
|
||||
#11 Chiron Status
|
||||
csvdata [10] = bdedata ['chiron']
|
||||
#13 Chiron Status
|
||||
csvheader [12] = 'Chiron_Status'
|
||||
csvheader [101] = 'Chiron_Anlage'
|
||||
csvheader [102] = 'Chiron_Start'
|
||||
csvheader [103] = 'Chiron_Ende'
|
||||
csvdata [12] = bauteilstatusNav [bdedata ['chiron']]
|
||||
if bdedata ['chiron'] in ['i.O.', 'n.i.O.']:
|
||||
chfield = ['dmc', 'startts', 'endts', 'chiron']
|
||||
ret = self.dbcon.getchiron (dmc)
|
||||
@@ -113,8 +146,26 @@ class NAV:
|
||||
del chdata
|
||||
|
||||
|
||||
#12 Blindniet Status
|
||||
csvdata [11] = bdedata ['blindniet']
|
||||
#14 Blindniet Status
|
||||
csvheader [13] = 'Blindniet_Status'
|
||||
csvheader [104] = 'Blindniet_Start'
|
||||
csvheader [105] = 'Blindniet_Ende'
|
||||
for i in range (2):
|
||||
csvheader [20 + i] = 'Blindniet_Status_Rifbolt_M8_%d' % (i + 1)
|
||||
csvheader [58 + i * 2] = 'Blindniet_Rifbolt_M8_%d_Kraft' % (i + 1)
|
||||
csvheader [59 + i * 2] = 'Blindniet_Rifbolt_M8_%d_Weg' % (i + 1)
|
||||
for i in range (4):
|
||||
csvheader [22 + i] = 'Blindniet_Status_Bolzen_%d' % (i + 1)
|
||||
csvheader [62 + i * 4] = 'Blindniet_Bolzen_%d_Moment' % (i + 1)
|
||||
csvheader [63 + i * 4] = 'Blindniet_Bolzen_%d_Tiefe' % (i + 1)
|
||||
csvheader [64 + i * 4] = 'Blindniet_Bolzen_%d_Winkel' % (i + 1)
|
||||
csvheader [65 + i * 4] = 'Blindniet_Bolzen_%d_Zeit' % (i + 1)
|
||||
for i in range (5):
|
||||
csvheader [26 + i] = 'Blindniet_Status_Rifbolt_M6_%d' % (i + 1)
|
||||
csvheader [78 + i * 2] = 'Blindniet_Rifbolt_M6_%d_Kraft' % (i + 1)
|
||||
csvheader [79 + i * 2] = 'Blindniet_Rifbolt_M6_%d_Weg' % (i + 1)
|
||||
|
||||
csvdata [13] = bauteilstatusNav [bdedata ['blindniet']]
|
||||
if bdedata ['blindniet'] in ['i.O.', 'n.i.O.']:
|
||||
bnfield = ['dmc', 'startts', 'endts', 'DGBM8status01', 'DGBM8status02', 'DGBM8status03', 'DGBM8status04', 'NietM8status01', 'NietM8status02', 'NietM6status01', 'NietM6status02', 'NietM6status03', 'NietM6status04', 'NietM6status05', 'DGBM8M01', 'DGBM8D01', 'DGBM8W01', 'DGBM8T01', 'DGBM8M02', 'DGBM8D02', 'DGBM8W02', 'DGBM8T02', 'DGBM8M03', 'DGBM8D03', 'DGBM8W03', 'DGBM8T03', 'DGBM8M04', 'DGBM8D04', 'DGBM8W04', 'DGBM8T04', 'NietM8F01', 'NietM8S01', 'NietM8F02', 'NietM8S02', 'NietM6F01', 'NietM6S01', 'NietM6F02', 'NietM6S02', 'NietM6F03', 'NietM6S03', 'NietM6F04', 'NietM6S04', 'NietM6F05', 'NietM6S05']
|
||||
ret = self.dbcon.getblindniet (dmc)
|
||||
@@ -130,28 +181,34 @@ class NAV:
|
||||
csvdata [104] = bndata ['startts']
|
||||
#106 Blindniet Zeitstempel Ende
|
||||
csvdata [105] = bndata ['endts']
|
||||
#13 - 18
|
||||
#21-22 (d=1), 59-61 (d=2), 60-62 (d=2)
|
||||
for i in range (2):
|
||||
csvdata [12 + i * 3] = bndata ['NietM8status%02d' % (i + 1)]
|
||||
csvdata [13 + i * 3] = bndata ['NietM8F%02d' % (i + 1)]
|
||||
csvdata [14 + i * 3] = bndata ['NietM8F%02d' % (i + 1)]
|
||||
#19 - 38
|
||||
csvdata [20 + i] = bearbeitungstatusNav[bndata ['NietM8status%02d' % (i + 1)]]
|
||||
csvdata [58 + i * 2] = bndata ['NietM8F%02d' % (i + 1)]
|
||||
csvdata [59 + i * 2] = bndata ['NietM8S%02d' % (i + 1)]
|
||||
#23-26 (d=1), 63-75 (d=2) ff
|
||||
for i in range (4):
|
||||
csvdata [18 + i * 5] = bndata ['DGBM8status%02d' % (i + 1)]
|
||||
csvdata [19 + i * 5] = bndata ['DGBM8M%02d' % (i + 1)]
|
||||
csvdata [20 + i * 5] = bndata ['DGBM8D%02d' % (i + 1)]
|
||||
csvdata [21 + i * 5] = bndata ['DGBM8W%02d' % (i + 1)]
|
||||
csvdata [22 + i * 5] = bndata ['DGBM8T%02d' % (i + 1)]
|
||||
#39 - 53
|
||||
csvdata [22 + i] = bearbeitungstatusNav[bndata ['DGBM8status%02d' % (i + 1)]]
|
||||
csvdata [62 + i * 4] = bndata ['DGBM8M%02d' % (i + 1)]
|
||||
csvdata [63 + i * 4] = bndata ['DGBM8D%02d' % (i + 1)]
|
||||
csvdata [64 + i * 4] = bndata ['DGBM8W%02d' % (i + 1)]
|
||||
csvdata [65 + i * 4] = bndata ['DGBM8T%02d' % (i + 1)]
|
||||
#27-31 (d=1), 79-87 (d=2), 80-88 (d=2):
|
||||
for i in range (5):
|
||||
csvdata [38 + i * 3] = bndata ['NietM6status%02d' % (i + 1)]
|
||||
csvdata [39 + i * 3] = bndata ['NietM6F%02d' % (i + 1)]
|
||||
csvdata [40 + i * 3] = bndata ['NietM6S%02d' % (i + 1)]
|
||||
csvdata [26 + i] = bearbeitungstatusNav[bndata ['NietM6status%02d' % (i + 1)]]
|
||||
csvdata [78 + i * 2] = bndata ['NietM6F%02d' % (i + 1)]
|
||||
csvdata [79 + i * 2] = bndata ['NietM6S%02d' % (i + 1)]
|
||||
del bnfield
|
||||
del bndata
|
||||
|
||||
#54 Status Bajonettclip
|
||||
csvdata [53] = bdedata ['bajonettclip']
|
||||
#15 Status Bajonettclip
|
||||
csvheader [14] = 'Bajonetclip_Status'
|
||||
csvheader [106] = 'Bajonetclip_Aufnahme'
|
||||
csvheader [107] = 'Bajonetclip_Start'
|
||||
csvheader [108] = 'Bajonetclip_Ende'
|
||||
for i in range (4):
|
||||
csvheader [31 + i] = 'Bajonetclip_Status_Clip_%d' % (i + 1)
|
||||
csvdata [14] = bauteilstatusNav [bdedata ['bajonettclip']]
|
||||
if bdedata ['bajonettclip'] in ['i.O.', 'n.i.O.']:
|
||||
bajofield = ['dmc', 'startts', 'endts', 'aufnahme', 'bajostatus01', 'bajostatus02', 'bajostatus03', 'bajostatus04']
|
||||
ret = self.dbcon.getbajonettclip (dmc)
|
||||
@@ -163,21 +220,27 @@ class NAV:
|
||||
for i in range (len (bajofield)):
|
||||
bajodata [bajofield [i]] = ret[0][i]
|
||||
|
||||
#107 Bajonettclip Zeitstempel Start
|
||||
#107 Bajonettclip Zeitstempel Aufnahem
|
||||
csvdata [106] = bajodata ['aufnahme']
|
||||
#108 Bajonettclip Zeitstempel Start
|
||||
csvdata [107] = bajodata ['startts']
|
||||
#109 Bajonettclip Zeitstempel Ende
|
||||
csvdata [108] = bajodata ['endts']
|
||||
#55 - 59
|
||||
#32-35
|
||||
for i in range (4):
|
||||
csvdata [54 + i] = bajodata ['bajostatus%02d' % (i + 1)]
|
||||
csvdata [31 + i] = bearbeitungstatusNav[bajodata ['bajostatus%02d' % (i + 1)]]
|
||||
del bajodata
|
||||
del bajofield
|
||||
|
||||
|
||||
#59 Status CClip
|
||||
csvdata [58] = bdedata ['cclip']
|
||||
#16 Status CClip
|
||||
csvheader [15] = 'C_Clip_Status'
|
||||
csvheader [109] = 'C_Clip_Aufnahme'
|
||||
csvheader [110] = 'C_Clip_Start'
|
||||
csvheader [111] = 'C_Clip_Ende'
|
||||
for i in range (18):
|
||||
csvheader [35 + i] = 'C_Clip_Status_Clip_%d' % (i + 1)
|
||||
csvdata [15] = bauteilstatusNav [bdedata ['cclip']]
|
||||
if bdedata ['cclip'] in ['i.O.', 'n.i.O.']:
|
||||
ccfield = ['dmc', 'startts', 'endts', 'aufnahme', 'clipstatus01', 'clipstatus02', 'clipstatus03', 'clipstatus04', 'clipstatus05', 'clipstatus06', 'clipstatus07', 'clipstatus08', 'clipstatus09', 'clipstatus10', 'clipstatus11', 'clipstatus12', 'clipstatus13', 'clipstatus14', 'clipstatus15', 'clipstatus16', 'clipstatus17', 'clipstatus18']
|
||||
ret = self.dbcon.getcclip (dmc)
|
||||
@@ -189,21 +252,35 @@ class NAV:
|
||||
for i in range (len (ccfield)):
|
||||
ccdata [ccfield [i]] = ret[0][i]
|
||||
|
||||
#110 CClip Zeitstempel Start
|
||||
#110 CClip Zeitstempel Aufnahme
|
||||
csvdata [109] = ccdata ['aufnahme']
|
||||
#111 CClip Zeitstempel Start
|
||||
csvdata [110] = ccdata ['startts']
|
||||
#112 CClip Zeitstempel Ende
|
||||
csvdata [111] = ccdata ['endts']
|
||||
#60 - 77
|
||||
#36 -
|
||||
for i in range (18):
|
||||
csvdata [59 + i] = ccdata ['clipstatus%02d' % (i + 1)]
|
||||
csvdata [35 + i] = bearbeitungstatusNav[ccdata ['clipstatus%02d' % (i + 1)]]
|
||||
del ccfield
|
||||
del ccdata
|
||||
|
||||
|
||||
#78 Status Masseblech
|
||||
csvdata [77] = bdedata ['masseblech']
|
||||
#17 Status Masseblech
|
||||
csvheader [16] = 'Masseblech_Status'
|
||||
csvheader [112] = 'Masseblech_Start'
|
||||
csvheader [113] = 'Masseblech_Ende'
|
||||
csvheader [53] = 'Masseblech_Status_Ausgleichelement'
|
||||
csvheader [54] = 'Masseblech_Status_Schallisolierung'
|
||||
csvheader [55] = 'Masseblech_Status_Masseblech'
|
||||
csvheader [56] = 'Masseblech_Status_Blindniet'
|
||||
csvheader [57] = 'Masseblech_Status_Kombimutter'
|
||||
csvheader [90] = 'Masseblech_Blindniet_Kombimutter_Moment'
|
||||
csvheader [91] = 'Masseblech_Blindniet_Kombimutter_Tiefe'
|
||||
csvheader [92] = 'Masseblech_Blindniet_Kombimutter_Winkel'
|
||||
csvheader [93] = 'Masseblech_Blindniet_Kombimutter_Zeit'
|
||||
csvheader [88] = 'Masseblech_Blindniet_Kraft'
|
||||
csvheader [89] = 'Masseblech_Blindniet_Weg'
|
||||
csvdata [16] = bauteilstatusNav [bdedata ['masseblech']]
|
||||
if bdedata ['masseblech'] in ['i.O.', 'n.i.O.']:
|
||||
mbfield = ['dmc', 'startts', 'endts', 'ausgleichselement', 'schallisolierung', 'masseblech', 'blindniet', 'kombimutter', 'fniet', 'sniet', 'mmutter', 'dmutter', 'wmutter', 'tmutter']
|
||||
ret = self.dbcon.getmasseblech (dmc)
|
||||
@@ -215,48 +292,61 @@ class NAV:
|
||||
for i in range (len (mbfield)):
|
||||
mbdata [mbfield [i]] = ret[0][i]
|
||||
|
||||
#113 CClip Zeitstempel Start
|
||||
#113 Masseblech Zeitstempel Start
|
||||
csvdata [112] = mbdata ['startts']
|
||||
#114 CClip Zeitstempel Ende
|
||||
#114 Masseblech Zeitstempel Ende
|
||||
csvdata [113] = mbdata ['endts']
|
||||
#79 CClip Ausgleichseelement
|
||||
csvdata [78] = mbdata ['ausgleichselement']
|
||||
#80 CClip Schallisolierung
|
||||
csvdata [79] = mbdata ['schallisolierung']
|
||||
#81 CClip Masseblech
|
||||
csvdata [80] = mbdata ['masseblech']
|
||||
#82 CClip Blindniet
|
||||
csvdata [81] = mbdata ['blindniet']
|
||||
#83 CClip Blindniet
|
||||
csvdata [82] = mbdata ['kombimutter']
|
||||
#84 CClip Kombimutter M
|
||||
csvdata [83] = mbdata ['mmutter']
|
||||
#85 CClip Kombimutter D
|
||||
csvdata [84] = mbdata ['dmutter']
|
||||
#86 CClip Kombimutter W
|
||||
csvdata [85] = mbdata ['wmutter']
|
||||
#87 CClip Kombimutter T
|
||||
csvdata [86] = mbdata ['tmutter']
|
||||
#88 CClip Kombimutter T
|
||||
csvdata [87] = mbdata ['fniet']
|
||||
#89 CClip Kombimutter S
|
||||
csvdata [88] = mbdata ['sniet']
|
||||
#54 Masseblech Ausgleichseelement
|
||||
csvdata [53] = bauteilstatusNav [mbdata ['ausgleichselement']]
|
||||
#55 Masseblech Schallisolierung
|
||||
csvdata [54] = bauteilstatusNav [mbdata ['schallisolierung']]
|
||||
#56 Masseblech Masseblech
|
||||
csvdata [55] = bauteilstatusNav [mbdata ['masseblech']]
|
||||
#57 Masseblech Blindniet
|
||||
csvdata [56] = bauteilstatusNav [mbdata ['blindniet']]
|
||||
#58 Masseblech Blindniet
|
||||
csvdata [57] = bauteilstatusNav [mbdata ['kombimutter']]
|
||||
#91 Masseblech Kombimutter M
|
||||
csvdata [90] = mbdata ['mmutter']
|
||||
#92 Masseblech Kombimutter D
|
||||
csvdata [91] = mbdata ['dmutter']
|
||||
#93 Masseblech Kombimutter W
|
||||
csvdata [92] = mbdata ['wmutter']
|
||||
#94 Masseblech Kombimutter T
|
||||
csvdata [93] = mbdata ['tmutter']
|
||||
#89 Masseblech Blindniet F
|
||||
csvdata [88] = mbdata ['fniet']
|
||||
#90 Masseblech Blindniet S
|
||||
csvdata [89] = mbdata ['sniet']
|
||||
|
||||
del mbfield
|
||||
del mbdata
|
||||
|
||||
|
||||
#93 Status Pruefzelle2
|
||||
csvdata [92] = bdedata ['pruefzelle2']
|
||||
#94 Status Nacharbeit
|
||||
csvdata [93] = bdedata ['nacharbeit']
|
||||
#18 Status Pruefzelle2
|
||||
csvheader [17] = 'Pruefzelle_2'
|
||||
csvdata [17] = bauteilstatusNav [bdedata ['pruefzelle2']]
|
||||
#19 Status Nacharbeit
|
||||
csvheader [18] = 'Nacharbeitung'
|
||||
csvdata [18] = bauteilstatusNav [bdedata ['nacharbeit']]
|
||||
|
||||
#20 DMC uberpruefen Obsolete
|
||||
csvheader [19] = 'DMC_ueberpruefen'
|
||||
|
||||
#95 DMC uberpruefen Obsolete
|
||||
csvheader [94] = 'Bemerkung'
|
||||
#96 DMC uberpruefen Obsolete
|
||||
csvheader [95] = 'Gesamt'
|
||||
|
||||
file = open (self.path + dmc + '.csv', "w")
|
||||
for i in csvheader:
|
||||
if type (i) == str and';' in i:
|
||||
print ("Semikolon in Data")
|
||||
file.write (str (i) + ';')
|
||||
file.write (str (i) + '\n')
|
||||
for i in csvdata:
|
||||
if type (i) == str and';' in i:
|
||||
print ("Semikolon in Data")
|
||||
|
||||
file.write (str (i) + ';')
|
||||
file.close ()
|
||||
|
||||
|
||||
@@ -123,13 +123,13 @@ def fromstring (data):
|
||||
except:
|
||||
print ("Debug-NietM6S02", data[128], data[129])
|
||||
try:
|
||||
tel.attrib['NietM6F03'] = (data [130] << 8) + data [132]
|
||||
tel.attrib['NietM6F03'] = (data [130] << 8) + data [131]
|
||||
except:
|
||||
print ("Debug-NietM6F03", data[130], data[132])
|
||||
print ("Debug-NietM6F03", data[130], data[131])
|
||||
try:
|
||||
tel.attrib['NietM6S03'] = (data [132] << 8) + data [131]
|
||||
tel.attrib['NietM6S03'] = (data [132] << 8) + data [133]
|
||||
except:
|
||||
print ("Debug-NietM6S03", data[132], data[131])
|
||||
print ("Debug-NietM6S03", data[132], data[133])
|
||||
try:
|
||||
tel.attrib['NietM6F04'] = (data [134] << 8) + data [135]
|
||||
except:
|
||||
|
||||
@@ -32,6 +32,7 @@ def fromstring (data):
|
||||
tel.attrib['endts'] = tsdecode (data [52:66].decode ())
|
||||
#66-70 Varianten daten
|
||||
# Bitarray other Byte Order !!
|
||||
tel.attrib['bauteil'] = bauteil.get ((data [67] << 8) + data [66], '')
|
||||
tel.attrib['variante'] = variante.get ((data [69] << 8) + data [68], '')
|
||||
tel.attrib['bauteilstatus'] = bauteilstatus.get (chr (data [70]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
|
||||
try:
|
||||
@@ -65,7 +66,7 @@ class TEL_PD99 (TELEGRAM):
|
||||
"""
|
||||
This method can be used to identify a TELEGRAM by string.
|
||||
"""
|
||||
return "PD02 TELEGRAM"
|
||||
return "PD99 TELEGRAM"
|
||||
|
||||
|
||||
def __repr__ (self):
|
||||
|
||||
19
bde.py
19
bde.py
@@ -181,29 +181,32 @@ class BDEServer ():
|
||||
if (count > 0):
|
||||
#self.debug()
|
||||
if teltype == 'PD01':
|
||||
self.message (3, ' DT_handler : Store Data from PD01 Pruefzelle1')
|
||||
self.message (3, ' DT_handler : Store Data from PD01 Pruefzelle1 for %s' % ret_val['dmc'])
|
||||
if 'Read Error' in ret_val['dmc']:
|
||||
self.message (3, ' DT_handler : NoRead from PD01 Pruefzelle1')
|
||||
self.message (3, ' DT_handler : NoRead from PD01 Pruefzelle1 for %s'% ret_val['dmc'])
|
||||
else:
|
||||
DB_con.addpruefzelle1 (ret_val)
|
||||
elif teltype in ['PD02', 'PD03']:
|
||||
self.message (3, ' DT_handler : Store Data from %s Putzzelle' % teltype)
|
||||
self.message (3, ' DT_handler : Store Data from %s Putzzelle for %s' % (teltype, ret_val['dmc']))
|
||||
DB_con.addputzzelle (ret_val)
|
||||
elif teltype == 'PD05':
|
||||
self.message (3, ' DT_handler : Store Data from PD05 Blindniet')
|
||||
self.message (3, ' DT_handler : Store Data from PD05 Blindniet for %s' % ret_val['dmc'])
|
||||
DB_con.addblindniet (ret_val)
|
||||
elif teltype == 'PD06':
|
||||
self.message (3, ' DT_handler : Store Data from PD06 Bajonettclip')
|
||||
self.message (3, ' DT_handler : Store Data from PD06 Bajonettclip for %s' % ret_val['dmc'])
|
||||
DB_con.addbajonettclip (ret_val)
|
||||
elif teltype == 'PD07':
|
||||
self.message (3, ' DT_handler : Store Data from PD07 CClip')
|
||||
self.message (3, ' DT_handler : Store Data from PD07 CClip for %s' % ret_val['dmc'])
|
||||
DB_con.addcclip (ret_val)
|
||||
elif teltype == 'PD08':
|
||||
self.message (3, ' DT_handler : Store Data from PD08 Masseblech')
|
||||
self.message (3, ' DT_handler : Store Data from PD08 Masseblech for %s' % ret_val['dmc'])
|
||||
DB_con.addmasseblech (ret_val)
|
||||
elif teltype == 'PD10':
|
||||
self.message (3, ' DT_handler : Store Data from PD10 Pruefzelle2')
|
||||
self.message (3, ' DT_handler : Store Data from PD10 Pruefzelle2 for %s' % ret_val['dmc'])
|
||||
DB_con.addpruefzelle2 (ret_val)
|
||||
elif teltype == 'PD99':
|
||||
self.message (3, ' DT_handler : Store Data from PD99 Chiron for %s' % ret_val['dmc'])
|
||||
DB_con.addchiron (ret_val)
|
||||
|
||||
#============================================================================================
|
||||
elif (count == 0):
|
||||
|
||||
@@ -1,6 +1,14 @@
|
||||
bauteilstatus = {'0' : 'n.Durchlaufen',
|
||||
'1' : 'i.O.',
|
||||
'2' : 'n.i.O.'}
|
||||
bauteilstatusNav = {'' : '',
|
||||
'n.Durchlaufen' : 'nicht durchlaufen',
|
||||
'i.O.' : 'i.o durchlaufen',
|
||||
'n.i.O.' : 'n.i.o durchlaufen'}
|
||||
bearbeitungsstatus = {'0' : 'n.Bearbeitet',
|
||||
'1' : 'i.O.',
|
||||
'2' : 'n.i.O.'}
|
||||
bearbeitungstatusNav = {'' : '',
|
||||
'n.Bearbeitet' : 'nicht durchlaufen',
|
||||
'i.O.' : 'i.o durchlaufen',
|
||||
'n.i.O.' : 'n.i.o durchlaufen'}
|
||||
|
||||
@@ -42,6 +42,11 @@ def decode_PD98 (data):
|
||||
from PD98_tel import fromstring
|
||||
return fromstring (data)
|
||||
|
||||
def decode_PD99 (data):
|
||||
from PD99_tel import fromstring
|
||||
return fromstring (data)
|
||||
|
||||
|
||||
def decode_STAT (data):
|
||||
from STAT_tel import fromstring
|
||||
return fromstring (data)
|
||||
@@ -54,6 +59,7 @@ b'PD06': decode_PD06,
|
||||
b'PD07': decode_PD07,
|
||||
b'PD08': decode_PD08,
|
||||
b'PD98': decode_PD98,
|
||||
b'PD99': decode_PD99,
|
||||
b'PD10': decode_PD10,
|
||||
b'STAT': decode_STAT
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user