Accept Merge Request #1642: (feature/part_number -> develop)

Merge Request: 多制造订单生成工艺有误

Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1642

quality_control/models/quality.py

@@ -7,6 +7,7 @@ from datetime import datetime
 import random
 
 from odoo import api, models, fields, _
+from odoo.api import depends
 from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT, float_round
 from odoo.osv.expression import OR
 
@@ -122,7 +123,13 @@ class QualityPoint(models.Model):
 
 class QualityCheck(models.Model):
     _inherit = "quality.check"
-
+    part_name = fields.Char('零件名称',  compute='_compute_part_name_number', readonly=True)
+    part_number = fields.Char('零件图号', compute='_compute_part_name_number', readonly=True)
+    @depends('product_id')
+    def _compute_part_name_number(self):
+        for record in self:
+            record.part_number = record.product_id.part_number
+            record.part_name = record.product_id.part_name
     failure_message = fields.Html(related='point_id.failure_message', readonly=True)
     measure = fields.Float('Measure', default=0.0, digits='Quality Tests', tracking=True)
     measure_success = fields.Selection([

quality_control/views/quality_views.xml

@@ -389,6 +389,8 @@
                 <field name="name" decoration-bf="1"/>
                 <field name="measure_on" optional="show"/>
                 <field name='product_id' optional="show"/>
+                <field name="part_name" optional="hide"/>
+                <field name='part_number' optional="show"/>
                 <field name="lot_id" invisible="context.get('show_lots_text')"/>
                 <field name="lot_name" invisible="not context.get('show_lots_text')"/>
                 <field name="picking_id" optional="hide" string="Transfer"/>

sf_manufacturing/models/purchase_order.py

@@ -31,3 +31,13 @@ class PurchaseOrder(models.Model):
 class PurchaseOrderLine(models.Model):
     _inherit = 'purchase.order.line'
     part_number = fields.Char('零件图号', related='product_id.part_number', readonly=True)
+    related_product = fields.Many2one('product.product',compute='_compute_related_product', string='关联产品',help='经此产品工艺加工成的成品')
+    @api.depends('order_id.origin')
+    def _compute_related_product(self):
+        for record in self:
+            if record.product_id.detailed_type:
+                production_id = self.env['mrp.production'].search([('name', '=', record.order_id.origin)])
+                record.related_product = production_id.product_id if production_id else False
+            else:
+                record.related_product = False
+

sf_manufacturing/models/sf_technology_design.py

@@ -99,6 +99,7 @@ class sf_technology_design(models.Model):
             if not production_technology_designs_dict.get(technology_design.group_uniq_id):
                 technology_design = technology_design.get_technology_design()
                 technology_design.update({'production_id': production_id})
+                technology_design.pop('group_uniq_id')
                 self.env['sf.technology.design'].create(technology_design)
 
 

sf_manufacturing/views/purchase_order_view.xml

@@ -7,6 +7,7 @@
             <field name="inherit_id" ref="purchase.purchase_order_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="after">
+                    <field name="related_product" optional="show"/>
                     <field name="part_number" optional="show"/>
                 </xpath>
             </field>

sf_quality/models/quality_cnc_test.py

@@ -16,7 +16,7 @@ class SfQualityCncTest(models.Model):
     equipment_id = fields.Many2one(related='workorder_id.equipment_id', string='加工设备')
     production_line_id = fields.Many2one(related='workorder_id.production_line_id',
                                          string='生产线')
-    part_number = fields.Char(related='workorder_id.part_number', string='成品零件图号')
+    part_number = fields.Char(related='workorder_id.part_number', string='零件图号')
     detection_report = fields.Binary(related='workorder_id.detection_report', readonly=True, string='检测报告')
     state = fields.Selection([
         ('waiting', '待判定'),