michi/BDE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor Fixes

Browse Source
This commit is contained in:
Michael Rest
2017-10-05 23:11:00 +02:00
parent 3b38fd26a1
commit 3389adfbe4
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
DB.py
View File

@@ -787,6 +787,7 @@ class DB:
_gesio = 0
_bndata ['bauteilstatus'] = _bnstatus
self.addblindniet (_bndata, store = 0)
self.updatebde (data['dmc'], 'blindniet', _bntatus)
elif _states ['blindniet'] in ['i.O.', 'i.O. NA']:
self.log (5, 'PD30 Blindniet %s already i.O. do nothing' % data['dmc'])
else:
@@ -849,7 +850,7 @@ class DB:
self.log (5, 'PD30 Bajonett %s nDurchlaufen create Bajonettdata' % ['dmc'])
bjkeys = ['dmc', 'startts', 'endts', 'ladungstraeger', 'bajostatus01', 'bajostatus02', 'bajostatus03', 'bajostatus04']
_bjdata = {}
_bjtatus = 'i.O. NA'
_bjstatus = 'i.O. NA'
for k in bjkeys:
_bjdata [k] = data [k]
if 'status' in k and data [k] not in ['i.O.', 'i.O. NA']:
@@ -859,6 +860,7 @@ class DB:
_bjdata ['aufnahme'] = '0'
_bjdata ['bauteilstatus'] = _bjstatus
self.addbajonettclip (_bjdata, store = 0)
self.updatebde (data['dmc'], 'bajonettclip', _bjstatus)
elif _states ['bajonettclip'] in ['i.O.', 'i.O. NA']:
self.log (5, 'PD30 Bajonett %s i.O. do nothing' % data['dmc'])
else:
@@ -901,6 +903,7 @@ class DB:
_gesio = 0
_ccdata ['aufnahme'] = '0'
_ccdata ['bauteilstatus'] = _ccstatus
self.updatebde (data['dmc'], 'cclip', _ccstatus)
self.addcclip (_ccdata, store = 0)
elif _states ['cclip'] in ['i.O.', 'i.O. NA']:
self.log (5, 'PD30 CClip %s i.O. do nothing' % ['dmc'])
@@ -944,17 +947,18 @@ class DB:
_mbdata ['aufnahme'] = '0'
_mbdata ['bauteilstatus'] = _mbstatus
self.addmasseblech (_mbdata, store = 0)
self.updatebde (data['dmc'], 'masseblech', _mbstatus)
elif _states ['masseblech'] in ['i.O.', 'i.O. NA']:
self.log (5, 'PD30 Masseblech %s i.O. do nothing' % data['dmc'])
else:
io = 1
if data['kombimutter'] == 'i.O. NA':
self.log (5, 'PD30 Kombimutter reworked updating part data M:%d D:%d W:%d' % (int (data['mmutter']), int (data['dmutter']), int (data['wmutter'])))
self.updateinformation (data['dmc'], 'masseblech', 'kombimutter', data['kombimutter'])
self.updateinformation (data['dmc'], 'masseblech', 'mmutter', data['mmutter'])
self.updateinformation (data['dmc'], 'masseblech', 'dmutter', data['dmutter'])
self.updateinformation (data['dmc'], 'masseblech', 'wmutter', data['wmutter'])
self.updateinformation (data['dmc'], 'masseblech', 'tmutter', data['tmutter'])
self.updateinformationfixed (data['dmc'], 'masseblech', 'kombimutter', data['kombimutter'])
self.updateinformationfixed (data['dmc'], 'masseblech', 'mmutter', data['mmutter'])
self.updateinformationfixed (data['dmc'], 'masseblech', 'dmutter', data['dmutter'])
self.updateinformationfixed (data['dmc'], 'masseblech', 'wmutter', data['wmutter'])
self.updateinformationfixed (data['dmc'], 'masseblech', 'tmutter', data['tmutter'])
elif data['kombimutter'] == 'n.i.O.':
self.log (5, 'PD30 Kombimutter still n.i.O.')
io = 0
@@ -964,9 +968,9 @@ class DB:
if data['blindniet'] == 'i.O. NA':
self.log (5, 'PD30 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'])
self.updateinformationfixed (data['dmc'], 'masseblech', 'blindniet', data['blindniet'])
self.updateinformationfixed (data['dmc'], 'masseblech', 'fniet', data['fniet'])
self.updateinformationfixed (data['dmc'], 'masseblech', 'sniet', data['sniet'])
elif data['blindniet'] == 'n.i.O.':
self.log (5, 'PD30 Blindniet still n.i.O.')
io = 0
@@ -976,7 +980,7 @@ class DB:
if data['masseblech'] == 'i.O. NA':
self.log (5, 'PD30 Masseblech reworked updating part data')
self.updateinformation (data['dmc'], 'masseblech', 'masseblech', data['masseblech'])
self.updateinformationfixed (data['dmc'], 'masseblech', 'masseblech', data['masseblech'])
elif data['masseblech'] == 'n.i.O.':
self.log (5, 'PD30 Masseblech still n.i.O.')
io = 0
@@ -986,7 +990,7 @@ class DB:
if data['ausgleichselement'] == 'i.O. NA':
self.log (5, 'PD30 Ausgleichselement reworked updating part data')
self.updateinformation (data['dmc'], 'masseblech', 'ausgleichselement', data['ausgleichselement'])
self.updateinformationfixed (data['dmc'], 'masseblech', 'ausgleichselement', data['ausgleichselement'])
elif data['ausgleichselement'] == 'n.i.O.':
self.log (5, 'PD30 Ausgleichselement still n.i.O.')
io = 0
@@ -996,7 +1000,7 @@ class DB:
if data['schallisolierung'] == 'i.O. NA':
self.log (5, 'PD30 Schallisolierung reworked updating part data')
self.updateinformation (data['dmc'], 'masseblech', 'schallisolierung', data['schallisolierung'])
self.updateinformationfixed (data['dmc'], 'masseblech', 'schallisolierung', data['schallisolierung'])
elif data['schallisolierung'] == 'n.i.O.':
self.log (5, 'PD30 Schallisolierung still n.i.O.')
io = 0