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

Added FillCell results

Browse Source
This commit is contained in:
Michael Rest
2017-07-26 10:44:18 +02:00
parent 58788bd860
commit 34ac752485
1 changed files with 96 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
DB.py
View File

@@ -5,7 +5,7 @@ import sqlite3 as sqlite
from sys import exit
from datetime import datetime
import os, shutil
from pruefpunkte import pruefpunkte
from pruefpunkte import pruefpunkte, pruefpunktefillG11
from Navision import NAV
def logtest (level, msg):
@@ -506,6 +506,9 @@ class DB:
#'Blindniet'
if _states ['blindniet'] == 'n.Durchlaufen':
self.log (5, 'PD09 Blindniet %s nDurchlaufen do nothing' % data['dmc'])
_gesio = 0
elif _states ['blindniet'] == 'i.O.':
self.log (5, 'PD09 Blindniet %s already i.O. do nothing' % data['dmc'])
else:
io = 1
for i in range (1, 5):
@@ -517,7 +520,10 @@ class DB:
self.updateinformation (data['dmc'], 'blindniet', 'DGBM8W%02d' % i, data['DGBM8W%02d' % i])
self.updateinformation (data['dmc'], 'blindniet', 'DGBM8T%02d' % i, data['DGBM8T%02d' % i])
elif data['DGBM8status%02d' % i] == 'n.i.O.':
self.log (5, 'PD09 DGBM8_%02d still n.i.O ' % (i))
self.log (5, 'PD09 DGBM8_%02d still n.i.O.' % (i))
io = 0
elif data['DGBM8status%02d' % i] == 'n.Bearbeitet':
self.log (5, 'PD09 DGBM8_%02d still n.Bearbeitet ' % (i))
io = 0
for i in range (1, 3):
if data['NietM8status%02d' % i] == 'i.O. NA':
@@ -526,7 +532,10 @@ class DB:
self.updateinformation (data['dmc'], 'blindniet', 'NietM8F%02d' % i, data['NietM8F%02d' % i])
self.updateinformation (data['dmc'], 'blindniet', 'NietM8S%02d' % i, data['NietM8S%02d' % i])
elif data['NietM8status%02d' % i] == 'n.i.O.':
self.log (5, 'PD09 NietM8_%02d still n.i.O ' % (i))
self.log (5, 'PD09 NietM8_%02d still n.i.O.' % (i))
io = 0
elif data['NietM8status%02d' % i] == 'n.Bearbeitet':
self.log (5, 'PD09 NietM8_%02d still n.Bearbeitet' % (i))
io = 0
for i in range (1, 6):
if data['NietM6status%02d' % i] == 'i.O. NA':
@@ -537,6 +546,9 @@ class DB:
elif data['NietM6status%02d' % i] == 'n.i.O.':
self.log (5, 'PD09 NietM6_%02d still n.i.O ' % (i))
io = 0
elif data['NietM6status%02d' % i] == 'n.Bearbeitet':
self.log (5, 'PD09 NietM6_%02d still n.Bearbeitet' % (i))
io = 0
if io:
self.updatebde (data['dmc'], 'blindniet', 'i.O. NA')
@@ -547,6 +559,9 @@ class DB:
#'Bajonettclip'
if _states ['bajonettclip'] == 'n.Durchlaufen':
self.log (5, 'PD09 Bajonett %s nDurchlaufen do nothing' % ['dmc'])
_gesio = 0
elif _states ['bajonettclip'] == 'i.O.':
self.log (5, 'PD09 Bajonett %s i.O. do nothing' % ['dmc'])
else:
io = 1
for i in range (1, 5):
@@ -554,7 +569,10 @@ class DB:
self.log (5, 'PD09 bajonett%02d reworked updating part data' % (i))
self.updateinformation (data['dmc'], 'bajonettclip', 'bajostatus%02d' % i, data['bajostatus%02d' % i])
elif data['bajostatus%02d' % i] == 'n.i.O.':
self.log (5, 'PD09 bajonett%02d still n.i.O ' % (i))
self.log (5, 'PD09 bajonett%02d still n.i.O' % (i))
io = 0
elif data['bajostatus%02d' % i] == 'n.Bearbeitet':
self.log (5, 'PD09 bajonett%02d still n.Bearbeitet' % (i))
io = 0
if io:
self.updatebde (data['dmc'], 'bajonettclip', 'i.O. NA')
@@ -565,6 +583,9 @@ class DB:
#'CClip'
if _states ['cclip'] == 'n.Durchlaufen':
self.log (5, 'PD09 CClip %s nDurchlaufen do nothing' % ['dmc'])
_gesio = 0
elif _states ['cclip'] == 'i.O.':
self.log (5, 'PD09 CClip %s i.O. do nothing' % ['dmc'])
else:
io = 1
for i in range (1, 18):
@@ -572,7 +593,10 @@ class DB:
self.log (5, 'PD09 CClip%02d reworked updating part data' % (i))
self.updateinformation (data['dmc'], 'cclip', 'clipstatus%02d' % i, data['clipstatus%02d' % i])
elif data['clipstatus%02d' % i] == 'n.i.O.':
self.log (5, 'PD09 clipstatus%02d still n.i.O ' % (i))
self.log (5, 'PD09 clipstatus%02d still n.i.O' % (i))
io = 0
elif data['clipstatus%02d' % i] == 'n.Bearbeitet':
self.log (5, 'PD09 clipstatus%02d still n.Bearbeitet' % (i))
io = 0
if io:
self.updatebde (data['dmc'], 'cclip', 'i.O. NA')
@@ -580,10 +604,12 @@ class DB:
_gesio = 0
#'Maseblech'
if _states ['masseblech'] == 'n.Durchlaufen':
self.log (5, 'PD09 Masseblech %s nDurchlaufen do nothing' % ['dmc'])
_gesio = 0
elif _states ['masseblech'] == 'i.O.':
self.log (5, 'PD09 Masseblech %s i.O. do nothing' % ['dmc'])
else:
io = 1
if data['kombimutter'] == 'i.O. NA':
@@ -594,7 +620,10 @@ class DB:
self.updateinformation (data['dmc'], 'masseblech', 'wmutter', data['wmutter'])
self.updateinformation (data['dmc'], 'masseblech', 'tmutter', data['tmutter'])
elif data['kombimutter'] == 'n.i.O.':
self.log (5, 'PD09 Kombimutter still n.i.O ')
self.log (5, 'PD09 Kombimutter still n.i.O')
io = 0
elif data['kombimutter'] == 'n.Bearbeitet':
self.log (5, 'PD09 Kombimutter still n.Bearbeitet')
io = 0
if data['blindniet'] == 'i.O. NA':
@@ -603,28 +632,40 @@ class DB:
self.updateinformation (data['dmc'], 'masseblech', 'fniet', data['fniet'])
self.updateinformation (data['dmc'], 'masseblech', 'sniet', data['sniet'])
elif data['blindniet'] == 'n.i.O.':
self.log (5, 'PD09 Blindniet still n.i.O ')
self.log (5, 'PD09 Blindniet still n.i.O')
io = 0
elif data['blindniet'] == 'n.Bearbeitet':
self.log (5, 'PD09 Blindniet still n.Bearbeitet')
io = 0
if data['masseblech'] == 'i.O. NA':
self.log (5, 'PD09 Masseblech reworked updating part data')
self.updateinformation (data['dmc'], 'masseblech', 'masseblech', data['masseblech'])
elif data['masseblech'] == 'n.i.O.':
self.log (5, 'PD09 Masseblech still n.i.O ')
self.log (5, 'PD09 Masseblech still n.i.O')
io = 0
elif data['masseblech'] == 'n.Bearbeitet':
self.log (5, 'PD09 Masseblech still n.Bearbeitet')
io = 0
if data['ausgleichselement'] == 'i.O. NA':
self.log (5, 'PD09 Ausgleichselement reworked updating part data')
self.updateinformation (data['dmc'], 'masseblech', 'ausgleichselement', data['ausgleichselement'])
elif data['ausgleichselement'] == 'n.i.O.':
self.log (5, 'PD09 Ausgleichselement still n.i.O ')
self.log (5, 'PD09 Ausgleichselement still n.i.O')
io = 0
elif data['ausgleichselement'] == 'n.Bearbeitet':
self.log (5, 'PD09 Ausgleichselement still n.Bearbeitet')
io = 0
if data['schallisolierung'] == 'i.O. NA':
self.log (5, 'PD09 Schallisolierung reworked updating part data')
self.updateinformation (data['dmc'], 'masseblech', 'schallisolierung', data['schallisolierung'])
elif data['schallisolierung'] == 'n.i.O.':
self.log (5, 'PD09 Schallisolierung still n.i.O ')
self.log (5, 'PD09 Schallisolierung still n.i.O')
io = 0
elif data['schallisolierung'] == 'n.Bearbeitet':
self.log (5, 'PD09 Schallisolierung still n.Bearbeitet')
io = 0
if io:
@@ -634,7 +675,12 @@ class DB:
#if _gesio and _ges == 'i.O.':
if _gesio:
self.log (5, 'PD09 All part data i.O. Part is i.O.')
if _ges != 'i.O.':
self.log (5, 'PD09 part not i.O. yet set i.O.')
self.updatebde (data['dmc'], 'gesamtstatus', 'i.O. NA')
#nav = NAV (path = "/srv/navision/", db = self)
#nav.createcsv (data['dmc'])
#try:
@@ -645,7 +691,6 @@ class DB:
#self.updatebde (data['dmc'], 'csv', 'erzeugt')
def addpruefzelle2 (self, data):
"""
Add Processdata 10 - pruefzelle 2
@@ -675,13 +720,17 @@ class DB:
'masseblech' : l[12]
}
if data['bauteilstatus'] == 'i.O.':
#Pruefzelle - i.O.
self.log (5, 'PD10 .i.O checking part data')
if _states['pruefzelle1'] == 'i.O.' and _states['putzzelle'] == 'i.O.' and _states['chiron'] in ('i.O.','n.Durchlaufen') and _states['blindniet'] == 'i.O.' and _states['putzzelle'] == 'i.O.' and _states['bajonettclip'] == 'i.O.' and _states['cclip'] == 'i.O.' and _states['masseblech'] == 'i.O.':
self.log (5, 'PD10 .i.O All part data i.O. Part is i.O.')
self.updatebde (data['dmc'], 'gesamtstatus', 'i.O.')
else:
self.log (5, 'PD10 .i.O not All part data i.O. Part is n.i.O.')
self.updatebde (data['dmc'], 'gesamtstatus', 'n.i.O.')
elif data['bauteilstatus'] == 'n.i.O.':
self.log (5, 'PD10 n.i.O updatding part data')
self.log (5, 'PD10 n.i.O updating part data')
self.updatebde (data['dmc'], 'gesamtstatus', 'n.i.O.')
for i in range (1,42):
@@ -790,20 +839,36 @@ class DB:
raise Warning
self.updatebde (data['dmc'], 'pruefzelle3', data['bauteilstatus'])
l = self.getbde (data['dmc'])[0]
#dmc, startts, endts, ladungstraeger, seriennr, variante, pruefzelle1, putzzelle, chiron, blindniet, bajonettclip, cclip, masseblech, pruefzelle2, nacharbeit, csv, pruefzelle3, gesamtstatus
_states = {'pruefzelle1' : l[6],
'putzzelle' : l[7],
'chiron' : l[8],
'blindniet': l[9],
'bajonettclip': l[10],
'cclip': l[11],
'masseblech' : l[12]
}
_ges = l[17]
_gesio = 1
iostates = ('i.O.', 'i.O. NA')
if data['bauteilstatus'] == 'i.O.':
#Pruefzelle - i.O.
self.log (5, 'PD20 .i.O checking part data')
if _ges == 'i.O.':
self.log (5, 'PD20 Part already .i.O do nothing')
elif _states['pruefzelle1'] in iostates and _states['putzzelle'] in iostates and _states['chiron'] in ('i.O.','n.Durchlaufen') and _states['blindniet'] in iostates and _states['putzzelle'] in iostates and _states['bajonettclip'] in iostates and _states['cclip'] in iostates and _states['masseblech'] in iostates:
self.log (5, 'PD20 .i.O All part data i.O. Part is i.O.')
self.updatebde (data['dmc'], 'gesamtstatus', 'i.O.')
elif _ges != 'n.i.O.':
self.log (5, 'PD20 .i.O All part data i.O. Part is i.O.')
self.updatebde (data['dmc'], 'gesamtstatus', 'n.i.O.')
if 0 and data['bauteilstatus'] == 'n.i.O.':
self.log (5, 'PD20 n.i.O updatding part data')
l = self.getbde (data['dmc'])[0]
#dmc, startts, endts, ladungstraeger, seriennr, variante, pruefzelle1, putzzelle, chiron, blindniet, bajonettclip, cclip, masseblech, pruefzelle2, nacharbeit, csv
_states = {'pruefzelle1' : l[6],
'putzzelle' : l[7],
'chiron' : l[8],
'blindniet': l[9],
'bajonettclip': l[10],
'cclip': l[11],
'masseblech' : l[12]
}
#Moner or more Points n.I.O
self.log (5, 'PD20 n.i.O updating part data')
for i in range (1,42):
if data ['pp%02d' % i] == 'n.i.O.':
where, field = pruefpunkte ['pp%02d' % i]
@@ -853,18 +918,18 @@ class DB:
Add locked DMC
"""
try:
cursor = self.executesql ("INSERT INTO locked (dmc, rohteilnr, aenderungsidx, sperrts, sperrnr) VALUES ('%(dmc)s', '%(rohteilnr)s', '%(aenderungsidx)s', '%(sperrts)s', '%(sperrnr)s');" % data)
cursor = self.executesql ("INSERT INTO locked (dmc, rohteilnr, aenderungsidx, sperrts, sperrnr, quelle) VALUES ('%(dmc)s', '%(rohteilnr)s', '%(aenderungsidx)s', '%(sperrts)s', '%(sperrnr)s', '%(quelle)s');" % data)
except:
print ("Couldnt insert into locked")
raise Warning
def cleanlock (self):
def cleanlock (self, src):
"""
Check if a dmc is locked
Delete Locks
"""
try:
cursor = self.executesql ("DELETE FROM locked WHERE dmc <> '4711';")
cursor = self.executesql ("DELETE FROM locked WHERE dmc <> '4711' AND quelle = '%s';" % src)
except:
print ("Couldnt clean locked")
raise Warning