diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py index d4f5a8da..4703f6f7 100644 --- a/sf_manufacturing/controllers/controllers.py +++ b/sf_manufacturing/controllers/controllers.py @@ -143,7 +143,7 @@ class Manufacturing_Connect(http.Controller): """ logging.info('button_Work_START:%s' % kw) try: - res = {'Succeed': True, 'Datas': []} + res = {'Succeed': True, 'Datas': ['工单已开始']} datas = request.httprequest.data ret = json.loads(datas) production_id = ret['BillId'] @@ -161,7 +161,7 @@ class Manufacturing_Connect(http.Controller): if not work_equipment_id: res = {'Succeed': False, 'ErrorCode': 202, 'Error': '没有找到该加工设备'} return json.JSONEncoder().encode(res) - workorder.equipment_id = work_equipment_id.id + workorder.equipment_id = work_equipment_id workorder.button_start() except Exception as e: res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} @@ -178,7 +178,7 @@ class Manufacturing_Connect(http.Controller): """ logging.info('button_Work_End:%s' % kw) try: - res = {'Succeed': True, 'Datas': []} + res = {'Succeed': True, 'Datas': ['工单已结束']} datas = request.httprequest.data ret = json.loads(datas) production_id = ret['BillId']