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

Added Rework Station

Browse Source 
Minor fixes
This commit is contained in:
Michael Rest
2016-11-02 20:08:52 +01:00
parent fb65726286
commit a41c6e935b
3 changed files with 175 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DB.py
View File

@@ -492,14 +492,14 @@ class DB:
nav = NAV (path = "/srv/navision/", db = self)
nav.createcsv (data['dmc'])
try:
shutil.move ("/srv/navision/%s.csv" % data['dmc'], "/srv/navision/share")
except:
self.errlog ("/srv/navision/share/%s.csv already esist" % data['dmc'])
os.rename ("/srv/navision/%s.csv" % data['dmc'], "/srv/navision/share%s.csv" % data['dmc'])
self.updatebde (data['dmc'], 'csv', 'erzeugt')
#nav = NAV (path = "/srv/navision/", db = self)
#nav.createcsv (data['dmc'])
#try:
# shutil.move ("/srv/navision/%s.csv" % data['dmc'], "/srv/navision/share")
#except:
# self.errlog ("/srv/navision/share/%s.csv already esist" % data['dmc'])
# os.rename ("/srv/navision/%s.csv" % data['dmc'], "/srv/navision/share/%s.csv" % data['dmc'])
#self.updatebde (data['dmc'], 'csv', 'erzeugt')
@@ -550,7 +550,7 @@ class DB:
shutil.move ("/srv/navision/%s.csv" % data['dmc'], "/srv/navision/share")
except:
self.errlog ("/srv/navision/share/%s.csv already esist" % data['dmc'])
os.rename ("/srv/navision/%s.csv" % data['dmc'], "/srv/navision/share%s.csv" % data['dmc'])
os.rename ("/srv/navision/%s.csv" % data['dmc'], "/srv/navision/share/%s.csv" % data['dmc'])
self.updatebde (data['dmc'], 'csv', 'erzeugt')

53
Navision.py
View File

@@ -3,10 +3,19 @@
import sys, os
sys.path.append (".")
from time import time, strftime, sleep
from datetime import datetime
import pytz
from states import *
from parts import artikelnummer
def isotonav (isostr):
if isostr != '':
dt = datetime.strptime (isostr, '%Y-%m-%d %H:%M:%S')
dtl = dt.replace (tzinfo = pytz.utc).astimezone( pytz.timezone ('Europe/Berlin'))
return dtl.strftime ('%d.%m.%Y %H:%M:%S')
return ''
class NAV:
def __init__ (self, *dummy, **args):
@@ -46,10 +55,10 @@ class NAV:
csvdata [3] = bdedata ['variante']
#5 Zeitstempel Start
csvheader [4] = 'Zeitstempel_Start'
csvdata [4] = bdedata ['startts']
csvdata [4] = isotonav (bdedata ['startts'])
#6 Zeitstempel Ende
csvheader [5] = 'Zeitstempel_Ende'
csvdata [5] = bdedata ['endts']
csvdata [5] = isotonav (bdedata ['endts'])
#7 Seriennummer
csvheader [6] = 'Seriennummer'
csvdata [6] = bdedata ['seriennr']
@@ -82,9 +91,9 @@ class NAV:
pz1data [pz1field [i]] = ret[0][i]
#97 PZ1 Zeitstempel Start
csvdata [96] = pz1data ['startts']
csvdata [96] = isotonav (pz1data ['startts'])
#98 PZ1 Zeitstempel Ende
csvdata [97] = pz1data ['endts']
csvdata [97] = isotonav (pz1data ['endts'])
#115 - 154
for i in range (40):
csvdata [114 + i] = bearbeitungstatusNav [pz1data ['pp%02d' % (i + 1)]]
@@ -113,9 +122,9 @@ class NAV:
#99 Putzzelle Aufnahme
csvdata [98] = pudata ['aufnahme']
#100 Putzzelle Zeitstempel Start
csvdata [99] = pudata ['startts']
csvdata [99] = isotonav (pudata ['startts'])
#101 Putzzelle Zeitstempel Ende
csvdata [100] = pudata ['endts']
csvdata [100] = isotonav (pudata ['endts'])
del pufield
del pudata
@@ -141,9 +150,9 @@ class NAV:
#102 Chiron 1 oder 2
csvdata [101] = chdata ['chiron']
#103 Chiron Zeitstempel Start
csvdata [102] = chdata ['startts']
csvdata [102] = isotonav (chdata ['startts'])
#104 Chiron Zeitstempel Ende
csvdata [103] = chdata ['endts']
csvdata [103] = isotonav (chdata ['endts'])
del chfield
del chdata
@@ -181,9 +190,9 @@ class NAV:
bndata [bnfield [i]] = ret[0][i]
#105 Blindniet Zeitstempel Start
csvdata [104] = bndata ['startts']
csvdata [104] = isotonav (bndata ['startts'])
#106 Blindniet Zeitstempel Ende
csvdata [105] = bndata ['endts']
csvdata [105] = isotonav (bndata ['endts'])
#21-22 (d=1), 59-61 (d=2), 60-62 (d=2)
for i in range (2):
csvdata [20 + i] = bearbeitungstatusNav[bndata ['NietM8status%02d' % (i + 1)]]
@@ -226,9 +235,9 @@ class NAV:
#107 Bajonettclip Zeitstempel Aufnahem
csvdata [106] = bajodata ['aufnahme']
#108 Bajonettclip Zeitstempel Start
csvdata [107] = bajodata ['startts']
csvdata [107] = isotonav (bajodata ['startts'])
#109 Bajonettclip Zeitstempel Ende
csvdata [108] = bajodata ['endts']
csvdata [108] = isotonav (bajodata ['endts'])
#32-35
for i in range (4):
csvdata [31 + i] = bearbeitungstatusNav[bajodata ['bajostatus%02d' % (i + 1)]]
@@ -258,9 +267,9 @@ class NAV:
#110 CClip Zeitstempel Aufnahme
csvdata [109] = ccdata ['aufnahme']
#111 CClip Zeitstempel Start
csvdata [110] = ccdata ['startts']
csvdata [110] = isotonav (ccdata ['startts'])
#112 CClip Zeitstempel Ende
csvdata [111] = ccdata ['endts']
csvdata [111] = isotonav (ccdata ['endts'])
#36 -
for i in range (18):
csvdata [35 + i] = bearbeitungstatusNav[ccdata ['clipstatus%02d' % (i + 1)]]
@@ -296,19 +305,19 @@ class NAV:
mbdata [mbfield [i]] = ret[0][i]
#113 Masseblech Zeitstempel Start
csvdata [112] = mbdata ['startts']
csvdata [112] = isotonav (mbdata ['startts'])
#114 Masseblech Zeitstempel Ende
csvdata [113] = mbdata ['endts']
csvdata [113] = isotonav (mbdata ['endts'])
#54 Masseblech Ausgleichseelement
csvdata [53] = bauteilstatusNav [mbdata ['ausgleichselement']]
csvdata [53] = bearbeitungstatusNav [mbdata ['ausgleichselement']]
#55 Masseblech Schallisolierung
csvdata [54] = bauteilstatusNav [mbdata ['schallisolierung']]
csvdata [54] = bearbeitungstatusNav [mbdata ['schallisolierung']]
#56 Masseblech Masseblech
csvdata [55] = bauteilstatusNav [mbdata ['masseblech']]
csvdata [55] = bearbeitungstatusNav [mbdata ['masseblech']]
#57 Masseblech Blindniet
csvdata [56] = bauteilstatusNav [mbdata ['blindniet']]
csvdata [56] = bearbeitungstatusNav [mbdata ['blindniet']]
#58 Masseblech Blindniet
csvdata [57] = bauteilstatusNav [mbdata ['kombimutter']]
csvdata [57] = bearbeitungstatusNav [mbdata ['kombimutter']]
#91 Masseblech Kombimutter M
csvdata [90] = mbdata ['mmutter']
#92 Masseblech Kombimutter D
@@ -347,7 +356,7 @@ class NAV:
if type (i) == str and';' in i:
print ("Semikolon in Data")
file.write (str (i) + ';')
file.write (str (i) + '\n')
file.write (str (i) + '\r\n')
for i in csvdata:
if type (i) == str and';' in i:
print ("Semikolon in Data")

135
PD09_tel.py Executable file
View File

@@ -0,0 +1,135 @@
#!/usr/bin/python
__author__ = "Michael Rest"
__date__ = "2016/09/01"
__email__ = "mr@mir.systems"
__version__ = "$Revision: 1.1 $"[11:-2]
from telegram import TELEGRAM, TEL_PD09
from telegram import tsdecode
from states import *
def fromstring (data):
"""
Decode the binary representation of a PD_tel from the given
parameter and note the data in the instance of the object.
Parameters:
data: The binary form of the TELEGRAM
"""
tel = TEL_PD09 ()
try:
tel.attrib['nr'] = (data [0] << 8) + data [1]
except:
print ("Debug-Nr", data[0], data[1])
tel.attrib['src'] = data [2:4].decode ()
tel.attrib['dst'] = data [4:6].decode ()
tel.attrib['type'] = data [6:10].decode ()
tel.attrib['dmc'] = (data [10:38]).decode ().rstrip (' \x00')
tel.attrib['startts'] = tsdecode (data [38:52].decode ())
tel.attrib['endts'] = tsdecode (data [52:66].decode ())
#66-70 Varianten daten
#Bajonettclip Status
#tel.attrib['bauteilstatusbajo'] = bauteilstatus.get (chr (data [160]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['bajostatus01'] = bearbeitungsstatus.get (chr (data [161]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['bajostatus02'] = bearbeitungsstatus.get (chr (data [162]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['bajostatus03'] = bearbeitungsstatus.get (chr (data [163]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['bajostatus04'] = bearbeitungsstatus.get (chr (data [164]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
#CClip
tel.attrib['clipstatus01'] = bearbeitungsstatus.get (chr (data [191]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['clipstatus02'] = bearbeitungsstatus.get (chr (data [192]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['clipstatus03'] = bearbeitungsstatus.get (chr (data [193]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['clipstatus04'] = bearbeitungsstatus.get (chr (data [194]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['clipstatus05'] = bearbeitungsstatus.get (chr (data [195]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['clipstatus06'] = bearbeitungsstatus.get (chr (data [196]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['clipstatus07'] = bearbeitungsstatus.get (chr (data [197]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['clipstatus08'] = bearbeitungsstatus.get (chr (data [198]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['clipstatus09'] = bearbeitungsstatus.get (chr (data [199]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['clipstatus10'] = bearbeitungsstatus.get (chr (data [200]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['clipstatus11'] = bearbeitungsstatus.get (chr (data [201]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['clipstatus12'] = bearbeitungsstatus.get (chr (data [202]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['clipstatus13'] = bearbeitungsstatus.get (chr (data [203]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['clipstatus14'] = bearbeitungsstatus.get (chr (data [204]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['clipstatus15'] = bearbeitungsstatus.get (chr (data [205]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['clipstatus16'] = bearbeitungsstatus.get (chr (data [206]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['clipstatus17'] = bearbeitungsstatus.get (chr (data [207]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['clipstatus18'] = bearbeitungsstatus.get (chr (data [208]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
#Masseblech
#tel.attrib['bauteilstatus'] = bauteilstatus.get (chr (data [70]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['ausgleichselement'] = bearbeitungsstatus.get (chr (data [221]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['schallisolierung'] = bearbeitungsstatus.get (chr (data [222]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['masseblech'] = bearbeitungsstatus.get (chr (data [223]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['blindniet'] = bearbeitungsstatus.get (chr (data [224]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['kombimutter'] = bearbeitungsstatus.get (chr (data [225]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
try:
tel.attrib['fniet'] = (data [240] << 8) + data [241]
except:
print ("Debug-fniet", data[240], data[241])
try:
tel.attrib['sniet'] = (data [242] << 8) + data [243]
except:
print ("Debug-sniet", data[242], data[243])
try:
tel.attrib['mmutter'] = (data [244] << 8) + data [245]
except:
print ("Debug-mmutter", data[244], data[245])
try:
tel.attrib['dmutter'] = (data [246] << 8) + data [247]
except:
print ("Debug-dmutter", data[246], data[247])
try:
tel.attrib['wmutter'] = (data [248] << 8) + data [249]
except:
print ("Debug-wmutter", data[248], data[249])
try:
tel.attrib['tmutter'] = (data [250] << 8) + data [251]
except:
print ("Debug-tmutter", data[250], data[251])
tel.attrib['ladungstraeger'] = data [102:104].decode ()
return tel
class TEL_PD09 (TELEGRAM):
def __init__ (self, nr = 0, src = '09', dst = 'PC', *args, **args2):
TELEGRAM.__init__(self)
self.code = TEL_PD09
self.attrib['nr'] = nr
self.attrib['src'] = src
self.attrib['dst'] = dst
self.attrib['type'] = 'PD09'
self.attrib['startts'] = ''
self.attrib['endts'] = ''
self.attrib['dmc'] = ''
self.attrib['ladungstraeger'] = ''
self.len = 2220908
return
def identify (self):
"""
This method can be used to identify a TELEGRAM by string.
"""
return "PD09 TELEGRAM"
def __repr__ (self):
"""
Print a representation of the TPDU. Use this method via
`-pair to transfer it over the wire. This will just return
the header data and not the real data!
"""
# Note that the data is not included in the length
return "%c%c%c" % (2, self.code << 4, self.number) + self.data
def __str__ (self):
"""
Return a readable and quite verbose overview of the TPDU instance.
Use this for debugging purposes or if you're just curious.
"""
return "Packet: %s Data: %s" % (self.identify (), repr (self.attrib))