Accept Merge Request #836: (feature/修改机床参数bug -> develop)

Merge Request: 修改工单开始结束接口

Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/836?initial=true

sf_manufacturing/controllers/controllers.py

@@ -148,11 +148,20 @@ class Manufacturing_Connect(http.Controller):
             ret = json.loads(datas)
             production_id = ret['BillId']
             routing_type = ret['CraftId']
+            equipment_id = ret["DeviceId"]
             workorder = request.env['mrp.workorder'].sudo().search(
                 [('production_id', '=', production_id), ('routing_type', '=', routing_type)], limit=1)
             if not workorder:
                 res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单不存在'}
-                return json.JSONEncoder().encode(res)
+                return res
+            if workorder.state != 'ready':
+                res = {'Succeed': False, 'ErrorCode': 202, 'Error': '工单未就绪'}
+                return res
+            work_equipment_id = request.env['maintenance.equipment'].sudo().search(['name', '=', equipment_id], limit=1)
+            if not work_equipment_id:
+                res = {'Succeed': False, 'ErrorCode': 202, 'Error': '没有找到该加工设备'}
+                return res
+            workorder.equipment_id = work_equipment_id
             workorder.button_start()
         except Exception as e:
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
@@ -179,6 +188,9 @@ class Manufacturing_Connect(http.Controller):
             if not workorder:
                 res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单不存在'}
                 return json.JSONEncoder().encode(res)
+            if workorder.state != 'progress':
+                res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单未开始'}
+                return res
             workorder.button_finish()
         except Exception as e:
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}

sf_warehouse/models/model.py

@@ -398,7 +398,7 @@ class ShelfLocation(models.Model):
         # objs_all = self.env['maintenance.equipment'].search([('id', '=', self.id)])
         # machine_tool_list = []
         params = {'DeviceId': 'Cabinet-AL'}
-        r = requests.get(crea_url,  params=params,headers=headers)
+        r = requests.get(crea_url,  params=params, headers=headers)
         ret = r.json()
         print(ret)
         if ret['Succeed'] == True: