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

Modified animals with Seperation State

Browse Source
This commit is contained in:
Michael Rest
2020-06-29 08:26:01 +02:00
parent bb64cc022c
commit 43e9d56b23
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ADIS_LKV.py
View File

@@ -185,7 +185,7 @@ class ADIS:
""" """
Creating entity for 880022 Creating entity for 880022
""" """
animalnr, earmark, rfid, forbidmilk, tsforbidstart, tsforbidend = animalinfo animalnr, earmark, rfid, forbidmilk, tsforbidstart, tsforbidend, sepertation = animalinfo
#Check milking forbidden #Check milking forbidden
milkforbid = 0 milkforbid = 0
if forbidmilk: if forbidmilk:
@@ -260,7 +260,7 @@ def createlkv (businessinfos, animalinfos, milkdata):
retval += dd + "\n" retval += dd + "\n"
if animalinfos: if animalinfos:
for animalnr, earmark, rfid, forbidmilk, tsforbidstart, tsforbidend in animalinfos: for animalnr, earmark, rfid, forbidmilk, tsforbidstart, tsforbidend, sepertation in animalinfos:
if animalnr in milkdata: if animalnr in milkdata:
ds = adis.createmilkdataset ((animalnr, earmark, rfid, forbidmilk, tsforbidstart, tsforbidend), milkdata[animalnr]) ds = adis.createmilkdataset ((animalnr, earmark, rfid, forbidmilk, tsforbidstart, tsforbidend), milkdata[animalnr])
retval += ds retval += ds
@@ -274,7 +274,7 @@ def createlkv (businessinfos, animalinfos, milkdata):
if __name__ == "__main__": if __name__ == "__main__":
businessinfos = {'businessid' : '123567'} businessinfos = {'businessid' : '123567'}
animalinfos = [(100, '2730000000000000', '', '1', '2019-09-11', '2019-09-20')] animalinfos = [(100, '2730000000000000', '', '1', '2019-09-11', '2019-09-20'), 'Normal']
milkdata = {100: [(3462, 177.6, '2019-08-11', '06:26:47'), (1235, 421.6, '2019-08-07', '18:06:43')]} milkdata = {100: [(3462, 177.6, '2019-08-11', '06:26:47'), (1235, 421.6, '2019-08-07', '18:06:43')]}
print (createlkv (businessinfos, animalinfos, milkdata)) print (createlkv (businessinfos, animalinfos, milkdata))

BIN
siliconform.zexp
View File

Binary file not shown.