From 5916b4a740a5f9137b0d345cc672cf717d84e3d5 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Thu, 22 Feb 2024 18:52:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=8E=A5=E5=8F=A3=E5=92=8Chttp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_bf_connect/models/http.py | 4 ++-- sf_manufacturing/controllers/controllers.py | 3 +-- sf_manufacturing/models/mrp_workorder.py | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sf_bf_connect/models/http.py b/sf_bf_connect/models/http.py index ed344f2e..8b07bdaf 100644 --- a/sf_bf_connect/models/http.py +++ b/sf_bf_connect/models/http.py @@ -46,7 +46,7 @@ class Http(models.AbstractModel): _logger.info('check_sf_str:%s' % check_sf_str) _logger.info('check_str:%s' % check_str) _logger.info('sf_secret_key:%s' % factory_secret.sf_secret_key) - # if check_sf_str != datas['HTTP_CHECKSTR']: - # raise AuthenticationError('数据校验不通过') + if check_sf_str != datas['HTTP_CHECKSTR']: + raise AuthenticationError('数据校验不通过') else: raise AuthenticationError('请求参数中无token') diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py index 222ff983..e19c89a8 100644 --- a/sf_manufacturing/controllers/controllers.py +++ b/sf_manufacturing/controllers/controllers.py @@ -22,8 +22,7 @@ class Manufacturing_Connect(http.Controller): ret = json.loads(datas) logging.info('RfidCode:%s' % ret['RfidCode']) if 'RfidCode' in ret: - workorder = request.env['mrp.workorder'].sudo().search( - [('rfid_code', '=', ret['RfidCode']), ('routing_type', '=', '装夹预调')]) + workorder = request.env['mrp.workorder'].sudo().search([('rfid_code', '=', ret['RfidCode'])]) if workorder: for item in workorder: res['Datas'].append({ diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index fa9a438e..d6ab48af 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -135,6 +135,8 @@ class ResMrpWorkOrder(models.Model): workpiece_delivery_ids = fields.One2many('sf.workpiece.delivery', 'workorder_id', '工件配送') is_delivery = fields.Boolean('是否配送完成', default=False) rfid_code = fields.Char('RFID') + production_line_id = fields.Many2one('sf.production.line', related='production_id.production_line_id', + string='生产线') def get_plan_workorder(self, production_line): tomorrow = (date.today() + timedelta(days=+1)).strftime("%Y-%m-%d") @@ -875,5 +877,3 @@ class CMMprogram(models.Model): post_processing_name = fields.Char('后处理名称') program_date = fields.Datetime('程序日期') workorder_id = fields.Many2one('mrp.workorder', string="工单") - -