Commit a646513e by malihua

看板增加车间

parent 04c3b25c
...@@ -176,6 +176,7 @@ class ResMesBigScreen(http.Controller): ...@@ -176,6 +176,7 @@ class ResMesBigScreen(http.Controller):
jsonrequest = http.request.jsonrequest jsonrequest = http.request.jsonrequest
domain = [] domain = []
abnormal_alarm_id = jsonrequest.get('abnormal_alarm_id', False) abnormal_alarm_id = jsonrequest.get('abnormal_alarm_id', False)
plant_id = http.request.jsonrequest.get('plant_id') #车间ID参数
#表单id #表单id
if abnormal_alarm_id: if abnormal_alarm_id:
domain.append(('id', '=', abnormal_alarm_id)) domain.append(('id', '=', abnormal_alarm_id))
...@@ -183,6 +184,9 @@ class ResMesBigScreen(http.Controller): ...@@ -183,6 +184,9 @@ class ResMesBigScreen(http.Controller):
#异常类型id #异常类型id
if abnormal_id: if abnormal_id:
domain.append(('abnormal_id', '=', abnormal_id)) domain.append(('abnormal_id', '=', abnormal_id))
# 车间 id
if plant_id:
domain.append(('equipment_id.plant_id', '=', plant_id))
page_size = int(http.request.jsonrequest.get('page_size', 20)) page_size = int(http.request.jsonrequest.get('page_size', 20))
page_no = int(http.request.jsonrequest.get('page_no', 1)) page_no = int(http.request.jsonrequest.get('page_no', 1))
abnormal_alarm_ids = http.request.env(user=SUPERUSER_ID)['roke.abnormal.alarm'].search(domain, limit=page_size, offset=(page_no - 1) * page_size, order="originating_time desc") abnormal_alarm_ids = http.request.env(user=SUPERUSER_ID)['roke.abnormal.alarm'].search(domain, limit=page_size, offset=(page_no - 1) * page_size, order="originating_time desc")
...@@ -212,7 +216,11 @@ class ResMesBigScreen(http.Controller): ...@@ -212,7 +216,11 @@ class ResMesBigScreen(http.Controller):
try: try:
url = "https://dws-platform.xbg.rokeris.com/dev-api/public/device_efficiency/series_utilization_rate_top_5" url = "https://dws-platform.xbg.rokeris.com/dev-api/public/device_efficiency/series_utilization_rate_top_5"
date = fields.Date.today().strftime("%Y-%m-%d") date = fields.Date.today().strftime("%Y-%m-%d")
eq_ids = http.request.env["roke.mes.equipment"].sudo().search([('code',"!=",'')]) plant_id = http.request.jsonrequest.get('plant_id') #车间ID参数
domain = [('code', "!=", '')]
if plant_id:
domain.append(('plant_id', '=', plant_id))
eq_ids = http.request.env["roke.mes.equipment"].sudo().search(domain)
query_data = [{"device_name": eq_id.name,"device_code": eq_id.code} for eq_id in eq_ids] query_data = [{"device_name": eq_id.name,"device_code": eq_id.code} for eq_id in eq_ids]
res = requests.post(url, data=json.dumps({ res = requests.post(url, data=json.dumps({
"device_code_list": query_data, "device_code_list": query_data,
......
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