Merge branch 'release/release_2.8'

Merge Request: 修复采购单没有接收产品的问题

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1781?initial=true

jikimo_purchase_tier_validation/models/models.py

@@ -21,13 +21,23 @@ class jikimo_purchase_tier_validation(models.Model):
 
     def button_confirm(self):
         for record in self:
-            if record.need_validation and record.validation_status != 'validated':
-                raise ValidationError(_('此操作需要至少对一条记录进行审批。\n请发起审批申请。'))
+            # if record.need_validation and record.validation_status != 'validated':
+            #     raise ValidationError(_('此操作需要至少对一条记录进行审批。\n请发起审批申请。'))
             if record.state in ['to approve']:
                 raise ValidationError(_('请先完成审批。'))
+            # if record.state == 'approved':
+            #     record.state = 'purchase'
+        res = super(jikimo_purchase_tier_validation, self).button_confirm()
+        for record in self:
             if record.state == 'approved':
-                record.state = 'purchase'
-        return super().button_confirm()
+                record.order_line._validate_analytic_distribution()
+                record._add_supplier_to_product()
+                # Deal with double validation process
+                if record._approval_allowed():
+                    record.button_approve()
+                if record.partner_id not in record.message_partner_ids:
+                    record.message_subscribe([record.partner_id.id])
+        return res
 
     # def button_confirm(self):
     #     self = self.with_context(skip_validation=True)
@@ -87,15 +97,14 @@ class jikimo_purchase_tier_validation(models.Model):
 
     def _validate_tier(self, tiers=False):
         res = super(jikimo_purchase_tier_validation, self)._validate_tier(tiers)
-        tier_reviews = tiers or self.review_ids
 
         # 检查是否所有审批都已通过
         all_approved = all(
             tier_review.status == 'approved'
-            for tier_review in tier_reviews
+            for tier_review in self.review_ids
         )
 
-        if all_approved and tier_reviews:  # 确保有审批记录
+        if self.review_ids and all_approved:  # 确保有审批记录
             self.state = 'approved'
 
         return res

jikimo_workorder_exception/views/mrp_workorder_views.xml

@@ -7,6 +7,7 @@
             <field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook/page[last()]" position="after">
+                    <field name="routing_type" invisible="1"/>
                     <page string="异常记录" name="workorder_exception" attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}">
                         <field name="exception_ids" nolabel="1" readonly="1">
                             <tree create="false" delete="false" edit="false">

sf_manufacturing/controllers/controllers.py

@@ -596,6 +596,9 @@ class Manufacturing_Connect(http.Controller):
                                                 if panel_workorder:
                                                     panel_workorder.write({'production_line_state': '已下产线'})
                                                     workorder.write({'state': 'to be detected'})
+                                                    workorder.check_ids.filtered(
+                                                        lambda ch: ch.quality_state == 'waiting').write(
+                                                        {'quality_state': 'none'})
                                     else:
                                         res = {'Succeed': False, 'ErrorCode': 204,
                                                'Error': 'DeviceId为%s没有对应的已配送工件数据' % ret['DeviceId']}

sf_manufacturing/models/mrp_production.py

@@ -350,7 +350,7 @@ class MrpProduction(models.Model):
             if any((wo.test_results == '返工' and wo.state == 'done' and
                     (production.programming_state in ['已编程'] or wo.individuation_page_PTD is True))
                    or (wo.is_rework is True and wo.state == 'done' and production.programming_state in ['编程中', '已编程'])
-                   for wo in production.workorder_ids):
+                   for wo in production.workorder_ids) or production.is_rework is True:
                 production.state = 'rework'
             if any(wo.test_results == '报废' and wo.state == 'done' for wo in production.workorder_ids):
                 production.state = 'scrap'
@@ -1256,9 +1256,9 @@ class MrpProduction(models.Model):
                 'default_production_id': self.id,
                 'default_workorder_ids': workorder_ids.ids if workorder_ids.ids != [] else self.workorder_ids.ids,
                 'default_hidden_workorder_ids': ','.join(map(str, work_id_list)) if work_id_list != [] else '',
-                'default_reprogramming_num': cloud_programming.get('reprogramming_num'),
-                'default_programming_state': cloud_programming.get('programming_state'),
-                'default_is_reprogramming': True if cloud_programming.get('programming_state') in ['已下发'] else False
+                'default_reprogramming_num': cloud_programming.get('reprogramming_num') if cloud_programming else '',
+                'default_programming_state': cloud_programming.get('programming_state') if cloud_programming else '',
+                'default_is_reprogramming': True if cloud_programming and (cloud_programming.get('programming_state') in ['已下发']) else False
             }
         }
 
@@ -1526,15 +1526,16 @@ class MrpProduction(models.Model):
             product_id = self.env['product.product'].browse(vals['product_id'])
             is_self_process = product_id.materials_type_id and product_id.materials_type_id.gain_way and product_id.materials_type_id.gain_way != '自加工'
             is_customer_provided = product_id.is_customer_provided
-            if not is_custemer_group_id.get(is_customer_provided) and is_self_process:
-                is_custemer_group_id[is_customer_provided] = self.env["procurement.group"].create({'name': vals.get('name')}).id
+            key = f"{is_self_process}_{is_customer_provided}"
+            if not is_custemer_group_id.get(key):
+                is_custemer_group_id[key] = self.env["procurement.group"].create({'name': vals.get('name')}).id
             # if not (is_first_customer or is_first_not_customer) and is_self_process:
             #     is_first = True
             #     group_id = self.env["procurement.group"].create({'name': vals.get('name')}).id
             if not vals.get('procurement_group_id'):
                 if product_id.product_tmpl_id.single_manufacturing:
-                    if product_id.categ_id.name == '成品' and is_self_process:
-                        vals['procurement_group_id'] = is_custemer_group_id[is_customer_provided]
+                    if product_id.categ_id.name == '成品':
+                        vals['procurement_group_id'] = is_custemer_group_id[key]
                         continue
                     if product_id.id not in product_group_id.keys():
                         procurement_group_vals = self._prepare_procurement_group_vals(vals)
@@ -1544,7 +1545,7 @@ class MrpProduction(models.Model):
                     else:
                         vals['procurement_group_id'] = product_group_id[product_id.id]
                 else:
-                    vals['procurement_group_id'] = is_custemer_group_id[is_customer_provided]
+                    vals['procurement_group_id'] = is_custemer_group_id[key]
         return super(MrpProduction, self).create(vals_list)
 
     @api.depends('procurement_group_id.stock_move_ids.created_purchase_line_id.order_id',
@@ -1673,13 +1674,13 @@ class MrpProduction(models.Model):
             url = '/api/intelligent_programming/reset_state_again'
             config_url = configsettings['sf_url'] + url
             ret = requests.post(config_url, json=res, data=None, headers=config_header)
-            ret = ret.json()
-            result = json.loads(ret['result'])
-            logging.info('update_programming_state-ret:%s' % result)
-            if result['status'] == 1:
-                self.write({'is_rework': True})
-            else:
-                raise UserError(ret['message'])
+            # ret = ret.json()
+            # result = json.loads(ret['result'])
+            # logging.info('update_programming_state-ret:%s' % result)
+            # if result['status'] == 1:
+            #     self.write({'is_rework': True})
+            # else:
+            #     raise UserError(ret['message'])
         except Exception as e:
             logging.info('update_programming_state error:%s' % e)
             raise UserError("更新编程单状态失败,请联系管理员")

sf_manufacturing/models/mrp_workorder.py

@@ -1503,7 +1503,7 @@ class ResMrpWorkOrder(models.Model):
                                             store=True)
     individuation_page_ids = fields.Many2many('sf.work.individuation.page', string='个性化记录', store=True,
                                               compute='_compute_individuation_page_ids')
-    individuation_page_PTD = fields.Boolean('个性化记录(后置三元检测PTD)', default=False)
+    individuation_page_PTD = fields.Boolean('个性化记录(是否显示后置三元检测[PTD]页签)', default=False)
 
     @api.depends('name')
     def _compute_routing_workcenter_id(self):
@@ -1543,7 +1543,8 @@ class ResMrpWorkOrder(models.Model):
         # 修改工单状态
         self.write({'state': 'to be detected'})
         # 若关联的【质量检查_需送检】=true，则质量检查单的状态从“等待”更新为“待处理”
-        self.check_ids.filtered(lambda ch: ch.is_inspect is True).write({'quality_state': 'none'})
+        self.check_ids.filtered(lambda ch: ch.is_inspect is True and ch.quality_state == 'waiting').write(
+            {'quality_state': 'none'})
 
 
 class CNCprocessing(models.Model):

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -74,7 +74,9 @@
                 <xpath expr="//field[@name='production_real_duration']" position="attributes">
                     <attribute name="invisible">1</attribute>
                 </xpath>
-
+                <xpath expr="//field[@name='state']" position="after">
+                     <field name="programming_state" optional="hide"/>
+                </xpath>
             </field>
         </record>
 

sf_manufacturing/views/mrp_workorder_view.xml

@@ -126,9 +126,10 @@
         <field name="model">mrp.workorder</field>
         <field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/>
         <field name="arch" type="xml">
-            <form position="inside">
-                <field name="_barcode_scanned" widget="barcode_handler" invisible="1"/>
-            </form>
+            <xpath expr="//form" position="inside">
+                <!-- 其他可见字段 -->
+                <field name="_barcode_scanned" widget="barcode_handler"/>
+            </xpath>
             <!--             <xpath expr="//form" position="inside"> -->
             <!--                 <script src="sf_manufacturing/static/src/js/customRFID.js"/> -->
             <!--             </xpath> -->
@@ -181,7 +182,7 @@
                 <button name="button_pending" type="object" string="暂停" class="btn-warning"
                         attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
                 <button name="button_finish" type="object" string="完成" class="btn-success" confirm="是否确认完工"
-                        attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
+                        attrs="{'invisible': ['|', '|', '|',('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False),'&amp;','&amp;',('state', 'in', ('progress')), ('is_inspect', '=', True), ('routing_type','!=','CNC加工')]}"/>
 
                 <button name="%(mrp.act_mrp_block_workcenter_wo)d" type="action" string="阻塞"
                         context="{'default_workcenter_id': workcenter_id}" class="btn-danger"
@@ -311,7 +312,7 @@
             <xpath expr="//page[1]" position="before">
                 <page string="工件装夹" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
                     <group>
-                        <field name="_barcode_scanned" widget="barcode_handler"/>
+<!--                         <field name="_barcode_scanned" widget="barcode_handler"/> -->
                         <group string="托盘">
                             <field name="tray_serial_number" readonly="1" string="序列号"/>
                         </group>
@@ -532,15 +533,15 @@
                 <page string="后置三元检测" attrs='{"invisible": [("individuation_page_PTD", "=", False)]}'>
                     <group>
                         <field name="test_results"
-                               attrs='{"readonly":[("state","!=","to be detected"), "|",("routing_type","=","CNC加工"),("is_inspect", "=", True)],
+                               attrs='{"readonly":["&amp;","|",("state","!=","to be detected"), "|",("routing_type","=","CNC加工"),("is_inspect", "=", True),("state","in",["done","rework"])],
                                "invisible":[("results","!=",False)]}'/>
                         <!--                        <field name="is_remanufacture" attrs='{"invisible":[("test_results","!=","报废")]}'/>-->
                         <!--                        <field name="is_fetchcnc"-->
                         <!--                               attrs='{"invisible":["|",("test_results","=","合格"),("is_remanufacture","=",False)]}'/>-->
                         <field name="reason"
-                               attrs='{"required":[("test_results","!=","合格")],"invisible":[("test_results","=","合格")]}'/>
+                               attrs='{"required":[("test_results","!=","合格")],"invisible":[("test_results","=","合格")],"readonly":[("state","in",("done", "rework"))]}'/>
                         <field name="detailed_reason"
-                               attrs='{"required":[("test_results","!=","合格")],"invisible":[("test_results","=","合格")]}'/>
+                               attrs='{"required":[("test_results","!=","合格")],"invisible":[("test_results","=","合格")],"readonly":[("state","in",("done", "rework"))]}'/>
                         <!--                                                <field name="results" readonly="1" attrs='{"invisible":[("results","!=","合格")]}'/>-->
                         <field name="detection_report" attrs='{"invisible":[("results","!=",False)]}'
                                widget="pdf_viewer" readonly="1"/>

sf_manufacturing/views/purchase_order_view.xml

@@ -4,8 +4,14 @@
         <record model="ir.ui.view" id="view_purchase_order_line_form_inherit_sf1">
             <field name="name">purchase.order.form.inherit.sf</field>
             <field name="model">purchase.order</field>
-            <field name="inherit_id" ref="purchase.purchase_order_form"/>
+            <field name="inherit_id" ref="purchase_order_approved.purchase_order_form"/>
             <field name="arch" type="xml">
+                <field name="order_line" position="attributes">
+                    <attribute
+                            name="attrs"
+                    >{'readonly': [('state', '!=', 'draft')]}
+                    </attribute>
+                </field>
                 <xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="after">
                     <field name="related_product" optional="show"/>
                     <field name="part_number" optional="show"/>

sf_manufacturing/wizard/rework_wizard.py

@@ -281,7 +281,8 @@ class ReworkWizard(models.TransientModel):
                                 {'programming_state': '编程中', 'work_state': '编程中', 'is_rework': True})
                 # =================================================
                 if self.production_id.state == 'progress':
-                    self.production_id.write({'programming_state': '已编程', 'work_state': '已编程'})
+                    if self.programming_state:
+                        self.production_id.write({'programming_state': '已编程', 'work_state': '已编程'})
                     if self.reprogramming_num >= 1 and self.programming_state == '已编程':
                         productions_not_delivered = self.env['mrp.production'].search(
                             [('programming_no', '=', self.production_id.programming_no),

sf_quality/__manifest__.py

@@ -18,6 +18,7 @@
         'security/ir.model.access.csv',
         'views/view.xml',
         'views/quality_cnc_test_view.xml',
+        'views/mrp_workorder.xml',
         'views/quality_check_view.xml'
     ],
 

sf_quality/models/__init__.py

@@ -4,3 +4,4 @@
 from . import custom_quality
 from . import quality
 from . import quality_cnc_test
+from . import mrp_workorder

sf_quality/models/mrp_workorder.py

@@ -0,0 +1,28 @@
+from odoo import api, fields, models
+
+
+class ResMrpWorkOrder(models.Model):
+    _inherit = 'mrp.workorder'
+
+    check_ids_state = fields.Selection([('none', '待处理'), ('pass', '通过的'), ('fail', '失败的')], store=True,
+                                       compute='_compute_check_ids_state')
+
+    @api.depends('check_ids.quality_state')
+    def _compute_check_ids_state(self):
+        for mw in self:
+            if mw.check_ids:
+                if all(check_id.quality_state == 'pass' for check_id in mw.check_ids):
+                    mw.check_ids_state = 'pass'
+                elif any(check_id.quality_state == 'fail' for check_id in mw.check_ids):
+                    mw.check_ids_state = 'fail'
+                else:
+                    mw.check_ids_state = 'none'
+
+    def action_open_quality_check_work_sf(self):
+        return {
+            'res_model': 'quality.check',
+            'type': 'ir.actions.act_window',
+            'name': '质量检查',
+            'domain': [('workorder_id', '=', self.id)],
+            'view_mode': 'tree,form',
+        }

sf_quality/models/quality.py

@@ -17,6 +17,7 @@ class QualityCheck(models.Model):
         ('fail', '失败的')], string='状态', tracking=True, store=True,
         default='none', copy=False, compute='_compute_quality_state')
 
+    individuation_page_PTD = fields.Boolean('个性化记录(是否显示后置三元检测[PTD]页签)', related='workorder_id.individuation_page_PTD')
     work_state = fields.Selection(related='workorder_id.state', string='工单状态')
     processing_panel = fields.Char(related='workorder_id.processing_panel', string='加工面')
 
@@ -26,7 +27,7 @@ class QualityCheck(models.Model):
     model_file = fields.Binary(related='workorder_id.glb_file', string='加工模型')
 
     detection_report = fields.Binary(related='workorder_id.detection_report', readonly=True, string='检测报告')
-    test_results = fields.Selection([("合格", "合格"), ("返工", "返工"), ("报废", "报废")], string="检测结果",
+    test_results = fields.Selection([("合格", "合格"), ("返工", "返工")], string="检测结果",
                                     default='合格')
     reason = fields.Selection(
         [("programming", "编程"), ("cutter", "刀具"), ("clamping", "装夹"), ("operate computer", "操机"),
@@ -47,7 +48,7 @@ class QualityCheck(models.Model):
     @api.depends('point_id.is_inspect')
     def _compute_quality_state(self):
         for qc in self:
-            if qc.point_id.is_inspect and qc.quality_state == 'none':
+            if qc.point_id.is_inspect and qc.quality_state == 'none' and qc.workorder_id.state != 'to be detected':
                 qc.quality_state = 'waiting'
             elif not qc.point_id.is_inspect and qc.quality_state == 'waiting':
                 qc.quality_state = 'none'
@@ -62,6 +63,8 @@ class QualityCheck(models.Model):
         self.ensure_one()
         super().do_pass()
         if self.workorder_id:
+            if self.workorder_id.state in ('pending', 'waiting'):
+                raise ValidationError('工单未就绪!')
             # 1）将页签“判定结果”的检测结果值同步到【工单_后置三元检测_检测结果】
             if self.test_results in ['返工', '报废']:
                 raise ValidationError('请重新选择【判定结果】-【检测结果】')
@@ -74,6 +77,8 @@ class QualityCheck(models.Model):
         self.ensure_one()
         super().do_fail()
         if self.workorder_id:
+            if self.workorder_id.state in ('pending', 'waiting'):
+                raise ValidationError('工单未就绪!')
             # 1）将页签“判定结果”的检测结果值同步到【工单_后置三元检测_检测结果】
             if not self.test_results:
                 raise ValidationError('请填写【判定结果】里的信息')

sf_quality/views/mrp_workorder.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="mrp_workorder_quality_form_view_inherit" model="ir.ui.view">
+        <field name="name">mrp.workorder.view.form.inherit.quality</field>
+        <field name="model">mrp.workorder</field>
+        <field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/>
+        <field name="arch" type="xml">
+            <div name="button_box" position="inside">
+                <field name="check_ids_state" invisible="1"/>
+                <button name="action_open_quality_check_work_sf" groups="quality.group_quality_user" attrs="{'invisible': ['|',('check_ids_state', '!=', 'none'), ('check_ids', '=', [])]}" type="object" class="oe_stat_button" icon="fa-check">
+                    <span class="o_stat_text">质量检查</span>
+                </button>
+                <button name="action_open_quality_check_work_sf" groups="quality.group_quality_user" attrs="{'invisible': ['|',('check_ids_state', '!=', 'pass'), ('check_ids', '=', [])]}" type="object" class="oe_stat_button text-success" icon="fa-check">
+                    <span class="o_stat_text text-success">质量检查</span>
+                </button>
+                <button name="action_open_quality_check_work_sf" groups="quality.group_quality_user" attrs="{'invisible': ['|',('check_ids_state', '!=', 'fail'), ('check_ids', '=', [])]}" type="object" class="oe_stat_button text-danger" icon="fa-check">
+                    <span class="o_stat_text text-danger">质量检查</span>
+                </button>
+            </div>
+        </field>
+    </record>
+</odoo>

sf_quality/views/quality_check_view.xml

@@ -8,13 +8,16 @@
             <xpath expr="//field[@name='alert_ids']" position="after">
                 <field name="production_id" invisible="1"/>
                 <field name="work_state" invisible="1"/>
+                <field name="individuation_page_PTD" invisible="1"/>
                 <field name="production_line_id" attrs="{'invisible': [('production_id', '=', False)]}"/>
                 <field name="equipment_id" attrs="{'invisible': [('production_id', '=', False)]}"/>
                 <field name="model_file" widget="Viewer3D" string="模型" readonly="1" force_save="1"
-                       attrs="{'invisible': ['|', ('model_file', '=', False), ('production_id', '=', False)]}"/>
+                       attrs="{'invisible': ['|',('model_file', '=', False), ('production_id', '=', False)]}"/>
             </xpath>
             <xpath expr="//field[@name='partner_id']" position="after">
                 <field name="processing_panel" attrs="{'invisible': [('production_id', '=', False)]}"/>
+<!--                <field name="production_id" string="制造订单" readonly="1"-->
+<!--                       attrs="{'invisible': [('production_id', '=', False)]}"/>-->
                 <field name="workorder_id" string="工单号" readonly="1"
                        attrs="{'invisible': [('production_id', '=', False)]}"/>
                 <field name="is_inspect" attrs="{'invisible': [('production_id', '=', False)]}"/>
@@ -41,18 +44,26 @@
                     <field name="quality_standard" string="" widget="adaptive_viewer"/>
                 </page>
                 <page string="其他"
-                      attrs="{'invisible': ['|', ('quality_state', 'not in', ['pass', 'fail']), ('production_id', '=', False)]}">
+                      attrs="{'invisible': ['|',('quality_state', 'not in', ['pass', 'fail']), ('production_id', '=', False)]}">
                     <group>
                         <field name="write_uid" widget='many2one_avatar_user' string="判定人" readonly="1"/>
                         <field name="write_date" string="判定时间" readonly="1"/>
                     </group>
                 </page>
             </xpath>
+            <xpath expr="//header//button[@name='do_pass'][1]" position="attributes">
+                <attribute name="string">合格</attribute>
+            </xpath>
             <xpath expr="//header//button[@name='do_pass'][2]" position="attributes">
                 <attribute name="attrs">{'invisible': ['|',('quality_state', '!=', 'fail'),('work_state','in', ('done', 'rework'))]}</attribute>
+                <attribute name="string">合格</attribute>
+            </xpath>
+            <xpath expr="//header//button[@name='do_fail'][1]" position="attributes">
+                <attribute name="string">不合格</attribute>
             </xpath>
             <xpath expr="//header//button[@name='do_fail'][2]" position="attributes">
                 <attribute name="attrs">{'invisible': ['|',('quality_state', '!=', 'pass'),('work_state','in', ('done', 'rework'))]}</attribute>
+                <attribute name="string">不合格</attribute>
             </xpath>
         </field>
     </record>

sf_sale/models/sale_order.py

@@ -130,7 +130,10 @@ class ReSaleOrder(models.Model):
             'order_id': self.id,
             'product_id': product.id,
             'name': '%s/%s/%s/%s/%s/%s' % (
-                product.model_long, product.model_width, product.model_height, product.model_volume,
+                self.format_float(product.model_long),
+                self.format_float(product.model_width),
+                self.format_float(product.model_height), 
+                self.format_float(product.model_volume),
                 machining_accuracy_name,
                 product.materials_id.name),
             'price_unit': product.list_price,
@@ -143,6 +146,20 @@ class ReSaleOrder(models.Model):
         }
         return self.env['sale.order.line'].with_context(skip_procurement=True).create(vals)
 
+    def format_float(self, value):
+        # 将浮点数转换为字符串
+        value_str = str(value)
+        # 检查小数点的位置
+        if '.' in value_str:
+            # 获取小数部分
+            decimal_part = value_str.split('.')[1]
+            # 判断小数位数是否超过2位
+            if len(decimal_part) > 2:
+                # 超过2位则保留2位小数
+                return "{:.2f}".format(value)
+        # 否则保持原来的位数
+        return float(value_str)
+
     @api.constrains('order_line')
     def check_order_line(self):
         for item in self: