From 1e006b0bd736e6e11eca666c5327d3a537e7b602 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Wed, 21 Feb 2024 14:52:14 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B7=A5=E5=8D=95=E6=96=B0=E5=A2=9Erfid?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=202.=E4=BF=AE=E6=94=B9=E4=B8=AD=E6=8E=A7?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E7=9A=84=E5=B7=A5=E5=8D=95=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=203.=E5=BF=AB=E9=80=9F=E8=AE=A2=E5=8D=95=E6=9D=90=E6=96=99?= =?UTF-8?q?=EF=BC=8C=E5=9E=8B=E5=8F=B7=EF=BC=8C=E5=AE=A2=E6=88=B7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8F=AF=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_bf_connect/models/http.py | 2 ++ sf_manufacturing/controllers/controllers.py | 4 ++-- sf_manufacturing/models/mrp_workorder.py | 1 + sf_manufacturing/views/mrp_workorder_view.xml | 2 ++ sf_sale/models/quick_easy_order.py | 4 ++-- sf_sale/views/quick_easy_order_view.xml | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/sf_bf_connect/models/http.py b/sf_bf_connect/models/http.py index 8f546c88..ebd85439 100644 --- a/sf_bf_connect/models/http.py +++ b/sf_bf_connect/models/http.py @@ -21,6 +21,7 @@ class Http(models.AbstractModel): def _auth_method_sf_token(cls): # 从headers.environ中获取对方传过来的token,timestamp,加密的校验字符串 datas = request.httprequest.headers.environ + logging.info(datas) if 'HTTP_TOKEN' in datas: _logger.info('token:%s' % datas['HTTP_TOKEN']) # 查询密钥 @@ -40,6 +41,7 @@ class Http(models.AbstractModel): raise AuthenticationError('请求已过期') check_str = '%s%s%s' % (datas['HTTP_TOKEN'], post_time, factory_secret.sf_secret_key) check_sf_str = hashlib.sha1(check_str.encode('utf-8')).hexdigest() + _logger.info('check_str:%s' % check_sf_str) if check_sf_str != datas['HTTP_CHECKSTR']: raise AuthenticationError('数据校验不通过') else: diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py index 42b166b1..d75fbe69 100644 --- a/sf_manufacturing/controllers/controllers.py +++ b/sf_manufacturing/controllers/controllers.py @@ -20,9 +20,9 @@ class Manufacturing_Connect(http.Controller): res = {'Succeed': True, 'Datas': []} datas = request.httprequest.data ret = json.loads(datas) - logging.info('RfidCode:%s' % ret) + logging.info('RfidCode:%s' % ret['RfidCode']) workorder = request.env['mrp.workorder'].sudo().search( - [('production_id.name', '=', 'WH/MO/00071'), ('routing_type', '=', '装夹')]) + [('rfid_code', '=', ret['RfidCode']), ('routing_type', '=', '装夹预调')]) 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 01687177..e4db6346 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -133,6 +133,7 @@ class ResMrpWorkOrder(models.Model): preset_program_information = fields.Char(string="预调程序信息") workpiece_delivery_ids = fields.One2many('sf.workpiece.delivery', 'workorder_id', '工件配送') is_delivery = fields.Boolean('是否配送完成', default=False) + rfid_code = fields.Char('RFID') @api.onchange('is_ok') def _onchange_inspection_user_id(self): diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml index e825ef48..78313ad2 100644 --- a/sf_manufacturing/views/mrp_workorder_view.xml +++ b/sf_manufacturing/views/mrp_workorder_view.xml @@ -176,6 +176,8 @@ attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> +
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py index 7e6b8c78..ed52d9de 100644 --- a/sf_sale/models/quick_easy_order.py +++ b/sf_sale/models/quick_easy_order.py @@ -36,8 +36,8 @@ class QuickEasyOrder(models.Model): ('0.03', '±0.03mm'), ('0.02', '±0.02mm'), ('0.01', '±0.01mm')], string='加工精度', default='0.10') - material_id = fields.Many2one('sf.production.materials', '材料', compute='_compute_material_model', store=True) - material_model_id = fields.Many2one('sf.materials.model', '型号', compute='_compute_material_model', store=True) + material_id = fields.Many2one('sf.production.materials', '材料') + material_model_id = fields.Many2one('sf.materials.model', '型号') # process_id = fields.Many2one('sf.production.process', string='表面工艺') parameter_ids = fields.Many2many('sf.production.process.parameter', 'process_item_order_rel', string='可选参数') quantity = fields.Integer('数量', default=1) diff --git a/sf_sale/views/quick_easy_order_view.xml b/sf_sale/views/quick_easy_order_view.xml index 1654b890..3300fc27 100644 --- a/sf_sale/views/quick_easy_order_view.xml +++ b/sf_sale/views/quick_easy_order_view.xml @@ -47,7 +47,7 @@ - +