Commit 21fdc72c by Aeolus

Merge branch 'aeolus'

parents 858e0907 38b01e9a
...@@ -39,7 +39,7 @@ def get_production_list(): ...@@ -39,7 +39,7 @@ def get_production_list():
"machine_no": i.machine_no, "machine_no": i.machine_no,
"hatch_no": [i.hatch_no], "hatch_no": [i.hatch_no],
"production_id": i.production_id, "production_id": i.production_id,
"name": i.production, "name": i.production_name,
"title": i.title, "title": i.title,
"brand_id": i.brand_id, "brand_id": i.brand_id,
"brand_name": i.brand_name, "brand_name": i.brand_name,
...@@ -79,7 +79,7 @@ def get_production_info(): ...@@ -79,7 +79,7 @@ def get_production_info():
"machine_no": hatch_info.machine_no, "machine_no": hatch_info.machine_no,
"hatch_no": hatch_info.hatch_no, "hatch_no": hatch_info.hatch_no,
"production_id": hatch_info.production_id, "production_id": hatch_info.production_id,
"name": hatch_info.production, "name": hatch_info.production_name,
"title": hatch_info.title, "title": hatch_info.title,
"brand_id": hatch_info.brand_id, "brand_id": hatch_info.brand_id,
"brand_name": hatch_info.brand_name, "brand_name": hatch_info.brand_name,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment