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

Changed milkdata to multiple Datasets

Browse Source
This commit is contained in:
Michael Rest
2019-10-14 16:18:55 +02:00
parent e37df75742
commit fc0223cda3
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
ADIS_LKV.py
View File

@@ -132,37 +132,37 @@ class ADIS:
else:
milkforbid = 1
if len (milkdata):
ammount, time, mdate = milkdata
retval = ""
for ammount, time, mdate, starttime in milkdata:
data = {'00900070': animalnr}
data ['00800004'] = '0'
data ['00800043'] = '9'
data ['00900080'] = earmark
data ['00800143'] = rfid
data ['00900054'] = mdate.replace ("-","")
data ['00900078'] = "000000" #mtime
data ['00900054'] = mdate.replace ("-", "")
data ['00900078'] = starttime.replace (":", "")
data ['00900042'] = float (ammount) / 1000.0 #0.1kg
data ['00821005'] = int (time)
#data ['00201860'] = milkplace
print (data ['00900042'])
ds = "VN880022"
for nr, art, item, name, datatype, length, resolution, unit, code in entities ['880022']:
if art in ['KEY', 'MAN'] or item in self.entityfields ['880022']:
self.log ("Item %s needed" % item, 9)
if item in data:
if datatype == 'AN':
_v = str (data[item]).rjust (int (length))
ds += _v [len (_v) - int (length):]
elif datatype == 'N':
_v = "%d" % (int (data[item] * (10**int (resolution))))
_v = _v.rjust (int (length))
ds += _v[len (_v) - int (length):]
ds = "VN880022"
for nr, art, item, name, datatype, length, resolution, unit, code in entities ['880022']:
if art in ['KEY', 'MAN'] or item in self.entityfields ['880022']:
self.log ("Item %s needed" % item, 9)
if item in data:
if datatype == 'AN':
_v = str (data[item]).rjust (int (length))
ds += _v [len (_v) - int (length):]
elif datatype == 'N':
_v = "%d" % (int (data[item] * (10**int (resolution))))
_v = _v.rjust (int (length))
if unit == 'hhmmss':
_v = _v.replace (" ", "0")
ds += _v[len (_v) - int (length):]
self.log (ds, 9)
return ds
self.log (ds, 9)
retval += ds + "\n"
return retval
@@ -189,23 +189,23 @@ def createlkv (animalinfos, milkdata):
if animalinfos:
for animalnr, earmark, rfid, forbidmilk, tsforbidstart, tsforbidend in animalinfos:
if milkdata [animalnr]:
if animalnr in milkdata:
ds = adis.createmilkdataset ((animalnr, earmark, rfid, forbidmilk, tsforbidstart, tsforbidend), milkdata[animalnr])
print ("Debug Dataset")
print (ds)
retval += ds + "\n"
retval += ds
else:
return "help"
retval += "TN\n"
retval += "ZN\n"
print ("Debug End")
print retval
print (retval)
if __name__ == "__main__":
animalinfos = [(90, '2730000000000000', '', '1', '2019-09-11', '2019-09-20')]
milkdata = {90 : (10992, 503.2, '2018-05-01')}
animalinfos = [(100, '2730000000000000', '', '1', '2019-09-11', '2019-09-20')]
milkdata = {100: [(3462, 177.6, '2019-08-11', '06:26:47'), (1235, 421.6, '2019-08-07', '18:06:43')]}
createlkv (animalinfos, milkdata)