Implemented RR
This commit is contained in:
4
DB.py
4
DB.py
@@ -679,7 +679,7 @@ class DB:
|
||||
io = 0
|
||||
|
||||
if data['blindniet'] == 'i.O. NA':
|
||||
self.log (5, 'PD09 Niet reworked updating part data F:%d S:%d' % (data['fniet' % i], data['sniet']))
|
||||
self.log (5, 'PD09 Niet reworked updating part data F:%d S:%d' % (int (data['fniet']), int (data['sniet'])))
|
||||
self.updateinformation (data['dmc'], 'masseblech', 'blindniet', data['blindniet'])
|
||||
self.updateinformation (data['dmc'], 'masseblech', 'fniet', data['fniet'])
|
||||
self.updateinformation (data['dmc'], 'masseblech', 'sniet', data['sniet'])
|
||||
@@ -787,7 +787,7 @@ class DB:
|
||||
_gesio = 0
|
||||
_bndata ['bauteilstatus'] = _bnstatus
|
||||
self.addblindniet (_bndata, store = 0)
|
||||
self.updatebde (data['dmc'], 'blindniet', _bntatus)
|
||||
self.updatebde (data['dmc'], 'blindniet', _bnstatus)
|
||||
elif _states ['blindniet'] in ['i.O.', 'i.O. NA']:
|
||||
self.log (5, 'PD30 Blindniet %s already i.O. do nothing' % data['dmc'])
|
||||
else:
|
||||
|
||||
151
DB_MariaDB.py
151
DB_MariaDB.py
@@ -48,6 +48,7 @@ class DBMaria:
|
||||
#Build Transaction Log
|
||||
if (dbstring.find ('DELETE') >= 0) or\
|
||||
(dbstring.find ('INSERT') >= 0) or\
|
||||
(dbstring.find ('REPLACE') >= 0) or\
|
||||
(dbstring.find ('UPDATE') >= 0):
|
||||
file = open (self.talogfile, "a")
|
||||
dt = datetime.now ()
|
||||
@@ -945,9 +946,139 @@ class DBMaria:
|
||||
return cursor.fetchone ()
|
||||
|
||||
|
||||
def addbderr (self, data):
|
||||
"""
|
||||
Add new Processdata to RR-BDE
|
||||
"""
|
||||
try:
|
||||
cursor = self.executesql ("REPLACE INTO bderr (dmc, startts, variante) "\
|
||||
"VALUES ('%(dmc)s', '%(startts)s', '%(variante)s');"% data)
|
||||
except:
|
||||
print ("Couldnt insert new data into BDE RR")
|
||||
raise Warning
|
||||
|
||||
|
||||
|
||||
def replacebderr (self, data):
|
||||
"""
|
||||
Replace Processdata in RR-BDE
|
||||
"""
|
||||
try:
|
||||
data ['variante'] = data['bauteil']+ '-' + data['variante']
|
||||
cursor = self.executesql ("REPLACE INTO bderr (dmc, startts, endts, variante, PutzzelleStatus, "\
|
||||
"NietM6status01, NietM6F01, NietM6S01, NietM6status02, NietM6F02, NietM6S02, "\
|
||||
"NietM6status03, NietM6F03, NietM6S03, NietM6status04, NietM6F04, NietM6S04, "\
|
||||
"NietM6status05, NietM6F05, NietM6S05, "\
|
||||
"DGBM8status01, DGBM8M01, DGBM8W01, DGBM8status02, DGBM8M02, DGBM8W02, "\
|
||||
"DGBM8status03, DGBM8M03, DGBM8W03, DGBM8status04, DGBM8M04, DGBM8W04, "\
|
||||
"NietM8status01, NietM8F01, NietM8S01, NietM8status02, NietM8F02, NietM8S02, "\
|
||||
"bajostatus01, bajostatus02, bajostatus03, bajostatus04, "\
|
||||
"clipstatus01, clipstatus02, clipstatus03, clipstatus04, clipstatus05, "\
|
||||
"clipstatus06, clipstatus07, clipstatus08, clipstatus09, clipstatus10, "\
|
||||
"clipstatus11, clipstatus12, clipstatus13, clipstatus14, clipstatus15, "\
|
||||
"clipstatus16, clipstatus17, clipstatus18, clipstatus19, clipstatus20, "\
|
||||
"clipstatus21, clipstatus22, clipstatus23, clipstatus24, clipstatus25, "\
|
||||
"clipstatus26, clipstatus27, clipstatus28, clipstatus29, "\
|
||||
"blindniet, fniet, sniet, "\
|
||||
"kombimutter, mmutter, wmutter, masseblech, ausgleichselement, schallisolierung, "\
|
||||
"BNM8status01, BNM8f01, BNM8s01, BNM8status02, BNM8f02, BNM8s02, "\
|
||||
"BNM8status03, BNM8f03, BNM8s03, BNM8status04, BNM8f04, BNM8s04, "\
|
||||
"SKSM8status01, SKSM8M01, SKSM8W01, SKSM8status02, SKSM8M02, SKSM8W02, "\
|
||||
"SKSM8status03, SKSM8M03, SKSM8W03, SKSM8status04, SKSM8M04, SKSM8W04, "\
|
||||
"Blechstatus01, Blechstatus02, Blechstatus03, Blechstatus04, "\
|
||||
"LKSC01, LKSC02, LKSC03, LKSC04, LKSC05, LKSC06, LKSC07, LKSC08, "\
|
||||
"ODBstatus, ODBSchraubestatus, Filzstatus01, Filzstatus02, Filzstatus03, Filzstatus04, "\
|
||||
"Bohrungstatus01, Bohrungstatus02, Bohrungstatus03, Bohrungstatus04, Bohrungstatus05, Bohrungstatus06, Bohrungstatus07, Bohrungstatus08, "\
|
||||
"userid) "\
|
||||
"VALUES ('%(dmc)s', '%(startts)s', '%(endts)s', '%(variante)s', '%(PutzzelleStatus)s', "\
|
||||
"'%(NietM6status01)s', '%(NietM6F01)d', '%(NietM6S01)d', '%(NietM6status02)s', '%(NietM6F02)d', '%(NietM6S02)d', "\
|
||||
"'%(NietM6status03)s', '%(NietM6F03)d', '%(NietM6S03)d', '%(NietM6status04)s', '%(NietM6F04)d', '%(NietM6S04)d', "\
|
||||
"'%(NietM6status05)s', '%(NietM6F05)d', '%(NietM6S05)d', "\
|
||||
"'%(DGBM8status01)s', '%(DGBM8M01)d', '%(DGBM8W01)d', '%(DGBM8status02)s', '%(DGBM8M02)d', '%(DGBM8W02)d', "\
|
||||
"'%(DGBM8status03)s', '%(DGBM8M03)d', '%(DGBM8W03)d', '%(DGBM8status04)s', '%(DGBM8M04)d', '%(DGBM8W04)d', "\
|
||||
"'%(NietM8status01)s', '%(NietM8F01)d', '%(NietM8S01)d', '%(NietM8status02)s', '%(NietM8F02)d', '%(NietM8S02)d', "\
|
||||
"'%(bajostatus01)s', '%(bajostatus02)s', '%(bajostatus03)s', '%(bajostatus04)s', "\
|
||||
"'%(clipstatus01)s', '%(clipstatus02)s', '%(clipstatus03)s', '%(clipstatus04)s', '%(clipstatus05)s', "\
|
||||
"'%(clipstatus06)s', '%(clipstatus07)s', '%(clipstatus08)s', '%(clipstatus09)s', '%(clipstatus10)s', "\
|
||||
"'%(clipstatus11)s', '%(clipstatus12)s', '%(clipstatus13)s', '%(clipstatus14)s', '%(clipstatus15)s', "\
|
||||
"'%(clipstatus16)s', '%(clipstatus17)s', '%(clipstatus18)s', '%(clipstatus19)s', '%(clipstatus20)s', "\
|
||||
"'%(clipstatus21)s', '%(clipstatus22)s', '%(clipstatus23)s', '%(clipstatus24)s', '%(clipstatus25)s', "\
|
||||
"'%(clipstatus26)s', '%(clipstatus27)s', '%(clipstatus28)s', '%(clipstatus29)s', "\
|
||||
"'%(blindniet)s', '%(fniet)d', '%(sniet)d', "\
|
||||
"'%(kombimutter)s', '%(mmutter)d', '%(wmutter)d', '%(masseblech)s', '%(ausgleichselement)s', '%(schallisolierung)s', "\
|
||||
"'%(BNM8status01)s', '%(BNM8f01)d', '%(BNM8s01)d', '%(BNM8status02)s', '%(BNM8f02)d', '%(BNM8s02)d', "\
|
||||
"'%(BNM8status03)s', '%(BNM8f03)d', '%(BNM8s03)d', '%(BNM8status04)s', '%(BNM8f04)d', '%(BNM8s04)d', "\
|
||||
"'%(SKSM8status01)s', '%(SKSM8M01)d', '%(SKSM8W01)d', '%(SKSM8status02)s', '%(SKSM8M02)d', '%(SKSM8W02)d', "\
|
||||
"'%(SKSM8status03)s', '%(SKSM8M03)d', '%(SKSM8W03)d', '%(SKSM8status04)s', '%(SKSM8M04)d', '%(SKSM8W04)d', "\
|
||||
"'%(Blechstatus01)s', '%(Blechstatus02)s', '%(Blechstatus03)s', '%(Blechstatus04)s', "\
|
||||
"'%(LKSC01)s', '%(LKSC02)s', '%(LKSC03)s', '%(LKSC04)s', '%(LKSC05)s', '%(LKSC06)s', '%(LKSC07)s', '%(LKSC08)s',"\
|
||||
"'%(ODBstatus)s', '%(ODBSchraubestatus)s', '%(Filzstatus01)s', '%(Filzstatus02)s', '%(Filzstatus03)s', '%(Filzstatus04)s', "\
|
||||
"'%(Bohrungstatus01)s', '%(Bohrungstatus02)s', '%(Bohrungstatus03)s', '%(Bohrungstatus04)s', '%(Bohrungstatus05)s', '%(Bohrungstatus06)s', '%(Bohrungstatus07)s', '%(Bohrungstatus08)s', "\
|
||||
"'%(userid)s');"% data)
|
||||
except:
|
||||
print ("Couldnt insert into BDE RR")
|
||||
raise Warning
|
||||
|
||||
|
||||
def getbderr (self, dmc):
|
||||
"""
|
||||
Get Processdata RR
|
||||
"""
|
||||
try:
|
||||
cursor = self.executesql ("SELECT dmc, startts, endts, variante, PutzzelleStatus, "\
|
||||
"NietM6status01, NietM6F01, NietM6S01, NietM6status02, NietM6F02, NietM6S02, "\
|
||||
"NietM6status03, NietM6F03, NietM6S03, NietM6status04, NietM6F04, NietM6S04, "\
|
||||
"NietM6status05, NietM6F05, NietM6S05, "\
|
||||
"DGBM8status01, DGBM8M01, DGBM8W01, DGBM8status02, DGBM8M02, DGBM8W02, "\
|
||||
"DGBM8status03, DGBM8M03, DGBM8W03, DGBM8status04, DGBM8M04, DGBM8W04, "\
|
||||
"NietM8status01, NietM8F01, NietM8S01, NietM8status02, NietM8F02, NietM8S02, "\
|
||||
"bajostatus01, bajostatus02, bajostatus03, bajostatus04, "\
|
||||
"clipstatus01, clipstatus02, clipstatus03, clipstatus04, clipstatus05, "\
|
||||
"clipstatus06, clipstatus07, clipstatus08, clipstatus09, clipstatus10, "\
|
||||
"clipstatus11, clipstatus12, clipstatus13, clipstatus14, clipstatus15, "\
|
||||
"clipstatus16, clipstatus17, clipstatus18, clipstatus19, clipstatus20, "\
|
||||
"clipstatus21, clipstatus22, clipstatus23, clipstatus24, clipstatus25, "\
|
||||
"clipstatus26, clipstatus27, clipstatus28, clipstatus29, "\
|
||||
"blindniet, fniet, sniet, "\
|
||||
"kombimutter, mmutter, wmutter, masseblech, ausgleichselement, schallisolierung, "\
|
||||
"BNM8status01, BNM8f01, BNM8s01, BNM8status02, BNM8f02, BNM8s02, "\
|
||||
"BNM8status03, BNM8f03, BNM8s03, BNM8status04, BNM8f04, BNM8s04, "\
|
||||
"SKSM8status01, SKSM8M01, SKSM8W01, SKSM8status02, SKSM8M02, SKSM8W02, "\
|
||||
"SKSM8status03, SKSM8M03, SKSM8W03, SKSM8status04, SKSM8M04, SKSM8W04, "\
|
||||
"Blechstatus01, Blechstatus02, Blechstatus03, Blechstatus04, "\
|
||||
"LKSC01, LKSC02, LKSC03, LKSC04, LKSC05, LKSC06, LKSC07, LKSC08, "\
|
||||
"ODBstatus, ODBSchraubestatus, Filzstatus01, Filzstatus02, Filzstatus03, Filzstatus04, "\
|
||||
"Bohrungstatus01, Bohrungstatus02, Bohrungstatus03, Bohrungstatus04, Bohrungstatus05, Bohrungstatus06, Bohrungstatus07, Bohrungstatus08, "\
|
||||
"userid FROM bderr "\
|
||||
"WHERE dmc = '%s';" % dmc)
|
||||
except:
|
||||
print ("Couldnt read from BDERR")
|
||||
|
||||
return cursor.fetchall ()
|
||||
|
||||
|
||||
|
||||
def updatebderr (self, dmc, field, value):
|
||||
"""
|
||||
Updates BD RR information
|
||||
"""
|
||||
l = self.getbderr (dmc)
|
||||
if len (l) == 0:
|
||||
print ('Missing bde RR entry for DMC %s create empty one' % dmc)
|
||||
|
||||
nval = value
|
||||
|
||||
try:
|
||||
cursor = self.executesql ("UPDATE bderr SET %s = '%s' WHERE dmc = '%s';" % (field, nval, dmc))
|
||||
except:
|
||||
print ("Couldnt update BDE")
|
||||
raise Warning
|
||||
|
||||
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
conn = DBMaria ('bde', 'bde', 'eczema-orleans-queuing-surplus', '/tmp/talog.sql', logtest, errlogtest)
|
||||
conn = DBMaria ('bde', 'bde', 'eczema-orleans-queuing-surplus', '/tmp/talogRR.sql', logtest, errlogtest)
|
||||
#print (conn.checklock ('26923900100113758431311'))
|
||||
#data = {'dmc' : '4711',
|
||||
# 'rohteilnr' : '4711',
|
||||
@@ -960,7 +1091,7 @@ if __name__ == "__main__":
|
||||
#print (conn.locksize ())
|
||||
|
||||
#print (conn.getpruefzelle2range ('2017-03-15 00:00:00', '2017-03-15 12:00:00'))
|
||||
print (conn.getactuallimits ())
|
||||
#print (conn.getactuallimits ())
|
||||
#from PD01_tel import TEL_PD01
|
||||
#PD01 = TEL_PD01 ()
|
||||
#from PD10_tel import TEL_PD10
|
||||
@@ -983,3 +1114,19 @@ if __name__ == "__main__":
|
||||
#conn.addcclip (PD07)
|
||||
#conn.deletemasseblech (PD08['dmc'])
|
||||
#conn.addmasseblech (PD08)
|
||||
|
||||
data = {'DGBM8T04': 0, 'Filzstatus04': 'n.Bearbeitet', 'NietM6status03': 'i.O. NA', 'BNM8status02': 'i.O.', 'DGBM8T03': 0, 'DGBM8M03': 2348, 'src': '30', 'LKSC04': 'n.Bearbeitet', 'DGBM8W01': 5, 'bauteilstatus': 'n.Bearbeitet', 'DGBM8M02': 2444, 'clipstatus27': 'n.Bearbeitet', 'Blechstatus04': 'n.Bearbeitet', 'BNM8f02': 0, 'DGBM8D02': 350, 'NietM8S02': 41, 'variante': 'RL-HUD', 'clipstatus14': 'i.O. NA', 'clipstatus02': 'i.O. NA', 'NietM8S01': 41, 'BNM8f03': 0, 'DGBM8status03': 'i.O. NA', 'clipstatus25': 'n.Bearbeitet', 'DGBM8status04': 'i.O. NA', 'clipstatus04': 'i.O. NA', 'NietM6F04': 10620, 'BNM8f04': 0, 'Bohrungstatus08': 'n.Bearbeitet', 'NietM6S04': 37, 'BNM8s01': 0, 'Bohrungstatus07': 'n.Bearbeitet', 'ausgleichselement': 'i.O. NA', 'SKSM8W02': 0, 'clipstatus29': 'n.Bearbeitet', 'DGBM8W03': 700, 'bajostatus03': 'i.O. NA', 'clipstatus20': 'n.Bearbeitet', 'clipstatus12': 'i.O. NA', 'SKSM8status02': 'i.O.', 'mmutter': 1000, 'startts': '2017-10-11 15:49:37', 'clipstatus21': 'n.Bearbeitet', 'DGBM8M01': 2440, 'blindniet': 'i.O. NA', 'BNM8s02': 0, 'BNM8f01': 0, 'dst': 'PC', 'SKSM8status03': 'i.O.', 'Filzstatus03': 'n.Bearbeitet', 'NietM6status05': 'i.O. NA', 'bajostatus01': 'i.O. NA', 'clipstatus08': 'i.O. NA', 'DGBM8W04': 5, 'BNM8status04': 'i.O.', 'Filzstatus02': 'n.Bearbeitet', 'NietM6F05': 10660, 'clipstatus05': 'i.O. NA', 'clipstatus07': 'i.O. NA', 'NietM8F02': 18040, 'clipstatus11': 'i.O. NA', 'clipstatus28': 'n.Bearbeitet', 'clipstatus17': 'i.O. NA', 'BNM8status03': 'i.O.', 'ladungstraeger': 'n.Bearbeitet', 'SKSM8M03': 0, 'SKSM8W04': 0, 'check': 0, 'SKSM8W01': 0, 'NietM6S01': 36, 'NietM6status01': 'i.O. NA', 'LKSC01': 'n.Bearbeitet', 'clipstatus01': 'i.O. NA', 'BNM8status01': 'i.O.', 'DGBM8T01': 0, 'SKSM8M02': 0, 'NietM6S02': 38, 'clipstatus26': 'n.Bearbeitet', 'dmc': '40858720250917929764516', 'LKSC03': 'n.Bearbeitet', 'DGBM8D04': 350, 'DGBM8W02': 5, 'SKSM8W03': 0, 'Bohrungstatus06': 'n.Bearbeitet', 'clipstatus15': 'i.O. NA', 'tmutter': 300, 'ODBSchraubestatus': 'n.Bearbeitet', 'NietM8status01': 'i.O. NA', 'nr': 18, 'bauteil': 'RR', 'Filzstatus01': 'n.Bearbeitet', 'NietM6S05': 40, 'Bohrungstatus04': 'n.Bearbeitet', 'userid': 0, 'NietM6status04': 'i.O. NA', 'clipstatus03': 'i.O. NA', 'LKSC02': 'n.Bearbeitet', 'NietM6S03': 38, 'clipstatus23': 'n.Bearbeitet', 'NietM8status02': 'i.O. NA', 'Blechstatus02': 'n.Bearbeitet', 'Blechstatus03': 'n.Bearbeitet', 'clipstatus06': 'i.O. NA', 'NietM6F03': 10580, 'clipstatus09': 'i.O. NA', 'SKSM8status01': 'i.O.', 'DGBM8status02': 'i.O. NA', 'BNM8s03': 0, 'Blechstatus01': 'n.Bearbeitet', 'clipstatus16': 'i.O. NA', 'bajostatus04': 'i.O. NA', 'wmutter': 0, 'NietM8F01': 18040, 'clipstatus24': 'n.Bearbeitet', 'clipstatus18': 'i.O. NA', 'fniet': 3200, 'DGBM8T02': 0, 'clipstatus13': 'i.O. NA', 'schallisolierung': 'i.O. NA', 'endts': '2017-10-11 15:49:37', 'SKSM8M04': 0, 'BNM8s04': 0, 'DGBM8D01': 350, 'NietM6F01': 10580, 'kombimutter': 'i.O. NA', 'type': 'PD30', 'dmutter': 440, 'NietM6F02': 10610, 'SKSM8M01': 0, 'DGBM8status01': 'i.O. NA', 'Bohrungstatus01': 'n.Bearbeitet', 'clipstatus22': 'n.Bearbeitet', 'sniet': 50, 'Bohrungstatus02': 'n.Bearbeitet', 'clipstatus19': 'n.Bearbeitet', 'DGBM8D03': 350, 'bajostatus02': 'i.O. NA', 'masseblech': 'i.O. NA', 'DGBM8M04': 2393, 'NietM6status02': 'i.O. NA', 'SKSM8status04': 'i.O.', 'Bohrungstatus05': 'n.Bearbeitet', 'PutzzelleStatus': 'n.Bearbeitet', 'clipstatus10': 'i.O. NA', 'ODBstatus': 'n.Bearbeitet', 'Bohrungstatus03': 'n.Bearbeitet', 'LKSC05': 'n.Bearbeitet', 'LKSC06': 'n.Bearbeitet', 'LKSC07': 'n.Bearbeitet', 'LKSC08': 'n.Bearbeitet'}
|
||||
#conn.replacebderr (data)
|
||||
d = conn.getbderr ('40858720250917929764516')
|
||||
print (d)
|
||||
data = {'startts': '2017-10-11 15:49:37', 'dmc': '4085872050917929764516', 'bauteil': 'RR', 'variante': 'RL-BASIS'}
|
||||
d = conn.addbderr (data)
|
||||
d = conn.getbderr ('4085872025091792976451')
|
||||
|
||||
conn.updatebderr ('40858720250917929764516', 'variante', 'RR21-RL-HUD')
|
||||
st1hud = ['BNM8status01', 'BNM8status02', 'BNM8status03','BNM8status04','SKSM8status01', 'SKSM8status02', 'SKSM8status03', 'SKSM8status04']
|
||||
for part in st1hud:
|
||||
conn.updatebderr ('40858720250917929764516', part, '.i.O.')
|
||||
st2chiron = ['Bohrungstatus01', 'Bohrungstatus02', 'Bohrungstatus03', 'Bohrungstatus04', 'Bohrungstatus05', 'Bohrungstatus06', 'Bohrungstatus07', 'Bohrungstatus08']
|
||||
for part in st2chiron:
|
||||
conn.updatebderr ('40858720250917929764516', part, 'i.O.')
|
||||
|
||||
16
PD30_tel.py
16
PD30_tel.py
@@ -229,25 +229,25 @@ def fromstring (data):
|
||||
for i in range (4):
|
||||
tel.attrib['Blechstatus%02d' % (i + 1)] = bearbeitungsstatus.get (chr (data [242 + i]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
|
||||
#Linksenkopfschraube in CClip
|
||||
for i in range (4):
|
||||
for i in range (8):
|
||||
tel.attrib['LKSC%02d' % (i + 1)] = bearbeitungsstatus.get (chr (data [246 + i]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
|
||||
#ODB
|
||||
tel.attrib['ODBstatus'] = bearbeitungsstatus.get (chr (data [250]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
|
||||
tel.attrib['ODBSchraubestatus'] = bearbeitungsstatus.get (chr (data [251]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
|
||||
tel.attrib['ODBstatus'] = bearbeitungsstatus.get (chr (data [254]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
|
||||
tel.attrib['ODBSchraubestatus'] = bearbeitungsstatus.get (chr (data [255]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
|
||||
#Bleche
|
||||
for i in range (4):
|
||||
tel.attrib['Filzstatus%02d' % (i + 1)] = bearbeitungsstatus.get (chr (data [252 + i]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
|
||||
tel.attrib['Filzstatus%02d' % (i + 1)] = bearbeitungsstatus.get (chr (data [256 + i]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
|
||||
#Bohgrung Chiron
|
||||
for i in range (8):
|
||||
tel.attrib['Bohrungstatus%02d' % (i + 1)] = bearbeitungsstatus.get (chr (data [256 + i]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
|
||||
tel.attrib['Bohrungstatus%02d' % (i + 1)] = bearbeitungsstatus.get (chr (data [260 + i]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
|
||||
|
||||
tel.attrib['bauteilstatus'] = bauteilstatus.get (chr (data [264]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
|
||||
tel.attrib['bauteilstatus'] = bauteilstatus.get (chr (data [268]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
|
||||
|
||||
#UserID
|
||||
try:
|
||||
tel.attrib['userid'] = (data [266] << 8) + data [267]
|
||||
tel.attrib['userid'] = (data [270] << 8) + data [271]
|
||||
except:
|
||||
print ("Debug-tmutter", data[266], data[267])
|
||||
print ("Debug-userid", data[270], data[271])
|
||||
|
||||
tel.attrib['ladungstraeger'] = ''
|
||||
return tel
|
||||
|
||||
506
bde.py
506
bde.py
@@ -15,6 +15,7 @@ from datetime import datetime
|
||||
import tel_decode
|
||||
from log import strlog
|
||||
from DB import DB
|
||||
from DB_MariaDB import DBMaria
|
||||
from itertools import chain
|
||||
from states import *
|
||||
|
||||
@@ -57,6 +58,8 @@ class BDEServer ():
|
||||
self.setdebug = args.get ("debug", 0)
|
||||
_db = args.get ("DB", None)
|
||||
self.connections['DB'] = DB (_db[0], _db[1], self.log, self.errlog)
|
||||
_dbmaria = args.get ("DBMaria", None)
|
||||
self.connections['DBMaria'] = DBMaria (_dbmaria[0], _dbmaria[1], _dbmaria[2], _dbmaria[3], self.log, self.errlog)
|
||||
|
||||
#Connectionditcs
|
||||
self.connections['TCP'] = {}
|
||||
@@ -171,6 +174,7 @@ class BDEServer ():
|
||||
|
||||
|
||||
DB_con = self.connections['DB']
|
||||
DBMaria_con = self.connections['DBMaria']
|
||||
|
||||
# Do counter checking if a valid telegram arrived
|
||||
count_old = self.connections[_channel][(client_id)][1][teltype]
|
||||
@@ -240,50 +244,102 @@ class BDEServer ():
|
||||
self.message (3, ' DT_handler : Requested Data from PD30 Handmontage Scanner %s for %s' % (ret_val['position'], ret_val['dmc']))
|
||||
#1st Check if Part in Table
|
||||
_partinfo = []
|
||||
if (ret_val['bauteil'] in ('G11', 'G32')):
|
||||
self.message (3, ' DT_handler : Found G11/G32 Data in BDE for %s' % ret_val['dmc'])
|
||||
if ret_val['bauteil'] in ('G11', 'G32', 'G14'):
|
||||
self.message (3, ' DT_handler : Check G11/G14/G32 Data in BDE for %s' % ret_val['dmc'])
|
||||
_partinfo = DB_con.getbde (ret_val['dmc'])
|
||||
elif ret_val['bauteil'] in ('RR'):
|
||||
self.message (3, ' DT_handler : Check RR Data in BDE for %s' % ret_val['dmc'])
|
||||
_partinfo = DBMaria_con.getbderr (ret_val['dmc'])
|
||||
|
||||
if ret_val['position'] == 'BC01':
|
||||
#Scanner BC01 Putzzelle
|
||||
#Teil anlegen und geputzt setzen
|
||||
if (ret_val['bauteil'] in ('G11', 'G32')):
|
||||
if ret_val['bauteil'] in ('G11', 'G32', 'G14'):
|
||||
if not len (_partinfo):
|
||||
self.message (3, ' DT_handler : Create G11/G32 Data from BC01 in BDE for %s' % ret_val['dmc'])
|
||||
self.message (3, ' DT_handler : Create G11/G14/G32 Data from BC01 in BDE for %s' % ret_val['dmc'])
|
||||
DB_con.addbde (ret_val, anlage = 'Hand')
|
||||
#Fix combine bauteil + variante
|
||||
DB_con.updatebde (ret_val['dmc'], 'variante', ret_val['bauteil'] + '-' + ret_val['variante'])
|
||||
else:
|
||||
self.message (3, ' DT_handler : G11/G32 Data from BC01 in BDE for %s already existing' % ret_val['dmc'])
|
||||
self.message (3, ' DT_handler : G11/G14/G32 Data from BC01 in BDE for %s already existing' % ret_val['dmc'])
|
||||
#conn.addbderr (data)
|
||||
#Fix combine bauteil + variante
|
||||
#DB_con.updatebde (ret_val['dmc'], 'variante', ret_val['bauteil'] + '-' + ret_val['variante'])
|
||||
#Fixme if _partinfo[0][7] == 'n.Durchlaufen':
|
||||
self.message (3, ' DT_handler : Bad state G11/G32 at BC04 for %s' % ret_val['dmc'])
|
||||
self.message (3, ' DT_handler : Bad state G11/G14/G32 at BC01 for %s' % ret_val['dmc'])
|
||||
_quit = 2
|
||||
|
||||
self.message (3, ' DT_handler : Add Putzzellendata for G11/G32 from BC01 in BDE for %s' % ret_val['dmc'])
|
||||
self.message (3, ' DT_handler : Add Putzzellendata for G11/G14/G32 from BC01 in BDE for %s' % ret_val['dmc'])
|
||||
_tmpdat = ret_val.attrib
|
||||
_tmpdat['bauteilstatus'] = 'i.O.'
|
||||
_tmpdat['endts'] = ret_val['startts']
|
||||
#FixMe
|
||||
DB_con.addputzzelle (_tmpdat)
|
||||
|
||||
elif ret_val['bauteil'] in ('RR'):
|
||||
if not len (_partinfo):
|
||||
self.message (3, ' DT_handler : Create RR Data from BC01 in BDE for %s' % ret_val['dmc'])
|
||||
DBMaria_con.addbderr (ret_val)
|
||||
#Bauteil + Variante kombinieren nicht notwendig passiert in BDERR
|
||||
DBMaria_con.updatebderr (ret_val['dmc'], 'variante', ret_val['bauteil'] + '-' + ret_val['variante'])
|
||||
else:
|
||||
self.message (3, ' DT_handler : RR Data from BC01 in BDE for %s already existing' % ret_val['dmc'])
|
||||
#conn.addbderr (data)
|
||||
self.message (3, ' DT_handler : Bad state RR at BC01 for %s' % ret_val['dmc'])
|
||||
_quit = 2
|
||||
|
||||
self.message (3, ' DT_handler : Add Putzzellendata for RR from BC01 in BDE for %s' % ret_val['dmc'])
|
||||
DBMaria_con.updatebderr (ret_val['dmc'], 'PutzzelleStatus', 'i.O.')
|
||||
|
||||
else:
|
||||
if len (_partinfo):
|
||||
if ret_val['position'] == 'BC02':
|
||||
#Scanner BC03 Vormontage RR
|
||||
if ret_val['bauteil'] in ('RR'):
|
||||
if [_partinfo[0][i] for i in (80,83,86,89,92,95,98,101)] == ['n.Bearbeitet'] * 8:
|
||||
self.message (3, ' DT_handler : BC02 RR set HUD and Holestates in BDE for %s' % ret_val['dmc'])
|
||||
DBMaria_con.updatebderr (ret_val['dmc'], 'variante', ret_val['bauteil'] + '-' + ret_val['variante'])
|
||||
st1hud = ['BNM8status01', 'BNM8status02', 'BNM8status03','BNM8status04','SKSM8status01', 'SKSM8status02', 'SKSM8status03', 'SKSM8status04']
|
||||
for part in st1hud:
|
||||
DBMaria_con.updatebderr (ret_val['dmc'], part, 'i.O.')
|
||||
DBMaria_con.updatebderr (ret_val['dmc'], 'variante', ret_val['bauteil'] + '-' + ret_val['variante'])
|
||||
else:
|
||||
self.message (3, ' DT_handler : Bad state RR at BC02 for %s' % ret_val['dmc'])
|
||||
_quit = 2
|
||||
else:
|
||||
self.message (3, ' DT_handler : No RR Part at BC02 for %s' % ret_val['dmc'])
|
||||
_quit = 2
|
||||
|
||||
elif ret_val['position'] == 'BC03':
|
||||
#Scanner BC02 Chiron
|
||||
if len (_partinfo):
|
||||
self.message (3, ' DT_handler : BC02 G11/G32 exists set HUD in BDE for %s' % ret_val['dmc'])
|
||||
if ret_val['bauteil'] in ('G11', 'G32', 'G14'):
|
||||
self.message (3, ' DT_handler : BC03 G11/14/G32 exists set HUD in BDE for %s' % ret_val['dmc'])
|
||||
_tmpdat = ret_val.attrib
|
||||
_tmpdat['chiron'] = 2 # i.O. state
|
||||
_tmpdat['endts'] = ret_val['startts']
|
||||
_tmpdat['bauteilstatus'] = 'i.O.'
|
||||
#FixMe set Error if not geputzt
|
||||
DB_con.addchiron (_tmpdat)
|
||||
else:
|
||||
_quit = 1
|
||||
elif ret_val['position'] == 'BC03':
|
||||
#Scanner BC03 Vormontage RR
|
||||
xx = 0
|
||||
|
||||
elif ret_val['bauteil'] in ('RR'):
|
||||
if "HUD" in _partinfo[0][3]:
|
||||
self.message (3, ' DT_handler : BC03 RR exists and is already HUD in BDE for %s' % ret_val['dmc'])
|
||||
_quit = 2
|
||||
else:
|
||||
if [_partinfo[0][i] for i in range (122, 130 )] == ['n.Bearbeitet'] * 8:
|
||||
self.message (3, ' DT_handler : BC03 RR exists set HUD in BDE for %s' % ret_val['dmc'])
|
||||
st2chiron = ['Bohrungstatus01', 'Bohrungstatus02', 'Bohrungstatus03', 'Bohrungstatus04', 'Bohrungstatus05', 'Bohrungstatus06', 'Bohrungstatus07', 'Bohrungstatus08']
|
||||
for part in st2chiron:
|
||||
DBMaria_con.updatebderr (ret_val['dmc'], part, 'i.O.')
|
||||
DBMaria_con.updatebderr (ret_val['dmc'], 'variante', ret_val['bauteil'] + '-' + ret_val['variante'])
|
||||
else:
|
||||
self.message (3, ' DT_handler : Bad state RR already operated at BC03 for %s' % ret_val['dmc'])
|
||||
_quit = 2
|
||||
|
||||
|
||||
elif ret_val['position'] == 'BC04':
|
||||
#Scanner BC04 WE
|
||||
if (ret_val['bauteil'] in ('G11', 'G32')):
|
||||
if ret_val['bauteil'] in ('G11', 'G32'):
|
||||
if _partinfo[0][7] == 'n.Durchlaufen':
|
||||
self.message (3, ' DT_handler : Bad state G11/G32 at BC04 for %s' % ret_val['dmc'])
|
||||
_quit = 2
|
||||
@@ -332,7 +388,11 @@ class BDEServer ():
|
||||
self.message (5, ' DT_handler : Send PD20 Data Tel queued:"')
|
||||
elif teltype == 'DM30':
|
||||
if ret_val['position'] in ('BC05', 'BC06', 'BC07'):
|
||||
self.generatepdg11 (count, _channel, client_id, teltype, ret_val ['src'], ret_val ['dst'], ret_val['dmc'], _quit)
|
||||
if ret_val['bauteil'] in ('G11', 'G32', 'G14'):
|
||||
self.generatepdg11 (count, _channel, client_id, teltype, ret_val ['src'], ret_val ['dst'], ret_val['dmc'], _quit)
|
||||
elif ret_val['bauteil'] in ('RR'):
|
||||
self.generatepdrr (count, _channel, client_id, teltype, ret_val ['src'], ret_val ['dst'], ret_val['dmc'], _quit)
|
||||
xx = 0
|
||||
else:
|
||||
self.generatequitfixed (count, _channel, client_id, teltype, ret_val ['src'], ret_val ['dst'], _quit)
|
||||
elif teltype == 'PD30':
|
||||
@@ -446,7 +506,7 @@ class BDEServer ():
|
||||
"""
|
||||
DB_con = self.connections['DB']
|
||||
|
||||
self. message (3, " generatepd : generate PD30 G11 Telegram for %s on channel %s, dmc %s" % (msgtype, channel, dmc))
|
||||
self. message (3, " generatepdg11 : generate PD30 G11 Telegram for %s on channel %s, dmc %s" % (msgtype, channel, dmc))
|
||||
#Fillword
|
||||
_data = bytes ([1]) + bytes ([1]) + bytes ([((count >> 8) & 0xFF)]) + bytes ([(count & 0xFF)])
|
||||
_dataheader = \
|
||||
@@ -471,15 +531,22 @@ class BDEServer ():
|
||||
elif 'G3' in variante:
|
||||
_typ = bytes ([2]) + bytes ([0])
|
||||
_t = 2
|
||||
elif 'G1' in variante:
|
||||
_typ = bytes ([2]) + bytes ([0])
|
||||
_t = 4
|
||||
|
||||
_rl = 0
|
||||
if 'RL' in variante:
|
||||
_rl = 1
|
||||
|
||||
_us = 0
|
||||
if 'US' in variante:
|
||||
_us = 4
|
||||
|
||||
if 'HUD' in variante:
|
||||
_var = bytes ([_rl + 2]) + bytes ([0])
|
||||
_var = bytes ([_rl +_us + 2]) + bytes ([0])
|
||||
else:
|
||||
_var = bytes ([_rl]) + bytes ([0])
|
||||
_var = bytes ([_rl + _us]) + bytes ([0])
|
||||
|
||||
_putz = bauteilstatusRev.get (putzzelle)
|
||||
|
||||
@@ -700,6 +767,10 @@ class BDEServer ():
|
||||
_LSKst02 = ' '
|
||||
_LSKst03 = ' '
|
||||
_LSKst04 = ' '
|
||||
_LSKst05 = ' '
|
||||
_LSKst06 = ' '
|
||||
_LSKst07 = ' '
|
||||
_LSKst08 = ' '
|
||||
_ODBst = ' '
|
||||
_ODBSst = ' '
|
||||
_Filzst01 = ' '
|
||||
@@ -752,6 +823,7 @@ class BDEServer ():
|
||||
_6KSM8st04.encode () + _space1.encode () + _6KSM8M04 + _6KSM8W04 +\
|
||||
_Blechst01.encode () + _Blechst02.encode () + _Blechst03.encode () + _Blechst04.encode () +\
|
||||
_LSKst01.encode () + _LSKst02.encode () + _LSKst03.encode () + _LSKst04.encode () +\
|
||||
_LSKst05.encode () + _LSKst06.encode () + _LSKst07.encode () + _LSKst04.encode () +\
|
||||
_ODBst.encode () + _ODBSst.encode () +\
|
||||
_Filzst01.encode () + _Filzst02.encode () + _Filzst03.encode () + _Filzst04.encode () +\
|
||||
_Bohrungst01.encode () + _Bohrungst02.encode () + _Bohrungst03.encode () + _Bohrungst04.encode () +\
|
||||
@@ -765,6 +837,395 @@ class BDEServer ():
|
||||
return
|
||||
|
||||
|
||||
def generatepdrr (self, count, channel, client_id, msgtype, src, dst, dmc, quit):
|
||||
"""
|
||||
Generate an PD30 telegram for RR qith quit code and queue it
|
||||
"""
|
||||
DBMaria_con = self.connections['DBMaria']
|
||||
|
||||
self. message (3, " generatepdrr : generate PD30 RR Telegram for %s on channel %s, dmc %s" % (msgtype, channel, dmc))
|
||||
#Fillword
|
||||
_data = bytes ([1]) + bytes ([1]) + bytes ([((count >> 8) & 0xFF)]) + bytes ([(count & 0xFF)])
|
||||
_dataheader = \
|
||||
doublechar (src) +\
|
||||
doublechar (dst) +\
|
||||
msgtype + + (4 - len(dmc)) * ' '
|
||||
_datastate = bytes ([0]) + bytes ([quit % 256])
|
||||
|
||||
_dmc = dmc + (28 - len(dmc)) * ' '
|
||||
_start = 14 * ' '
|
||||
#Bde Daten holen
|
||||
bde = DBMaria_con.getbderr (dmc)
|
||||
_typ = ' '.encode ()
|
||||
_var = ' '.encode ()
|
||||
_putz = ' '
|
||||
_NietM8st01 = ' '
|
||||
_NietM8st02 = ' '
|
||||
_DGBM8st01 = ' '
|
||||
_DGBM8st02 = ' '
|
||||
_DGBM8st03 = ' '
|
||||
_DGBM8st04 = ' '
|
||||
_NietM6st01 = ' '
|
||||
_NietM6st02 = ' '
|
||||
_NietM6st03 = ' '
|
||||
_NietM6st04 = ' '
|
||||
_NietM6st05 = ' '
|
||||
_DGBM8M01 = bytes ([0]) + bytes ([0])
|
||||
_DGBM8D01 = bytes ([0]) + bytes ([0])
|
||||
_DGBM8W01 = bytes ([0]) + bytes ([0])
|
||||
_DGBM8T01 = bytes ([0]) + bytes ([0])
|
||||
_DGBM8M02 = bytes ([0]) + bytes ([0])
|
||||
_DGBM8D02 = bytes ([0]) + bytes ([0])
|
||||
_DGBM8W02 = bytes ([0]) + bytes ([0])
|
||||
_DGBM8T02 = bytes ([0]) + bytes ([0])
|
||||
_DGBM8M03 = bytes ([0]) + bytes ([0])
|
||||
_DGBM8D03 = bytes ([0]) + bytes ([0])
|
||||
_DGBM8W03 = bytes ([0]) + bytes ([0])
|
||||
_DGBM8T03 = bytes ([0]) + bytes ([0])
|
||||
_DGBM8M04 = bytes ([0]) + bytes ([0])
|
||||
_DGBM8D04 = bytes ([0]) + bytes ([0])
|
||||
_DGBM8W04 = bytes ([0]) + bytes ([0])
|
||||
_DGBM8T04 = bytes ([0]) + bytes ([0])
|
||||
_NietM8F01 = bytes ([0]) + bytes ([0])
|
||||
_NietM8S01 = bytes ([0]) + bytes ([0])
|
||||
_NietM8F02 = bytes ([0]) + bytes ([0])
|
||||
_NietM8S02 = bytes ([0]) + bytes ([0])
|
||||
_NietM6F01 = bytes ([0]) + bytes ([0])
|
||||
_NietM6S01 = bytes ([0]) + bytes ([0])
|
||||
_NietM6F02 = bytes ([0]) + bytes ([0])
|
||||
_NietM6S02 = bytes ([0]) + bytes ([0])
|
||||
_NietM6F03 = bytes ([0]) + bytes ([0])
|
||||
_NietM6S03 = bytes ([0]) + bytes ([0])
|
||||
_NietM6F04 = bytes ([0]) + bytes ([0])
|
||||
_NietM6S04 = bytes ([0]) + bytes ([0])
|
||||
_NietM6F05 = bytes ([0]) + bytes ([0])
|
||||
_NietM6S05 = bytes ([0]) + bytes ([0])
|
||||
_ccs1 = ' '
|
||||
_ccs2 = ' '
|
||||
_ccs3 = ' '
|
||||
_ccs4 = ' '
|
||||
_ccs5 = ' '
|
||||
_ccs6 = ' '
|
||||
_ccs7 = ' '
|
||||
_ccs8 = ' '
|
||||
_ccs9 = ' '
|
||||
_ccs10 = ' '
|
||||
_ccs11 = ' '
|
||||
_ccs12 = ' '
|
||||
_ccs13 = ' '
|
||||
_ccs14 = ' '
|
||||
_ccs15 = ' '
|
||||
_ccs16 = ' '
|
||||
_ccs17 = ' '
|
||||
_ccs18 = ' '
|
||||
_ccs19 = ' '
|
||||
_ccs20 = ' '
|
||||
_ccs21 = ' '
|
||||
_ccs22 = ' '
|
||||
_ccs23 = ' '
|
||||
_ccs24 = ' '
|
||||
_ccs25 = ' '
|
||||
_ccs26 = ' '
|
||||
_ccs27 = ' '
|
||||
_ccs28 = ' '
|
||||
_ccs29 = ' '
|
||||
_bj1 = ' '
|
||||
_bj2 = ' '
|
||||
_bj3 = ' '
|
||||
_bj4 = ' '
|
||||
_ae = ' '
|
||||
_se = ' '
|
||||
_mb = ' '
|
||||
_bl = ' '
|
||||
_km = ' '
|
||||
_fniet = bytes ([0]) + bytes ([0])
|
||||
_sniet = bytes ([0]) + bytes ([0])
|
||||
_mmutter = bytes ([0]) + bytes ([0])
|
||||
_dmutter = bytes ([0]) + bytes ([0])
|
||||
_wmutter = bytes ([0]) + bytes ([0])
|
||||
_tmutter = bytes ([0]) + bytes ([0])
|
||||
_6KSM8st01 = ' '
|
||||
_6KSM8st02 = ' '
|
||||
_6KSM8st03 = ' '
|
||||
_6KSM8st04 = ' '
|
||||
_6KSM8M01 = bytes ([0]) + bytes ([0])
|
||||
_6KSM8M02 = bytes ([0]) + bytes ([0])
|
||||
_6KSM8M03 = bytes ([0]) + bytes ([0])
|
||||
_6KSM8M04 = bytes ([0]) + bytes ([0])
|
||||
_6KSM8W01 = bytes ([0]) + bytes ([0])
|
||||
_6KSM8W02 = bytes ([0]) + bytes ([0])
|
||||
_6KSM8W03 = bytes ([0]) + bytes ([0])
|
||||
_6KSM8W04 = bytes ([0]) + bytes ([0])
|
||||
_Blechst01 = ' '
|
||||
_Blechst02 = ' '
|
||||
_Blechst03 = ' '
|
||||
_Blechst04 = ' '
|
||||
_LSKst01 = ' '
|
||||
_LSKst02 = ' '
|
||||
_LSKst03 = ' '
|
||||
_LSKst04 = ' '
|
||||
_LSKst05 = ' '
|
||||
_LSKst06 = ' '
|
||||
_LSKst07 = ' '
|
||||
_LSKst08 = ' '
|
||||
_ODBst = ' '
|
||||
_ODBSst = ' '
|
||||
_Filzst01 = ' '
|
||||
_Filzst02 = ' '
|
||||
_Filzst03 = ' '
|
||||
_Filzst04 = ' '
|
||||
_Bohrungst01 = ' '
|
||||
_Bohrungst02 = ' '
|
||||
_Bohrungst03 = ' '
|
||||
_Bohrungst04 = ' '
|
||||
_Bohrungst05 = ' '
|
||||
_Bohrungst06 = ' '
|
||||
_Bohrungst07 = ' '
|
||||
_Bohrungst08 = ' '
|
||||
_BTStatus = ' '
|
||||
_UserID = bytes ([0]) + bytes ([0])
|
||||
|
||||
|
||||
if len (bde):
|
||||
dmc, startts, endts, variante, PutzzelleStatus,\
|
||||
NietM6status01, NietM6F01, NietM6S01, NietM6status02, NietM6F02, NietM6S02, \
|
||||
NietM6status03, NietM6F03, NietM6S03, NietM6status04, NietM6F04, NietM6S04, \
|
||||
NietM6status05, NietM6F05, NietM6S05, \
|
||||
DGBM8status01, DGBM8M01, DGBM8W01, DGBM8status02, DGBM8M02, DGBM8W02, \
|
||||
DGBM8status03, DGBM8M03, DGBM8W03, DGBM8status04, DGBM8M04, DGBM8W04, \
|
||||
NietM8status01, NietM8F01, NietM8S01, NietM8status02, NietM8F02, NietM8S02, \
|
||||
bajostatus01, bajostatus02, bajostatus03, bajostatus04, \
|
||||
clipstatus01, clipstatus02, clipstatus03, clipstatus04, clipstatus05, \
|
||||
clipstatus06, clipstatus07, clipstatus08, clipstatus09, clipstatus10, \
|
||||
clipstatus11, clipstatus12, clipstatus13, clipstatus14, clipstatus15, \
|
||||
clipstatus16, clipstatus17, clipstatus18, clipstatus19, clipstatus20, \
|
||||
clipstatus21, clipstatus22, clipstatus23, clipstatus24, clipstatus25, \
|
||||
clipstatus26, clipstatus27, clipstatus28, clipstatus29, \
|
||||
blindniet, fniet, sniet, \
|
||||
kombimutter, mmutter, wmutter, masseblech, ausgleichselement, schallisolierung, \
|
||||
BNM8status01, BNM8f01, BNM8s01, BNM8status02, BNM8f02, BNM8s02, \
|
||||
BNM8status03, BNM8f03, BNM8s03, BNM8status04, BNM8f04, BNM8s04, \
|
||||
SKSM8status01, SKSM8M01, SKSM8W01, SKSM8status02, SKSM8M02, SKSM8W02, \
|
||||
SKSM8status03, SKSM8M03, SKSM8W03, SKSM8status04, SKSM8M04, SKSM8W04, \
|
||||
Blechstatus01, Blechstatus02, Blechstatus03, Blechstatus04, \
|
||||
LKSC01, LKSC02, LKSC03, LKSC04, LKSC05, LKSC06, LKSC07, LKSC08, \
|
||||
ODBstatus, ODBSchraubestatus, Filzstatus01, Filzstatus02, Filzstatus03, Filzstatus04, \
|
||||
Bohrungstatus01, Bohrungstatus02, Bohrungstatus03, Bohrungstatus04, Bohrungstatus05, Bohrungstatus06, Bohrungstatus07, Bohrungstatus08, \
|
||||
userid = bde [0]
|
||||
_t = 0
|
||||
if 'G11' in variante:
|
||||
_typ = bytes ([1]) + bytes ([0])
|
||||
_t = 1
|
||||
elif 'G3' in variante:
|
||||
_typ = bytes ([2]) + bytes ([0])
|
||||
_t = 2
|
||||
elif 'G1' in variante:
|
||||
_typ = bytes ([4]) + bytes ([0])
|
||||
_t = 4
|
||||
elif 'RR' in variante:
|
||||
_typ = bytes ([8]) + bytes ([0])
|
||||
_t = 8
|
||||
|
||||
_rl = 0
|
||||
if 'RL' in variante:
|
||||
_rl = 1
|
||||
|
||||
_us = 0
|
||||
if 'US' in variante:
|
||||
_us = 4
|
||||
|
||||
_rr = 0
|
||||
if 'RR-11' in variante:
|
||||
_rr = 8
|
||||
elif 'RR-31' in variante:
|
||||
_rr = 16
|
||||
elif 'RR-21' in variante:
|
||||
_rr = 32
|
||||
|
||||
if 'HUD' in variante:
|
||||
_var = bytes ([_rl + _us + _rr + 2]) + bytes ([0])
|
||||
else:
|
||||
_var = bytes ([_rl + _us + _rr]) + bytes ([0])
|
||||
|
||||
_putz = bauteilstatusRev.get (PutzzelleStatus)
|
||||
_NietM8st01 = bearbeitungstatusRev.get (NietM8status01)
|
||||
_NietM8st02 = bearbeitungstatusRev.get (NietM8status02)
|
||||
_DGBM8st01 = bearbeitungstatusRev.get (DGBM8status01)
|
||||
_DGBM8st02 = bearbeitungstatusRev.get (DGBM8status02)
|
||||
_DGBM8st03 = bearbeitungstatusRev.get (DGBM8status03)
|
||||
_DGBM8st04 = bearbeitungstatusRev.get (DGBM8status04)
|
||||
_NietM6st01 = bearbeitungstatusRev.get (NietM6status01)
|
||||
_NietM6st02 = bearbeitungstatusRev.get (NietM6status02)
|
||||
_NietM6st03 = bearbeitungstatusRev.get (NietM6status03)
|
||||
_NietM6st04 = bearbeitungstatusRev.get (NietM6status04)
|
||||
_NietM6st05 = bearbeitungstatusRev.get (NietM6status05)
|
||||
_DGBM8M01 = bytes ([((DGBM8M01 >> 8) & 0xFF)]) + bytes ([(DGBM8M01 & 0xFF)])
|
||||
_DGBM8W01 = bytes ([((DGBM8W01 >> 8) & 0xFF)]) + bytes ([(DGBM8W01 & 0xFF)])
|
||||
_DGBM8M02 = bytes ([((DGBM8M02 >> 8) & 0xFF)]) + bytes ([(DGBM8M02 & 0xFF)])
|
||||
_DGBM8W02 = bytes ([((DGBM8W02 >> 8) & 0xFF)]) + bytes ([(DGBM8W02 & 0xFF)])
|
||||
_DGBM8M03 = bytes ([((DGBM8M03 >> 8) & 0xFF)]) + bytes ([(DGBM8M03 & 0xFF)])
|
||||
_DGBM8W03 = bytes ([((DGBM8W03 >> 8) & 0xFF)]) + bytes ([(DGBM8W03 & 0xFF)])
|
||||
_DGBM8M04 = bytes ([((DGBM8M04 >> 8) & 0xFF)]) + bytes ([(DGBM8M04 & 0xFF)])
|
||||
_DGBM8W04 = bytes ([((DGBM8W04 >> 8) & 0xFF)]) + bytes ([(DGBM8W04 & 0xFF)])
|
||||
_NietM8F01 = bytes ([((NietM8F01 >> 8) & 0xFF)]) + bytes ([(NietM8F01 & 0xFF)])
|
||||
_NietM8S01 = bytes ([((NietM8S01 >> 8) & 0xFF)]) + bytes ([(NietM8S01 & 0xFF)])
|
||||
_NietM8F02 = bytes ([((NietM8F02 >> 8) & 0xFF)]) + bytes ([(NietM8F02 & 0xFF)])
|
||||
_NietM8S02 = bytes ([((NietM8S02 >> 8) & 0xFF)]) + bytes ([(NietM8S02 & 0xFF)])
|
||||
_NietM6F01 = bytes ([((NietM6F01 >> 8) & 0xFF)]) + bytes ([(NietM6F01 & 0xFF)])
|
||||
_NietM6S01 = bytes ([((NietM6S01 >> 8) & 0xFF)]) + bytes ([(NietM6S01 & 0xFF)])
|
||||
_NietM6F02 = bytes ([((NietM6F02 >> 8) & 0xFF)]) + bytes ([(NietM6F02 & 0xFF)])
|
||||
_NietM6S02 = bytes ([((NietM6S02 >> 8) & 0xFF)]) + bytes ([(NietM6S02 & 0xFF)])
|
||||
_NietM6F03 = bytes ([((NietM6F03 >> 8) & 0xFF)]) + bytes ([(NietM6F03 & 0xFF)])
|
||||
_NietM6S03 = bytes ([((NietM6S03 >> 8) & 0xFF)]) + bytes ([(NietM6S03 & 0xFF)])
|
||||
_NietM6F04 = bytes ([((NietM6F04 >> 8) & 0xFF)]) + bytes ([(NietM6F04 & 0xFF)])
|
||||
_NietM6S04 = bytes ([((NietM6S04 >> 8) & 0xFF)]) + bytes ([(NietM6S04 & 0xFF)])
|
||||
_NietM6F05 = bytes ([((NietM6F05 >> 8) & 0xFF)]) + bytes ([(NietM6F05 & 0xFF)])
|
||||
_NietM6S05 = bytes ([((NietM6S05 >> 8) & 0xFF)]) + bytes ([(NietM6S05 & 0xFF)])
|
||||
_bj1 = bearbeitungstatusRev.get (bajostatus01)
|
||||
_bj2 = bearbeitungstatusRev.get (bajostatus02)
|
||||
_bj3 = bearbeitungstatusRev.get (bajostatus03)
|
||||
_bj4 = bearbeitungstatusRev.get (bajostatus04)
|
||||
_ccs1 = bearbeitungstatusRev.get (clipstatus01)
|
||||
_ccs2 = bearbeitungstatusRev.get (clipstatus02)
|
||||
_ccs3 = bearbeitungstatusRev.get (clipstatus03)
|
||||
_ccs4 = bearbeitungstatusRev.get (clipstatus04)
|
||||
_ccs5 = bearbeitungstatusRev.get (clipstatus05)
|
||||
_ccs6 = bearbeitungstatusRev.get (clipstatus06)
|
||||
_ccs7 = bearbeitungstatusRev.get (clipstatus07)
|
||||
_ccs8 = bearbeitungstatusRev.get (clipstatus08)
|
||||
_ccs9 = bearbeitungstatusRev.get (clipstatus09)
|
||||
_ccs10 = bearbeitungstatusRev.get (clipstatus10)
|
||||
_ccs11 = bearbeitungstatusRev.get (clipstatus11)
|
||||
_ccs12 = bearbeitungstatusRev.get (clipstatus12)
|
||||
_ccs13 = bearbeitungstatusRev.get (clipstatus13)
|
||||
_ccs14 = bearbeitungstatusRev.get (clipstatus14)
|
||||
_ccs15 = bearbeitungstatusRev.get (clipstatus15)
|
||||
_ccs16 = bearbeitungstatusRev.get (clipstatus16)
|
||||
_ccs17 = bearbeitungstatusRev.get (clipstatus17)
|
||||
_ccs18 = bearbeitungstatusRev.get (clipstatus18)
|
||||
_ccs19 = bearbeitungstatusRev.get (clipstatus19)
|
||||
_ccs20 = bearbeitungstatusRev.get (clipstatus20)
|
||||
_ccs21 = bearbeitungstatusRev.get (clipstatus21)
|
||||
_ccs22 = bearbeitungstatusRev.get (clipstatus22)
|
||||
_ccs23 = bearbeitungstatusRev.get (clipstatus23)
|
||||
_ccs24 = bearbeitungstatusRev.get (clipstatus24)
|
||||
_ccs25 = bearbeitungstatusRev.get (clipstatus25)
|
||||
_ccs26 = bearbeitungstatusRev.get (clipstatus26)
|
||||
_ccs27 = bearbeitungstatusRev.get (clipstatus27)
|
||||
_ccs28 = bearbeitungstatusRev.get (clipstatus28)
|
||||
_ccs29 = bearbeitungstatusRev.get (clipstatus29)
|
||||
_ae = bearbeitungstatusRev.get (ausgleichselement)
|
||||
_se = bearbeitungstatusRev.get (schallisolierung)
|
||||
_mb = bearbeitungstatusRev.get (masseblech)
|
||||
_bl = bearbeitungstatusRev.get (blindniet)
|
||||
_km = bearbeitungstatusRev.get (kombimutter)
|
||||
_fniet = bytes ([((fniet >> 8) & 0xFF)]) + bytes ([(fniet & 0xFF)])
|
||||
_sniet = bytes ([((sniet >> 8) & 0xFF)]) + bytes ([(sniet & 0xFF)])
|
||||
_mmutter = bytes ([((mmutter >> 8) & 0xFF)]) + bytes ([(mmutter & 0xFF)])
|
||||
_wmutter = bytes ([((wmutter >> 8) & 0xFF)]) + bytes ([(wmutter & 0xFF)])
|
||||
_BNMM8st01 = bearbeitungstatusRev.get (BNM8status01)
|
||||
_BNMM8st02 = bearbeitungstatusRev.get (BNM8status02)
|
||||
_BNMM8st03 = bearbeitungstatusRev.get (BNM8status03)
|
||||
_BNMM8st04 = bearbeitungstatusRev.get (BNM8status04)
|
||||
_BNMM8F01 = bytes ([((BNM8f01 >> 8) & 0xFF)]) + bytes ([(BNM8f01 & 0xFF)])
|
||||
_BNMM8F02 = bytes ([((BNM8f02 >> 8) & 0xFF)]) + bytes ([(BNM8f02 & 0xFF)])
|
||||
_BNMM8F03 = bytes ([((BNM8f03 >> 8) & 0xFF)]) + bytes ([(BNM8f03 & 0xFF)])
|
||||
_BNMM8F04 = bytes ([((BNM8f04 >> 8) & 0xFF)]) + bytes ([(BNM8f04 & 0xFF)])
|
||||
_BNMM8S01 = bytes ([((BNM8s01 >> 8) & 0xFF)]) + bytes ([(BNM8s01 & 0xFF)])
|
||||
_BNMM8S02 = bytes ([((BNM8s02 >> 8) & 0xFF)]) + bytes ([(BNM8s02 & 0xFF)])
|
||||
_BNMM8S03 = bytes ([((BNM8s03 >> 8) & 0xFF)]) + bytes ([(BNM8s03 & 0xFF)])
|
||||
_BNMM8S04 = bytes ([((BNM8s04 >> 8) & 0xFF)]) + bytes ([(BNM8s04 & 0xFF)])
|
||||
_6KSM8st01 = bearbeitungstatusRev.get (SKSM8status01)
|
||||
_6KSM8st02 = bearbeitungstatusRev.get (SKSM8status02)
|
||||
_6KSM8st03 = bearbeitungstatusRev.get (SKSM8status03)
|
||||
_6KSM8st04 = bearbeitungstatusRev.get (SKSM8status04)
|
||||
_6KSM8M01 = bytes ([((SKSM8M01 >> 8) & 0xFF)]) + bytes ([(SKSM8M01 & 0xFF)])
|
||||
_6KSM8M02 = bytes ([((SKSM8M02 >> 8) & 0xFF)]) + bytes ([(SKSM8M02 & 0xFF)])
|
||||
_6KSM8M03 = bytes ([((SKSM8M03 >> 8) & 0xFF)]) + bytes ([(SKSM8M03 & 0xFF)])
|
||||
_6KSM8M04 = bytes ([((SKSM8M04 >> 8) & 0xFF)]) + bytes ([(SKSM8M04 & 0xFF)])
|
||||
_6KSM8W01 = bytes ([((SKSM8W01 >> 8) & 0xFF)]) + bytes ([(SKSM8W01 & 0xFF)])
|
||||
_6KSM8W02 = bytes ([((SKSM8W02 >> 8) & 0xFF)]) + bytes ([(SKSM8W02 & 0xFF)])
|
||||
_6KSM8W03 = bytes ([((SKSM8W03 >> 8) & 0xFF)]) + bytes ([(SKSM8W03 & 0xFF)])
|
||||
_6KSM8W04 = bytes ([((SKSM8W04 >> 8) & 0xFF)]) + bytes ([(SKSM8W04 & 0xFF)])
|
||||
_Blechst01 = bearbeitungstatusRev.get (Blechstatus01)
|
||||
_Blechst02 = bearbeitungstatusRev.get (Blechstatus02)
|
||||
_Blechst03 = bearbeitungstatusRev.get (Blechstatus03)
|
||||
_Blechst04 = bearbeitungstatusRev.get (Blechstatus04)
|
||||
_LSKst01 = bearbeitungstatusRev.get (LKSC01)
|
||||
_LSKst02 = bearbeitungstatusRev.get (LKSC02)
|
||||
_LSKst03 = bearbeitungstatusRev.get (LKSC03)
|
||||
_LSKst04 = bearbeitungstatusRev.get (LKSC04)
|
||||
_LSKst05 = bearbeitungstatusRev.get (LKSC05)
|
||||
_LSKst06 = bearbeitungstatusRev.get (LKSC06)
|
||||
_LSKst07 = bearbeitungstatusRev.get (LKSC07)
|
||||
_LSKst08 = bearbeitungstatusRev.get (LKSC08)
|
||||
_ODBst = bearbeitungstatusRev.get (ODBstatus)
|
||||
_ODBSst = bearbeitungstatusRev.get (ODBSchraubestatus)
|
||||
_Filzst01 = bearbeitungstatusRev.get (Filzstatus01)
|
||||
_Filzst02 = bearbeitungstatusRev.get (Filzstatus02)
|
||||
_Filzst03 = bearbeitungstatusRev.get (Filzstatus03)
|
||||
_Filzst04 = bearbeitungstatusRev.get (Filzstatus04)
|
||||
_Bohrungst01 = bearbeitungstatusRev.get (Bohrungstatus01)
|
||||
_Bohrungst02 = bearbeitungstatusRev.get (Bohrungstatus02)
|
||||
_Bohrungst03 = bearbeitungstatusRev.get (Bohrungstatus03)
|
||||
_Bohrungst04 = bearbeitungstatusRev.get (Bohrungstatus04)
|
||||
_Bohrungst05 = bearbeitungstatusRev.get (Bohrungstatus05)
|
||||
_Bohrungst06 = bearbeitungstatusRev.get (Bohrungstatus06)
|
||||
_Bohrungst07 = bearbeitungstatusRev.get (Bohrungstatus07)
|
||||
_Bohrungst08 = bearbeitungstatusRev.get (Bohrungstatus08)
|
||||
_UserID = bytes ([((userid >> 8) & 0xFF)]) + bytes ([(userid & 0xFF)])
|
||||
|
||||
_space1 = ' '
|
||||
|
||||
_data += _dataheader.encode () + _datastate +\
|
||||
_dmc.encode () + _start.encode () + _typ + _var + _putz.encode () + _space1.encode () +\
|
||||
_NietM6st01.encode () + _space1.encode () + _NietM6F01 + _NietM6S01 +\
|
||||
_NietM6st02.encode () + _space1.encode () + _NietM6F02 + _NietM6S02 +\
|
||||
_NietM6st03.encode () + _space1.encode () + _NietM6F03 + _NietM6S03 +\
|
||||
_NietM6st04.encode () + _space1.encode () + _NietM6F04 + _NietM6S04 +\
|
||||
_NietM6st05.encode () + _space1.encode () + _NietM6F05 + _NietM6S05 +\
|
||||
_DGBM8st01.encode () + _space1.encode () + _DGBM8M01 + _DGBM8W01 + _DGBM8D01 + _DGBM8T01 +\
|
||||
_DGBM8st02.encode () + _space1.encode () + _DGBM8M02 + _DGBM8W02 + _DGBM8D02 + _DGBM8T02 +\
|
||||
_DGBM8st03.encode () + _space1.encode () + _DGBM8M03 + _DGBM8W03 + _DGBM8D03 + _DGBM8T03 +\
|
||||
_DGBM8st04.encode () + _space1.encode () + _DGBM8M04 + _DGBM8W04 + _DGBM8D04 + _DGBM8T04 +\
|
||||
_NietM8st01.encode () + _space1.encode () + _NietM8F01 + _NietM8S01 +\
|
||||
_NietM8st02.encode () + _space1.encode () + _NietM8F02 + _NietM8S02 +\
|
||||
_bj1.encode () + _bj2.encode () + _bj3.encode () + _bj4.encode () +\
|
||||
_ccs1.encode () + _ccs2.encode () + _ccs3.encode () + _ccs4.encode () + _ccs5.encode () +\
|
||||
_ccs6.encode () + _ccs7.encode () + _ccs8.encode () + _ccs9.encode () + _ccs10.encode () +\
|
||||
_ccs11.encode () + _ccs12.encode () + _ccs13.encode () + _ccs14.encode () + _ccs15.encode () +\
|
||||
_ccs16.encode () + _ccs17.encode () + _ccs18.encode () + _ccs19.encode () + _ccs20.encode () +\
|
||||
_ccs21.encode () + _ccs22.encode () + _ccs23.encode () + _ccs24.encode () + _ccs25.encode () +\
|
||||
_ccs26.encode () + _ccs27.encode () + _ccs28.encode () + _ccs29.encode () + _space1.encode () +\
|
||||
_bl.encode () + _space1.encode () + _fniet + _sniet +\
|
||||
_km.encode () + _space1.encode () + _mmutter + _wmutter + _dmutter + _tmutter +\
|
||||
_mb.encode () + _ae.encode () + _se.encode () + _space1.encode () +\
|
||||
_BNMM8st01.encode () + _space1.encode () + _BNMM8F01 + _BNMM8S01 +\
|
||||
_BNMM8st02.encode () + _space1.encode () + _BNMM8F02 + _BNMM8S02 +\
|
||||
_BNMM8st03.encode () + _space1.encode () + _BNMM8F03 + _BNMM8S03 +\
|
||||
_BNMM8st04.encode () + _space1.encode () + _BNMM8F04 + _BNMM8S04 +\
|
||||
_6KSM8st01.encode () + _space1.encode () + _6KSM8M01 + _6KSM8W01 +\
|
||||
_6KSM8st02.encode () + _space1.encode () + _6KSM8M02 + _6KSM8W02 +\
|
||||
_6KSM8st03.encode () + _space1.encode () + _6KSM8M03 + _6KSM8W03 +\
|
||||
_6KSM8st04.encode () + _space1.encode () + _6KSM8M04 + _6KSM8W04 +\
|
||||
_Blechst01.encode () + _Blechst02.encode () + _Blechst03.encode () + _Blechst04.encode () +\
|
||||
_LSKst01.encode () + _LSKst02.encode () + _LSKst03.encode () + _LSKst04.encode () +\
|
||||
_LSKst05.encode () + _LSKst06.encode () + _LSKst07.encode () + _LSKst04.encode () +\
|
||||
_ODBst.encode () + _ODBSst.encode () +\
|
||||
_Filzst01.encode () + _Filzst02.encode () + _Filzst03.encode () + _Filzst04.encode () +\
|
||||
_Bohrungst01.encode () + _Bohrungst02.encode () + _Bohrungst03.encode () + _Bohrungst04.encode () +\
|
||||
_Bohrungst05.encode () + _Bohrungst06.encode () + _Bohrungst07.encode () + _Bohrungst08.encode () +\
|
||||
_BTStatus.encode () + _space1.encode () + \
|
||||
_UserID
|
||||
|
||||
#print (_data[1:30])
|
||||
|
||||
self.queue_add (channel, client_id, msgtype, _data)
|
||||
return
|
||||
|
||||
|
||||
|
||||
|
||||
def generatepd (self, count, channel, client_id, msgtype, src, dst, dmc):
|
||||
"""
|
||||
Generate an QUIT telegram and send it
|
||||
@@ -1298,9 +1759,12 @@ if __name__ == '__main__':
|
||||
debuglevel = 0
|
||||
print ('debuglevel :%d' %debuglevel)
|
||||
|
||||
|
||||
MDB = 'bde'
|
||||
MDBUSR = 'bde'
|
||||
MDBPASS = 'eczema-orleans-queuing-surplus'
|
||||
MDBTALOG = '/tmp/talogRR.sql'
|
||||
|
||||
server = BDEServer (address = IP_BDE, verbose = loglevel, debug = debuglevel, DB = (DBFILE, DBTALOG) )
|
||||
server = BDEServer (address = IP_BDE, verbose = loglevel, debug = debuglevel, DB = (DBFILE, DBTALOG), DBMaria = (MDB, MDBUSR, MDBPASS, MDBTALOG) )
|
||||
for i in chain (range (1, 11), range (20, 21), range (30, 31), range (98,100)):
|
||||
IPPLC = config.get ('PD%02d' % i , 'ipsps')
|
||||
if not IPPLC:
|
||||
|
||||
22
parts.py
22
parts.py
@@ -1,9 +1,27 @@
|
||||
bauteil = {1 : 'G11',
|
||||
2 : 'G32'}
|
||||
2 : 'G32',
|
||||
4 : 'G14',
|
||||
8 : 'RR'}
|
||||
variante = {0 : 'LL-BASIS',
|
||||
1 : 'RL-BASIS',
|
||||
2 : 'LL-HUD',
|
||||
3 : 'RL-HUD'}
|
||||
3 : 'RL-HUD',
|
||||
4 : 'LL-BASIS-US',
|
||||
5 : 'RL-BASIS-US',
|
||||
6 : 'LL-HUD-US',
|
||||
7 : 'RL-HUD-US',
|
||||
8 : '11-LL',
|
||||
9 : '11-RL',
|
||||
10: '11-LL-HUD',
|
||||
11: '11-RL-HUD',
|
||||
16: '31-LL',
|
||||
17: '31-RL',
|
||||
18: '31-LL-HUD',
|
||||
19: '31-RL-HUD',
|
||||
32: '21-LL',
|
||||
33: '21-RL',
|
||||
34: '21-LL-HUD',
|
||||
35: '21-RL-HUD'}
|
||||
artikelnummer = {'G11-LL-BASIS' : '9297644',
|
||||
'G11-RL-BASIS' : '9297645',
|
||||
'G11-LL-HUD' : '9297646',
|
||||
|
||||
Reference in New Issue
Block a user