jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge Request: 修改工单开始接口

Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/839
This commit is contained in:
马广威
2024-02-23 11:12:11 +08:00
committed by Coding
parent 2b9c088d1d 7062289c89
commit f015cbb9fd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_manufacturing/controllers/controllers.py
View File

@@ -143,7 +143,7 @@ class Manufacturing_Connect(http.Controller):
""" """
logging.info('button_Work_START:%s' % kw) logging.info('button_Work_START:%s' % kw)
try: try:
res = {'Succeed': True, 'Datas': []} res = {'Succeed': True, 'Datas': ['工单已开始']}
datas = request.httprequest.data datas = request.httprequest.data
ret = json.loads(datas) ret = json.loads(datas)
production_id = ret['BillId'] production_id = ret['BillId']
@@ -157,7 +157,7 @@ class Manufacturing_Connect(http.Controller):
if workorder.state != 'ready': if workorder.state != 'ready':
res = {'Succeed': False, 'ErrorCode': 202, 'Error': '工单未就绪'} res = {'Succeed': False, 'ErrorCode': 202, 'Error': '工单未就绪'}
return json.JSONEncoder().encode(res) return json.JSONEncoder().encode(res)
work_equipment_id = request.env['maintenance.equipment'].sudo().search(['name', '=', equipment_id], limit=1) work_equipment_id = request.env['maintenance.equipment'].sudo().search([('name', '=', equipment_id)], limit=1)
if not work_equipment_id: if not work_equipment_id:
res = {'Succeed': False, 'ErrorCode': 202, 'Error': '没有找到该加工设备'} res = {'Succeed': False, 'ErrorCode': 202, 'Error': '没有找到该加工设备'}
return json.JSONEncoder().encode(res) return json.JSONEncoder().encode(res)
@@ -178,7 +178,7 @@ class Manufacturing_Connect(http.Controller):
""" """
logging.info('button_Work_End:%s' % kw) logging.info('button_Work_End:%s' % kw)
try: try:
res = {'Succeed': True, 'Datas': []} res = {'Succeed': True, 'Datas': ['工单已结束']}
datas = request.httprequest.data datas = request.httprequest.data
ret = json.loads(datas) ret = json.loads(datas)
production_id = ret['BillId'] production_id = ret['BillId']