Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺

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;
 }

sf_manufacturing/models/mrp_workorder.py

@@ -1252,6 +1252,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)])
@@ -1295,7 +1296,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({