Accept Merge Request #830: (feature/修复日计划工单接口 -> 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/830
This commit is contained in:
杨金灵
2024-02-22 18:03:09 +08:00
committed by Coding
2 changed files with 2 additions and 4 deletions

View File

@@ -281,7 +281,6 @@ class Manufacturing_Connect(http.Controller):
logging.info('NCProgDolod error:%s' % e)
return json.JSONEncoder().encode(res)
@http.route('/AutoDeviceApi/LocationChange', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
cors="*")
def LocationChange(self, **kw):
@@ -344,7 +343,7 @@ class Manufacturing_Connect(http.Controller):
"""
logging.info('AGVDownProduct:%s' % kw)
try:
res = {'Succeed': True, 'Datas': []}
res = {'Succeed': True}
datas = request.httprequest.data
ret = json.loads(datas)
if 'DeviceId' in ret:
@@ -361,4 +360,3 @@ class Manufacturing_Connect(http.Controller):
res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
logging.info('AGVDownProduct error:%s' % e)
return json.JSONEncoder().encode(res)

View File

@@ -149,7 +149,7 @@ class ResMrpWorkOrder(models.Model):
params = [tomorrow, tomorrow, tomorrow, tomorrow]
if production_line:
sql += "AND production_line_id = %s"
params.append(production_line)
params.append(production_line)
self.env.cr.execute(sql, params)
ids = [t[0] for t in self.env.cr.fetchall()]
return [('id', 'in', ids)]