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

Fixed some things in Handwork

Browse Source
This commit is contained in:
Michael Rest
2017-10-05 22:42:57 +02:00
parent 63aa3fbd5d
commit 3b38fd26a1
3 changed files with 76 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
DB.py
View File

@@ -271,7 +271,7 @@ class DB:
Get Processdata 05 - blindniet
"""
try:
cursor = self.executesql ("SELECT dmc, startts, endts, DGBM8status01, DGBM8status02, DGBM8status03, DGBM8status04, NietM8status01, NietM8status02, NietM6status01, NietM6status02, NietM6status03, NietM6status04, NietM6status05, DGBM8M01, DGBM8D01, DGBM8W01, DGBM8T01, DGBM8M02, DGBM8D01, DGBM8W02, DGBM8T02, DGBM8M03, DGBM8D03, DGBM8W03, DGBM8T03, DGBM8M04, DGBM8D04, DGBM8W04, DGBM8T04, NietM8F01, NietM8S01, NietM8F02, NietM8S02, NietM6F01, NietM6S01, NietM6F02, NietM6S02, NietM6F03, NietM6S03, NietM6F04, NietM6S04, NietM6F05, NietM6S05 FROM blindniet WHERE dmc = '%s';" % dmc)
cursor = self.executesql ("SELECT 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 FROM blindniet WHERE dmc = '%s';" % dmc)
except:
print ("Couldnt get PD05 blindniet")
raise Warning
@@ -279,6 +279,22 @@ class DB:
return cursor.fetchall ()
def getblindnietdict (self, dmc):
"""
Get Processdata 06 - cclip as dict
"""
ret_val = {}
keys = ['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']
d = self.getblindniet (dmc)
if len (d):
for i in range (len (d [0])):
ret_val [keys [i]] = d [0][i]
return ret_val
def addputzzelle (self, data):
"""
Add Processdata 02/03 - putzzelle
@@ -348,7 +364,7 @@ class DB:
return cursor.fetchall ()
def addbajonettclip (self, data):
def addbajonettclip (self, data, store = 1):
"""
Add Processdata 06 - bajonettclip
and update BDE data
@@ -361,8 +377,9 @@ class DB:
except:
print ("Couldnt insert PD06 bajonettclip")
raise Warning
self.updatebde (data['dmc'], 'bajonettclip', data['bauteilstatus'])
if store:
self.updatebde (data['dmc'], 'bajonettclip', data['bauteilstatus'])
self.updatebde (data['dmc'], 'ladungstraeger', data['ladungstraeger'])
if data['bauteilstatus'] == 'n.i.O.':
self.updatebde (data['dmc'], 'gesamtstatus', 'n.i.O.')
@@ -379,7 +396,20 @@ class DB:
raise Warning
return cursor.fetchall ()
def getbajonettclipdict (self, dmc):
"""
Get Processdata 06 - bajonett as dict
"""
ret_val = {}
keys = ['dmc', 'startts', 'endts', 'aufnahme', 'bajostatus01', 'bajostatus02', 'bajostatus03', 'bajostatus04']
d = self.getbajonettclip (dmc)
if len (d):
for i in range (len (d [0])):
ret_val [keys [i]] = d [0][i]
return ret_val
def deletebajonettclip (self, dmc):
"""
@@ -392,7 +422,7 @@ class DB:
raise Warning
def addcclip (self, data):
def addcclip (self, data, store = 1):
"""
Add Processdata 07 - cclip
and update BDE data
@@ -406,7 +436,8 @@ class DB:
print ("Couldnt insert PD07 cclip")
raise Warning
self.updatebde (data['dmc'], 'cclip', data['bauteilstatus'])
if store:
self.updatebde (data['dmc'], 'cclip', data['bauteilstatus'])
self.updatebde (data['dmc'], 'ladungstraeger', data['ladungstraeger'])
if data['bauteilstatus'] == 'n.i.O.':
self.updatebde (data['dmc'], 'gesamtstatus', 'n.i.O.')
@@ -424,6 +455,7 @@ class DB:
return cursor.fetchall ()
def getcclipdict (self, dmc):
"""
Get Processdata 07 - cclip as dict
@@ -438,6 +470,7 @@ class DB:
ret_val [keys [i]] = d [0][i]
return ret_val
def deletecclip (self, dmc):
"""
Delete CClip info
@@ -449,7 +482,7 @@ class DB:
raise Warning
def addmasseblech (self, data):
def addmasseblech (self, data, store = 1):
"""
Add Processdata 08 - masseblech
and update BDE data
@@ -463,7 +496,8 @@ class DB:
print ("Couldnt insert PD08")
raise Warning
self.updatebde (data['dmc'], 'masseblech', data['bauteilstatus'])
if store:
self.updatebde (data['dmc'], 'masseblech', data['bauteilstatus'])
self.updatebde (data['dmc'], 'ladungstraeger', data['ladungstraeger'])
if data['bauteilstatus'] == 'n.i.O.':
self.updatebde (data['dmc'], 'gesamtstatus', 'n.i.O.')
@@ -758,8 +792,11 @@ class DB:
else:
self.log (5, 'PD30 check Blindniet values ')
io = 1
dbdata = self.getblindnietdict (data['dmc'])
for i in range (1, 5):
if data['DGBM8status%02d' % i] == 'i.O. NA':
if data['DGBM8status%02d' % i] == dbdata['DGBM8status%02d' % i]:
self.log (5, 'PD30 DGBM8status%02d nothing changed in DB (old %s)' % (i, dbdata['DGBM8status%02d' % i]))
elif data['DGBM8status%02d' % i] == 'i.O. NA':
self.log (5, 'PD30 DGBM8_%02d reworked updating part data M:%d D:%d W:%d' % (i, data['DGBM8M%02d' % i], data['DGBM8D%02d' % i], data['DGBM8W%02d' % i] ))
self.updateinformationfixed (data['dmc'], 'blindniet', 'DGBM8status%02d' % i, data['DGBM8status%02d' % i])
self.updateinformationfixed (data['dmc'], 'blindniet', 'DGBM8M%02d' % i, data['DGBM8M%02d' % i])
@@ -773,7 +810,9 @@ class DB:
self.log (5, 'PD30 DGBM8_%02d still n.Bearbeitet ' % (i))
io = 0
for i in range (1, 3):
if data['NietM8status%02d' % i] == 'i.O. NA':
if data['NietM8status%02d' % i] == dbdata['NietM8status%02d' % i]:
self.log (5, 'PD30 NietM8status%02d nothing changed in DB (old %s)' % (i, dbdata['NietM8status%02d' % i]))
elif data['NietM8status%02d' % i] == 'i.O. NA':
self.log (5, 'PD30 NietM8_%02d reworked updating part data F:%d S:%d' % (i, data['NietM8F%02d' % i], data['NietM8S%02d' % i]))
self.updateinformationfixed (data['dmc'], 'blindniet', 'NietM8status%02d' % i, data['NietM8status%02d' % i])
self.updateinformationfixed (data['dmc'], 'blindniet', 'NietM8F%02d' % i, data['NietM8F%02d' % i])
@@ -785,7 +824,9 @@ class DB:
self.log (5, 'PD30 NietM8_%02d still n.Bearbeitet' % (i))
io = 0
for i in range (1, 6):
if data['NietM6status%02d' % i] == 'i.O. NA':
if data['NietM6status%02d' % i] == dbdata['NietM6status%02d' % i]:
self.log (5, 'PD30 NietM6status%02d nothing changed in DB (old %s)' % (i, dbdata['NietM6status%02d' % i]))
elif data['NietM6status%02d' % i] == 'i.O. NA':
self.log (5, 'PD30 NietM6_%02d reworked updating part data F:%d S:%d' % (i, data['NietM6F%02d' % i], data['NietM6S%02d' % i]))
self.updateinformationfixed (data['dmc'], 'blindniet', 'NietM6status%02d' % i, data['NietM6status%02d' % i])
self.updateinformationfixed (data['dmc'], 'blindniet', 'NietM6F%02d' % i, data['NietM6F%02d' % i])
@@ -817,15 +858,21 @@ class DB:
_gesio = 0
_bjdata ['aufnahme'] = '0'
_bjdata ['bauteilstatus'] = _bjstatus
self.addbajonettclip (_bjdata)
elif _states ['bajonettclip'] == 'i.O.':
self.addbajonettclip (_bjdata, store = 0)
elif _states ['bajonettclip'] in ['i.O.', 'i.O. NA']:
self.log (5, 'PD30 Bajonett %s i.O. do nothing' % data['dmc'])
else:
io = 1
dbdata = self.getbajonettclipdict (data['dmc'])
for i in range (1, 5):
if data['bajostatus%02d' % i] == 'i.O. NA':
if data['bajostatus%02d' % i] == dbdata['bajostatus%02d' % i]:
self.log (5, 'PD30 bajonett%02d nothing changed in DB (old %s)' % (i, dbdata['bajostatus%02d' % i]))
elif data['bajostatus%02d' % i] == 'i.O. NA':
self.log (5, 'PD30 bajonett%02d reworked updating part data' % (i))
self.updateinformationfixed (data['dmc'], 'bajonettclip', 'bajostatus%02d' % i, data['bajostatus%02d' % i])
elif (data['bajostatus%02d' % i] == 'i.O.') and (dbdata['bajostatus%02d' % i] not in ['i.O.', 'i.O. NA']):
self.log (5, 'PD30 bajonett%02d was not i.O updating part data' % (i))
self.updateinformationfixed (data['dmc'], 'bajonettclip', 'bajostatus%02d' % i, data['bajostatus%02d' % i])
elif data['bajostatus%02d' % i] == 'n.i.O.':
self.log (5, 'PD30 bajonett%02d still n.i.O.' % (i))
io = 0
@@ -854,13 +901,13 @@ class DB:
_gesio = 0
_ccdata ['aufnahme'] = '0'
_ccdata ['bauteilstatus'] = _ccstatus
self.addcclip (_ccdata)
elif _states ['cclip'] == 'i.O.':
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'])
else:
io = 1
dbdata = self.getcclipdict (data['dmc'])
for i in range (1, 18):
for i in range (1, 19):
if data['clipstatus%02d' % i] == dbdata['clipstatus%02d' % i]:
self.log (5, 'PD30 CClip%02d nothing changed in DB (old %s)' % (i, dbdata['clipstatus%02d' % i]))
elif data['clipstatus%02d' % i] == 'i.O. NA':
@@ -896,13 +943,13 @@ class DB:
_gesio = 0
_mbdata ['aufnahme'] = '0'
_mbdata ['bauteilstatus'] = _mbstatus
self.addmasseblech (_mbdata)
elif _states ['masseblech'] == 'i.O.':
self.addmasseblech (_mbdata, store = 0)
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' % (data['mmutter'], data['dmutter'], data['wmutter'] ))
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'])
@@ -916,7 +963,7 @@ class DB:
io = 0
if data['blindniet'] == 'i.O. NA':
self.log (5, 'PD30 Niet reworked updating part data F:%d S:%d' % (data['fniet' % i], data['sniet']))
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'])
@@ -1140,7 +1187,7 @@ class DB:
try:
cursor = self.executesql ("INSERT OR REPLACE INTO pruefzelle3 (dmc, endts, anzahl, pp01, pp02, pp03, pp04, pp05, pp06, pp07, 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, pp41, pp42) VALUES ('%(dmc)s', '%(endts)s', '1', '%(pp01)s', '%(pp02)s', '%(pp03)s', '%(pp04)s', '%(pp05)s', '%(pp06)s', '%(pp07)s', '%(pp08)s', '%(pp09)s', '%(pp10)s', '%(pp11)s', '%(pp12)s', '%(pp13)s', '%(pp14)s', '%(pp15)s', '%(pp16)s', '%(pp17)s', '%(pp18)s', '%(pp19)s', '%(pp20)s', '%(pp21)s', '%(pp22)s', '%(pp23)s', '%(pp24)s', '%(pp25)s', '%(pp26)s', '%(pp27)s', '%(pp28)s', '%(pp29)s', '%(pp30)s', '%(pp31)s', '%(pp32)s', '%(pp33)s', '%(pp34)s', '%(pp35)s', '%(pp36)s', '%(pp37)s', '%(pp38)s', '%(pp39)s', '%(pp40)s', '%(pp41)s', '%(pp42)s');" % data)
except:
print ("Couldnt insert PD30 pruefzelle3")
print ("Couldnt insert PD20 Pruefzelle3")
raise Warning
self.updatebde (data['dmc'], 'pruefzelle3', data['bauteilstatus'])

2
PD30_tel.py
View File

@@ -159,7 +159,7 @@ def fromstring (data):
print ("Debug-NietM8S01", data[132], data[133])
tel.attrib['NietM8status02'] = bearbeitungsstatus.get (chr (data [134]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
try:
tel.attrib['NietM8F02'] = (data [136] << 8) + data [139]
tel.attrib['NietM8F02'] = (data [136] << 8) + data [137]
except:
print ("Debug-NietM8F02", data[136], data[137])
try:

12
bde.py
View File

@@ -254,7 +254,7 @@ class BDEServer ():
else:
self.message (3, ' DT_handler : G11/G32 Data from BC01 in BDE for %s already existing' % ret_val['dmc'])
#DB_con.updatebde (ret_val['dmc'], 'variante', ret_val['bauteil'] + '-' + ret_val['variante'])
#Fixme if _partinfo[7] == 'n.Durchlaufen':
#Fixme if _partinfo[0][7] == 'n.Durchlaufen':
self.message (3, ' DT_handler : Bad state G11/G32 at BC04 for %s' % ret_val['dmc'])
_quit = 2
@@ -284,7 +284,7 @@ class BDEServer ():
elif ret_val['position'] == 'BC04':
#Scanner BC04 WE
if (ret_val['bauteil'] in ('G11', 'G32')):
if _partinfo[7] == 'n.Durchlaufen':
if _partinfo[0][7] == 'n.Durchlaufen':
self.message (3, ' DT_handler : Bad state G11/G32 at BC04 for %s' % ret_val['dmc'])
_quit = 2
else:
@@ -722,10 +722,10 @@ class BDEServer ():
_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 + _NietM6S01 +\
_NietM6st03.encode () + _space1.encode () + _NietM6F03 + _NietM6S01 +\
_NietM6st04.encode () + _space1.encode () + _NietM6F04 + _NietM6S01 +\
_NietM6st05.encode () + _space1.encode () + _NietM6F05 + _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 +\