Merge tag '修复编程单下发接口' into develop

sf_manufacturing/models/mrp_workorder.py

@@ -1061,7 +1061,7 @@ class CNCprocessing(models.Model):
     _order = 'sequence_number,id'
 
     cnc_id = fields.Many2one('ir.attachment')
-    sequence_number = fields.Char('序号')
+    sequence_number = fields.Integer('序号')
     program_name = fields.Char('程序名')
     functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型')
     cutting_tool_name = fields.Char('刀具名称')
@@ -1123,6 +1123,8 @@ class CNCprocessing(models.Model):
             'cutting_tool_extension_length': obj['cutting_tool_extension_length'],
             'cutting_tool_handle_type': obj['cutting_tool_handle_type'],
             'estimated_processing_time': obj['estimated_processing_time'],
+            'program_path': obj['program_path'],
+            'cnc_id': obj['cnc_id'].id,
             'remark': obj['remark']
         })
         return cnc_processing_str
@@ -1513,7 +1515,7 @@ class WorkPieceDelivery(models.Model):
                                 'task_delivery_time': fields.Datetime.now(),
                                 'status': '待配送'
                             })
-                            if delivery_item == "上产线":
+                            if delivery_item.type == "上产线":
                                 delivery_item.workorder_id.write({'is_delivery': True})
             else:
                 raise UserError(ret['message'])

sf_manufacturing/models/tray.py

@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+# Part of SmartGo. See LICENSE file for full copyright and licensing details.
+import base64
+from io import BytesIO
+from odoo import api, fields, models, SUPERUSER_ID, _
+from pystrich.code128 import Code128Encoder
+
+
+class Tray(models.Model):
+    _inherit = 'sf.tray'
+    _description = '托盘'
+    qr_image = fields.Binary(string="托盘二维码", compute='compute_qr_image')
+    production_id = fields.Many2one('mrp.production', string='制造订单',
+                                    related='workorder_id.production_id'
+                                    )
+    workorder_id = fields.Many2one('mrp.workorder', string="工单"
+                                   )
+
+    @api.onchange('production_id')
+    def updateTrayState(self):
+        if self.workorder_id != False and self.create_date != False:
+
+            self.state = '占用'
+        else:
+            self.state = '空闲'
+
+    def unclamp(self):
+        self.workorder_id = False
+        self.production_id = False
+        self.state = '空闲'
+
+    @api.depends('code')
+    def compute_qr_image(self):
+        for item in self:
+            if not item.code:
+                item.qr_image = False
+                continue
+            # 根据code动态生成二维码图片
+            # qr = qrcode.QRCode(
+            #     version=1,
+            #     error_correction=qrcode.constants.ERROR_CORRECT_L,
+            #     box_size=10,
+            #     border=4,
+            # )
+            # qr.add_data(item.code)
+            # qr.make(fit=True)
+            # img = qr.make_image()
+            # 生成条形码文件
+            # bar = barcode.get("ean13", "123456789102", writer=ImageWriter())
+            # a = bar.get_fullcode()
+            # b = bar.save('occ')
+            # 生成条形码图片
+            partner_encoder = Code128Encoder(item.code)
+            # 转换bytes流
+            temp = BytesIO()
+            partner_encoder.save(temp)
+            # img.save(temp, format='PNG')
+            qr_image = base64.b64encode(temp.getvalue())
+            item.qr_image = qr_image