From 2ba9695c3429233ea8150c380d0c82eb1fac7618 Mon Sep 17 00:00:00 2001 From: hy <1298386937@qq.com> Date: Mon, 1 Jul 2024 09:47:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?//=20=E4=BF=AE=E5=A4=8D=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E8=A6=86=E7=9B=96=E8=A1=A8=E5=A4=B4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_frontend/static/src/scss/custom_style.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss index 7f11b5f5..0b6fb8bb 100644 --- a/jikimo_frontend/static/src/scss/custom_style.scss +++ b/jikimo_frontend/static/src/scss/custom_style.scss @@ -526,4 +526,8 @@ div:has(.o_required_modifier) > label::before { // 设置表单页面label文本不换行 .o_form_view .o_group .o_wrap_label .o_form_label { white-space: nowrap; +} +// 修复表格内容覆盖表头bug +.o_list_renderer .o_list_table tbody th { + position: unset; } \ No newline at end of file From 726c3aede1a20397ea3e1613912376115d36daf0 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Mon, 1 Jul 2024 09:52:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E6=89=AB=E6=8F=8F=E7=BB=91=E5=AE=9A=E6=89=98=E7=9B=98?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_workorder.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 09270dae..e670442f 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -1266,6 +1266,7 @@ class SfWorkOrderBarcodes(models.Model): _inherit = ["mrp.workorder", "barcodes.barcode_events_mixin"] def on_barcode_scanned(self, barcode): + logging.info('Rfid:%s' % barcode) workorder = self.env['mrp.workorder'].browse(self.ids) # workorder_preset = self.env['mrp.workorder'].search( # [('routing_type', '=', '装夹预调'), ('rfid_code', '=', barcode)]) @@ -1309,7 +1310,7 @@ class SfWorkOrderBarcodes(models.Model): self.process_state = '待检测' self.date_start = datetime.now() else: - raise UserError('该托盘信息不存在！！！') + raise UserError('没有找到Rfid为【%s】的托盘信息！！！' % barcode) # stock_move_line = self.env['stock.move.line'].search([('lot_name', '=', barcode)]) # if stock_move_line.product_id.categ_type == '夹具': # workorder.write({