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

Added Pruefzelle2 Data Set for all Cells

Browse Source
This commit is contained in:
Michael Rest
2016-10-14 11:30:56 +02:00
parent ff719a5229
commit 7a027f1c3b
2 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
DB.py
View File

@@ -5,6 +5,7 @@ import sqlite3 as sqlite
from sys import exit
from datetime import datetime
import os
from pruefpunkte import pruefpunkte
def logtest (level, msg):
print (msg)
@@ -446,7 +447,7 @@ class DB:
self.errlog ('PD10 for %s already exists - Overwrite' % data['dmc'])
try:
cursor = self.executesql ("INSERT OR REPLACE INTO pruefzelle2 (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) VALUES ('%(dmc)s', '%(startts)s', '%(endts)s', '%(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', '%(pp34)s', '%(pp35)s', '%(pp36)s', '%(pp37)s', '%(pp38)s', '%(pp39)s', '%(pp40)s');" % data)
cursor = self.executesql ("INSERT OR REPLACE INTO pruefzelle2 (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, pp41) VALUES ('%(dmc)s', '%(startts)s', '%(endts)s', '%(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', '%(pp34)s', '%(pp35)s', '%(pp36)s', '%(pp37)s', '%(pp38)s', '%(pp39)s', '%(pp40)s', '%(pp41)s');" % data)
except:
print ("Couldnt insert PD10 pruefzelle2")
raise Warning
@@ -454,14 +455,58 @@ class DB:
self.updatebde (data['dmc'], 'pruefzelle2', data['bauteilstatus'])
self.updatebde (data['dmc'], 'ladungstraeger', data['ladungstraeger'])
self.updatebde (data['dmc'], 'endts', data['endts'])
if data['bauteilstatus'] == 'n.i.O.':
self.log (5, 'PD10 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]
}
for i in range (1,42):
if data ['pp%02d' % i] == 'n.i.O.':
where, field = pruefpunkte ['pp%02d' % i]
if _states [where] != 'n.Durchlaufen':
self.log (5, 'PD10 pp%02d n.i.O updating part data %s' % (i, where))
self.updateinformation (data['dmc'], where, field, 'n.i.O.')
else:
self.log (5, 'PD10 pp%02d %s nDurchlaufen do nothing' % (i, where))
def updateinformation (self, dmc, where, field, value):
"""
Updates part information
"""
try:
cursor = self.executesql ("UPDATE bde SET %s = '%s' WHERE dmc = '%s';" % (where, value, dmc))
except:
self.errlog ("Couldnt update field %s in table %s" % (where, field))
if where == 'chiron':
self.log (5, 'Where is Chiron no need to update')
return
try:
cursor = self.executesql ("UPDATE %s SET %s = '%s' WHERE dmc = '%s';" % (where, field, value, dmc))
except:
self.errlog ("Couldnt update field %s in table %s" % (where, field))
def getpruefzelle2 (self, dmc):
"""
Get Processdata 10 - prufezelle2
"""
try:
cursor = self.executesql ("SELECT 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 FROM pruefzelle2 WHERE dmc = '%s';" % dmc)
cursor = self.executesql ("SELECT 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, pp41 FROM pruefzelle2 WHERE dmc = '%s';" % dmc)
except:
print ("Couldnt get PD10 pruefzelle2")
raise Warning

3
initdata/dblayout_sqlite.sql
View File

@@ -231,7 +231,8 @@ CREATE TABLE pruefzelle2 (
pp37 char(25) NOT NULL default '',
pp38 char(25) NOT NULL default '',
pp39 char(25) NOT NULL default '',
pp40 char(25) NOT NULL default ''
pp40 char(25) NOT NULL default '',
pp41 char(25) NOT NULL default ''
);
-- PRIMARY KEY (id, x, y)