工单异常处理

jikimo_workorder_exception/__manifest__.py

@@ -9,7 +9,6 @@
     'website': 'https://www.sf.jikimo.com',
     'depends': ['sf_manufacturing', 'sf_mrs_connect'],
     'data': [
-        # 'views/jikimo_workorder_exception_views.xml',
         'views/mrp_workorder_views.xml',
         'security/ir.model.access.csv',
     ],

jikimo_workorder_exception/controllers/main.py

@@ -63,15 +63,8 @@ class SfMrsConnectController(Sf_Mrs_Connect):
         if res.get('production_ids'):
             try:
                 productions = request.env['mrp.production'].sudo().search([('id', 'in', res.get('production_ids'))])
-                if productions.workorder_ids.exception_ids:
-                    pending_exception = productions.workorder_ids.exception_ids.filtered(
-                        lambda exc: exc.state == 'pending' and exc.exception_code in ['YC0001', 'YC0004']
-                    )
-                    if pending_exception:
-                        pending_exception.write({
-                            'completion_time': fields.Datetime.now(),
-                            'state': 'done'
-                        })
+                if productions.workorder_ids:
+                    productions.workorder_ids.handle_exception(['YC0001', 'YC0004'])
             except Exception as e:
                 _logger.info('更新工单异常记录失败:%s' % e)
         return json.JSONEncoder().encode(res)
@@ -90,17 +83,7 @@ class ManufactruingController(Manufacturing_Connect):
         if res.get('workorder_id'):
             try:
                 workorder = request.env['mrp.workorder'].sudo().browse(int(res.get('workorder_id')))
-                if workorder.exception_ids:
-                    _logger.info('workorder.exception_ids:%s' % workorder.exception_ids)
-                    pending_exception = workorder.exception_ids.filtered(
-                        lambda exc: exc.state == 'pending' and exc.exception_code in ['YC0002', 'YC0003']
-                    )
-                    _logger.info('pending_exception:%s' % pending_exception)
-                    if pending_exception:
-                        pending_exception.write({
-                            'completion_time': fields.Datetime.now(),
-                            'state': 'done'
-                        })
+                workorder.handle_exception(['YC0002', 'YC0003'])
             except Exception as e:
                 _logger.info('更新工单异常记录失败:%s' % e)
         return json.JSONEncoder().encode(res)

jikimo_workorder_exception/models/mrp_workorder.py

@@ -1,4 +1,7 @@
 from odoo import models, fields
+import logging
+
+_logger = logging.getLogger(__name__)
 
 class MrpWorkorder(models.Model):
     _inherit = 'mrp.workorder'
@@ -15,4 +18,23 @@ class MrpWorkorder(models.Model):
                     'completion_time': fields.Datetime.now(),
                     'state': 'done'
                 })
-        return super(MrpWorkorder, self).write(values)
+        return super(MrpWorkorder, self).write(values)
+    
+    def handle_exception(self, exception_codes):
+        """
+            处理异常
+            :param exception_codes: 需要处理的异常编码列表
+        """
+        if not isinstance(exception_codes, list):
+            exception_codes = [exception_codes]
+        if self.exception_ids:
+            _logger.info('workorder.exception_ids:%s' % self.exception_ids)
+            pending_exception = self.exception_ids.filtered(
+                lambda exc: exc.state == 'pending' and exc.exception_code in exception_codes
+            )
+            _logger.info('pending_exception:%s' % pending_exception)
+            if pending_exception:
+                pending_exception.write({
+                    'completion_time': fields.Datetime.now(),
+                    'state': 'done'
+                })

jikimo_workorder_exception/tests/__init__.py

@@ -0,0 +1,2 @@
+from . import common
+from . import test_jikimo_workorder_exception

jikimo_workorder_exception/tests/common.py

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from odoo import fields, Command
+from odoo.tests.common import TransactionCase, HttpCase, tagged, Form
+
+import json
+import time
+import base64
+from lxml import etree
+
+@tagged('post_install', '-at_install')
+class TestJikimoWorkorderExceptionCommon(TransactionCase):
+
+    def setUp(self):
+        super(TestJikimoWorkorderExceptionCommon, self).setUp()
+        # 获取名字为“1#自动生产线”的制造中心
+        workcenter = self.env['mrp.workcenter'].search([('name', '=', '1#自动生产线')], limit=1)
+        # 创建一个产品
+        product_product = self.env['product.product'].create({
+            'name': '测试产品',
+            'type': 'product',
+            })
+        uom_unit = self.env.ref('uom.product_uom_unit')
+        # 创建一个bom
+        self.bom = self.env['mrp.bom'].create({
+            'product_id': product_product.id,
+            'product_tmpl_id': product_product.product_tmpl_id.id,
+            'product_uom_id': uom_unit.id,
+            'product_qty': 1.0,
+            'type': 'normal',
+         })
+        # 创建一个制造订单
+        self.production = self.env['mrp.production'].create({
+            'name': 'Test Production',
+            'product_id': product_product.id,
+            'bom_id': self.bom.id,
+            'company_id': self.env.ref('base.main_company').id,
+        })
+        # 创建一个测试工单
+        self.workorder = self.env['mrp.workorder'].create({
+            'name': 'Test order',
+            'workcenter_id': workcenter.id,
+            'product_uom_id': self.bom.product_uom_id.id,
+            'production_id': self.production.id,
+            'duration_expected': 1.0,
+            'rfid_code': 'test-123456',
+            'routing_type': 'CNC加工'
+        })

jikimo_workorder_exception/tests/test_jikimo_workorder_exception.py

@@ -0,0 +1,53 @@
+import json
+from datetime import datetime
+from odoo.addons.jikimo_workorder_exception.tests.common import TestJikimoWorkorderExceptionCommon
+
+class TestJikimoWorkorderException(TestJikimoWorkorderExceptionCommon):
+
+    def test_create_exception_record(self):
+        exception_record = self.env['jikimo.workorder.exception'].create({
+            'workorder_id': self.workorder.id,
+            'exception_code': 'YC0001',
+            'exception_content': '无CNC编程'
+        })
+       
+        self.assertTrue(exception_record)
+        self.assertEqual(exception_record.exception_content, '无CNC编程')
+        self.assertEqual(exception_record.workorder_id.id, self.workorder.id)
+        self.assertEqual(exception_record.exception_code, 'YC0001')
+
+    def test_handle_exception(self):
+        exception_record = self.env['jikimo.workorder.exception'].create({
+            'workorder_id': self.workorder.id,
+            'exception_code': 'YC0001',
+            'exception_content': '无CNC编程'
+        })
+        self.workorder.handle_exception('YC0001')
+        self.assertEqual(exception_record.state, 'done')
+        # 判断完成时间是否为当前分钟
+        self.assertEqual(exception_record.completion_time.minute, datetime.now().minute)
+
+    def test_handle_exception_with_invalid_code(self):
+        exception_record = self.env['jikimo.workorder.exception'].create({
+            'workorder_id': self.workorder.id,
+            'exception_code': 'YC0001',
+            'exception_content': '无CNC编程'
+        })
+        self.workorder.handle_exception(['YC0002', 'YC0004'])
+        self.assertEqual(exception_record.state, 'pending')
+        self.assertEqual(exception_record.completion_time, False) 
+    
+
+    def test_handle_exception_with_test_results(self):
+        exception_record = self.env['jikimo.workorder.exception'].create({
+            'workorder_id': self.workorder.id,
+            'exception_code': 'YC0005',
+            'exception_content': '工单加工失败'
+        })
+        self.workorder.write({
+            'test_results': '返工',
+            'reason': 'cutter',
+            'detailed_reason': '刀坏了',
+        })
+        self.assertEqual(exception_record.state, 'done')
+        self.assertEqual(exception_record.completion_time.minute, datetime.now().minute)

jikimo_workorder_exception/views/jikimo_workorder_exception_views.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data>
-        <record id="jikimo_workorder_exception_list_view" model="ir.ui.view">
-            <field name="name">jikimo.workorder.exception.tree</field>
-            <field name="model">jikimo.workorder.exception</field>
-            <field name="arch" type="xml">
-                
-            </field>
-        </record>
-    </data>
-</odoo>

jikimo_workorder_exception/views/mrp_workorder_views.xml

@@ -7,7 +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">
-                    <page string="异常记录" name="workorder_exception">
+                    <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">
                                 <field name="exception_content" string="反馈的异常/问题信息"/>