Accept Merge Request #760: (feature/修改机床参数bug -> 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/760?initial=true

sf_base/models/tool_base_new.py

@@ -106,8 +106,10 @@ class CuttingToolModel(models.Model):
     chuck_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
                                                  'standard_library_id', string='夹头基本参数')
     cutting_speed_ids = fields.One2many('sf.cutting.speed', 'standard_library_id', string='切削速度Vc')
-    feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz')
+    feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz',
-    feed_per_tooth_ids_3 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz')
+                                         domain=[('cutting_speed', '!=', False)])
+    feed_per_tooth_ids_3 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz',
+                                           domain=[('cutting_speed', '!=', False)])
 
     material_model_id = fields.Many2one('sf.materials.model', '材料型号')
     # 适用夹头型号可以多选

sf_base/models/tool_base_new.py.rej

@@ -0,0 +1,10 @@
+diff a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py	(rejected hunks)
+@@ -108,6 +108,4 @@
+     cutting_speed_ids = fields.One2many('sf.cutting.speed', 'standard_library_id', string='切削速度Vc')
+-    feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz',
+-                                         domain=[('cutting_speed', '!=', False)])
+-    feed_per_tooth_ids_3 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz',
+-                                           domain=[('cutting_speed', '!=', False)])
++    feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz')
++    feed_per_tooth_ids_3 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz')
+ 

sf_base/models/tool_other_features.py

@@ -162,6 +162,7 @@ class FeedPerTooth(models.Model):
     _order = 'blade_diameter,cutting_width_depth_id,materials_type_id'
 
     name = fields.Char('名称')
+    cutting_speed = fields.Char('切削速度', required=True)
     product_template_id = fields.Many2one('product.template')
     standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='标准库')
     blade_diameter = fields.Integer('刃部直径(mm)', readonly=True)

sf_machine_connect/views/SfWorkOrderBarcodes.xml

@@ -13,7 +13,7 @@
         <field name="arch" type="xml">
             <xpath expr="//group//field[@name='processing_panel']" position="after">
                 <!-- invisible="1" -->
-                <field name="_barcode_scanned" widget="barcode_handler" string="扫码" attrs='{"invisible": [("routing_type","!=","装夹")]}'/>
+                <field name="_barcode_scanned" widget="barcode_handler" string="扫码" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
             </xpath>
             <xpath expr="//page//field[@name='tray_code']" position="replace">
                 <field name="tray_code" widget="code"/>

sf_maintenance/security/ir.model.access.csv

@@ -1,10 +1,15 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_equipment_maintenance_standards,equipment_maintenance_standards,model_equipment_maintenance_standards,sf_group_equipment_user,1,1,1,1
+access_equipment_maintenance_standards,equipment_maintenance_standards,model_equipment_maintenance_standards,sf_group_equipment_user,1,1,1,0
-access_sf_maintenance_logs,sf_maintenance_logs,model_sf_maintenance_logs,sf_group_equipment_user,1,1,1,1
+access_sf_maintenance_logs,sf_maintenance_logs,model_sf_maintenance_logs,sf_group_equipment_user,1,0,0,0
-access_maintenance_equipment,maintenance_equipment,model_maintenance_equipment,sf_group_equipment_user,1,1,1,1
+access_sf_maintenance_logs,sf_maintenance_logs,model_sf_maintenance_logs,sf_group_equipment_manager,1,1,1,0
-access_maintenance_standards,maintenance_standards,model_maintenance_standards,sf_group_equipment_user,1,1,1,1
+access_maintenance_equipment,maintenance_equipment,model_maintenance_equipment,sf_group_equipment_user,1,0,0,0
-access_maintenance_standard_image,maintenance_standard_image,model_maintenance_standard_image,sf_group_equipment_user,1,1,1,1
+access_maintenance_equipment,maintenance_equipment,model_maintenance_equipment,sf_group_equipment_manager,1,1,1,0
-access_sf_robot_axis_num,sf_robot_axis_num,model_sf_robot_axis_num,sf_group_equipment_user,1,1,1,1
+access_maintenance_standards,maintenance_standards,model_maintenance_standards,sf_group_equipment_user,1,0,0,0
+access_maintenance_standards,maintenance_standards,model_maintenance_standards,sf_group_equipment_manager,1,1,1,0
+access_maintenance_standard_image,maintenance_standard_image,model_maintenance_standard_image,sf_group_equipment_user,1,0,0,0
+access_maintenance_standard_image,maintenance_standard_image,model_maintenance_standard_image,sf_group_equipment_manager,1,1,1,0
+access_sf_robot_axis_num,sf_robot_axis_num,model_sf_robot_axis_num,sf_group_equipment_user,1,0,0,0
+access_sf_robot_axis_num,sf_robot_axis_num,model_sf_robot_axis_num,sf_group_equipment_manager,1,1,1,0
 
 
 access_maintenance_request_group_plan_dispatch,maintenance.request,maintenance.model_maintenance_request,sf_base.group_plan_dispatch,1,0,0,0

sf_maintenance/views/maintenance_views.xml

@@ -48,7 +48,7 @@
                     <field name="MTcode"/>
                 </xpath>
                 <xpath expr="//field[@name='category_id']" position="after">
-                    <field name="state_zc"/>
+                    <field name="state_zc" readonly="1"/>
                     <field name="code" readonly="1"/>
                     <field name="equipment_type" invisible="1"/>
                     <field name="brand_id" force_save="1"/>

sf_manufacturing/models/mrp_production.py

@@ -7,6 +7,8 @@ from odoo import api, fields, models, _
 from odoo.exceptions import UserError
 from odoo.addons.sf_base.commons.common import Common
 
+from odoo.tools import float_compare, float_is_zero
+
 
 class MrpProduction(models.Model):
     _inherit = 'mrp.production'
@@ -258,9 +260,6 @@ class MrpProduction(models.Model):
                     )
                     i += 1
                     for route in product_routing_workcenter:
-                        if i == 1 and route.routing_type == '获取CNC加工程序':
-                            workorders_values.append(
-                                self.env['mrp.workorder'].json_workorder_str('', production, route))
                         if route.is_repeat is True:
                             workorders_values.append(
                                 self.env['mrp.workorder'].json_workorder_str(k, production, route))
@@ -478,13 +477,100 @@ class MrpProduction(models.Model):
             for work in rec.workorder_ids:
                 work.sequence = current_sequence
                 current_sequence += 1
-                if work.name == '获取CNC加工程序':
+                # if work.name == '获取CNC加工程序':
-                    work.button_start()
+                #     work.button_start()
-                    #work.fetchCNC()
+                #     #work.fetchCNC()
-                    work.button_finish()
+                #     work.button_finish()
 
     # 创建工单并进行排序
     def _create_workorder(self):
         self._create_workorder3()
         self._reset_work_order_sequence()
         return True
+
+    #修改标记已完成方法
+    def button_mark_done1(self):
+        self._button_mark_done_sanity_checks()
+
+        if not self.env.context.get('button_mark_done_production_ids'):
+            self = self.with_context(button_mark_done_production_ids=self.ids)
+        res = self._pre_button_mark_done()
+        if res is not True:
+            return res
+
+        if self.env.context.get('mo_ids_to_backorder'):
+            productions_to_backorder = self.browse(self.env.context['mo_ids_to_backorder'])
+            productions_not_to_backorder = self - productions_to_backorder
+        else:
+            productions_not_to_backorder = self
+            productions_to_backorder = self.env['mrp.production']
+
+
+        backorders = productions_to_backorder and productions_to_backorder._split_productions()
+        backorders = backorders - productions_to_backorder
+
+        productions_not_to_backorder._post_inventory(cancel_backorder=True)
+        productions_to_backorder._post_inventory(cancel_backorder=True)
+
+        # if completed products make other confirmed/partially_available moves available, assign them
+        done_move_finished_ids = (productions_to_backorder.move_finished_ids | productions_not_to_backorder.move_finished_ids).filtered(lambda m: m.state == 'done')
+        done_move_finished_ids._trigger_assign()
+
+        # Moves without quantity done are not posted => set them as done instead of canceling. In
+        # case the user edits the MO later on and sets some consumed quantity on those, we do not
+        # want the move lines to be canceled.
+        (productions_not_to_backorder.move_raw_ids | productions_not_to_backorder.move_finished_ids).filtered(lambda x: x.state not in ('done', 'cancel')).write({
+            'state': 'done',
+            'product_uom_qty': 0.0,
+        })
+
+        for production in self:
+            production.write({
+                'date_finished': fields.Datetime.now(),
+                'product_qty': production.qty_produced,
+                'priority': '0',
+                'is_locked': True,
+                'state': 'done',
+            })
+
+        for workorder in self.workorder_ids.filtered(lambda w: w.state not in ('done', 'cancel')):
+            workorder.duration_expected = workorder._get_duration_expected()
+
+        if not backorders:
+            if self.env.context.get('from_workorder'):
+                return {
+                    'type': 'ir.actions.act_window',
+                    'res_model': 'mrp.production',
+                    'views': [[self.env.ref('mrp.mrp_production_form_view').id, 'form']],
+                    'res_id': self.id,
+                    'target': 'main',
+                }
+            if self.user_has_groups('mrp.group_mrp_reception_report') and self.picking_type_id.auto_show_reception_report:
+                lines = self.move_finished_ids.filtered(lambda m: m.product_id.type == 'product' and m.state != 'cancel' and m.quantity_done and not m.move_dest_ids)
+                if lines:
+                    if any(mo.show_allocation for mo in self):
+                        action = self.action_view_reception_report()
+                        return action
+            return True
+        context = self.env.context.copy()
+        context = {k: v for k, v in context.items() if not k.startswith('default_')}
+        for k, v in context.items():
+            if k.startswith('skip_'):
+                context[k] = False
+        action = {
+            'res_model': 'mrp.production',
+            'type': 'ir.actions.act_window',
+            'context': dict(context, mo_ids_to_backorder=None, button_mark_done_production_ids=None)
+        }
+        if len(backorders) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': backorders[0].id,
+            })
+        else:
+            action.update({
+                'name': _("Backorder MO"),
+                'domain': [('id', 'in', backorders.ids)],
+                'view_mode': 'tree,form',
+            })
+        return action

sf_manufacturing/models/mrp_routing_workcenter.py

@@ -6,9 +6,9 @@ class ResMrpRoutingWorkcenter(models.Model):
     _inherit = 'mrp.routing.workcenter'
 
     routing_type = fields.Selection([
-        ('获取CNC加工程序', '获取CNC加工程序'),
+        # ('获取CNC加工程序', '获取CNC加工程序'),
-        ('装夹', '装夹'),
+        ('装夹预调', '装夹预调'),
-        ('前置三元定位检测', '前置三元定位检测'),
+        # ('前置三元定位检测', '前置三元定位检测'),
         ('CNC加工', 'CNC加工'),
         ('后置三元质量检测', '后置三元质量检测'),
         ('解除装夹', '解除装夹'),

sf_manufacturing/models/mrp_workorder.py

@@ -31,9 +31,9 @@ class ResMrpWorkOrder(models.Model):
     processing_panel = fields.Char('加工面')
     sequence = fields.Integer(string='工序')
     routing_type = fields.Selection([
-        ('获取CNC加工程序', '获取CNC加工程序'),
+        # ('获取CNC加工程序', '获取CNC加工程序'),
-        ('装夹', '装夹'),
+        ('装夹预调', '装夹预调'),
-        ('前置三元定位检测', '前置三元定位检测'),
+        # ('前置三元定位检测', '前置三元定位检测'),
         ('CNC加工', 'CNC加工'),
         ('后置三元质量检测', '后置三元质量检测'),
         ('解除装夹', '解除装夹'),
@@ -204,15 +204,15 @@ class ResMrpWorkOrder(models.Model):
         if route.routing_type == '切割':
             duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
                 [('name', '=', '切割')]).time_cycle
-        elif route.routing_type == '获取CNC加工程序':
+        # elif route.routing_type == '获取CNC加工程序':
+        #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
+        #         [('name', '=', '获取CNC加工程序')]).time_cycle
+        elif route.routing_type == '装夹预调':
             duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
-                [('name', '=', '获取CNC加工程序')]).time_cycle
+                [('name', '=', '装夹预调')]).time_cycle
-        elif route.routing_type == '工件装夹':
+        # elif route.routing_type == '前置三元定位检测':
-            duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
+        #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
-                [('name', '=', '工件装夹')]).time_cycle
+        #         [('name', '=', '前置三元定位检测')]).time_cycle
-        elif route.routing_type == '前置三元定位检测':
-            duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
-                [('name', '=', '前置三元定位检测')]).time_cycle
         elif route.routing_type == 'CNC加工':
             duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
                 [('name', '=', 'CNC加工')]).time_cycle
@@ -495,7 +495,7 @@ class ResMrpWorkOrder(models.Model):
 
     # 重写工单开始按钮方法
     def button_start(self):
-        if self.routing_type == '装夹' and self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
+        if self.routing_type == '装夹预调' and self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
             self.pro_code = self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name
         # 外协出库单，从“正在等待”变为“就绪”状态
         if self.is_subcontract is True:
@@ -581,7 +581,8 @@ class ResMrpWorkOrder(models.Model):
         if is_production_id == True and self.name == '解除装夹':
             for move_raw_id in self.production_id.move_raw_ids:
                 move_raw_id.quantity_done = move_raw_id.product_uom_qty
-                self.production_id.state = 'done'
+            self.production_id.button_mark_done1()
+                # self.production_id.state = 'done'
 
 
 

sf_manufacturing/security/ir.model.access.csv

@@ -6,10 +6,10 @@ access_sf_model_type_manager,sf_model_type,model_sf_model_type,sf_base.group_sf_
 access_sf_product_model_type_routing_sort,sf_product_model_type_routing_sort,model_sf_product_model_type_routing_sort,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_product_model_type_routing_sort_manager,sf_product_model_type_routing_sort,model_sf_product_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,0
 access_sf_embryo_model_type_routing_sort,sf_embryo_model_type_routing_sort,model_sf_embryo_model_type_routing_sort,sf_base.group_sf_mrp_user,1,0,0,0
-access_sf_embryo_model_type_routing_sort_manager,sf_embryo_model_type_routing_sort,model_sf_embryo_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,1
+access_sf_embryo_model_type_routing_sort_manager,sf_embryo_model_type_routing_sort,model_sf_embryo_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,0
 access_sf_surface_technics_model_type_routing_sort,sf_surface_technics_model_type_routing_sort,model_sf_surface_technics_model_type_routing_sort,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_surface_technics_model_type_routing_sort_manager,sf_surface_technics_model_type_routing_sort,model_sf_surface_technics_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,0
-access_sf_production_line,sf.production.line,model_sf_production_line,sf_base.group_sf_mrp_user,1,0,0,0
+access_sf_production_line,sf.production.line,model_sf_production_line,sf_base.group_sf_mrp_user,1,1,1,0
 access_sf_production_line_manager,sf.production.line,model_sf_production_line,sf_base.group_sf_mrp_manager,1,1,1,0
 access_maintenance_equipment_tool,maintenance_equipment_tool,model_maintenance_equipment_tool,sf_base.group_sf_mrp_user,1,0,0,0
 access_maintenance_equipment_tool_manager,maintenance_equipment_tool,model_maintenance_equipment_tool,sf_base.group_sf_mrp_manager,1,1,1,0
@@ -42,7 +42,7 @@ access_mrp_production_stock_worker,mrp.production stock_worker,mrp.model_mrp_pro
 access_product_product_user,product.product user,product.model_product_product,sf_base.group_sf_mrp_user,1,0,0,0
 access_product_template_user,product.template user,product.model_product_template,sf_base.group_sf_mrp_user,1,0,0,0
 access_uom_uom_user,uom.uom user,uom.model_uom_uom,sf_base.group_sf_mrp_user,1,0,0,0
-access_product_supplierinfo_user,product.supplierinfo user,product.model_product_supplierinfo,sf_base.group_sf_mrp_user,1,1,1,0
+access_product_supplierinfo_user,product.supplierinfo user,product.model_product_supplierinfo,sf_base.group_sf_mrp_user,1,0,0,0
 access_res_partner,res.partner,base.model_res_partner,sf_base.group_sf_mrp_user,1,0,0,0
 access_mrp_workorder_mrp_user,mrp.workorder.user,mrp.model_mrp_workorder,sf_base.group_sf_mrp_user,1,1,1,0
 access_mrp_workorder_mrp_manager,mrp.workorder,mrp.model_mrp_workorder,sf_base.group_sf_mrp_user,1,1,1,0
@@ -90,6 +90,7 @@ access_mrp_workcenter_capacity_manager,mrp.workcenter.capacity.manager,mrp.model
 access_mrp_production,mrp_production,model_mrp_production,sf_base.group_plan_dispatch,1,1,1,0
 access_mrp_workorder,mrp_workorder,model_mrp_workorder,sf_base.group_plan_dispatch,1,1,1,0
 access_sf_production_line,sf.production.line,model_sf_production_line,sf_base.group_plan_dispatch,1,1,1,0
+access_sf_production_line,sf.production.line,model_sf_production_line,sf_maintenance.sf_group_equipment_user,1,1,1,0
 access_mrp_workcenter,mrp_workcenter,model_mrp_workcenter,sf_base.group_plan_dispatch,1,1,1,0
 access_mrp_bom,mrp.bom,mrp.model_mrp_bom,sf_base.group_plan_dispatch,1,1,1,0
 access_mrp_bom_line,mrp.bom.line,mrp.model_mrp_bom_line,sf_base.group_plan_dispatch,1,0,0,0

sf_manufacturing/views/mrp_workorder_view.xml

@@ -162,11 +162,11 @@
                     <field name="equipment_id"
                            attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
                     <field name="functional_fixture_id"
-                           attrs='{"invisible": [("routing_type","!=","装夹")]}'/>
+                           attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
                     <field name="functional_fixture_code" force_save="1"
-                           attrs='{"invisible": [("routing_type","!=","装夹")]}'/>
+                           attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
                     <field name="functional_fixture_type_id" force_save="1"
-                           attrs='{"invisible": [("routing_type","!=","装夹")]}'/>
+                           attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
                 </group>
                 <group attrs='{"invisible": [("routing_type","=","获取CNC加工程序")]}'>
                     <div>
@@ -219,7 +219,7 @@
 
                 <!--                    </div>-->
                 <!--                </page>-->
-                <page string="工件装夹" attrs='{"invisible": [("routing_type","!=","装夹")]}'>
+                <page string="工件装夹" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
                     <group>
                         <group string="卡盘">
                             <field name="chuck_serial_number"/>
@@ -241,10 +241,7 @@
                                placeholder="如有预调程序信息请在此处输入....."/>
                     </group>
                 </page>
-
+                <page string="前置三元检测定位参数" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
-            </xpath>
-            <xpath expr="//page[1]" position="before">
-                <page string="前置三元检测定位参数" attrs='{"invisible": [("routing_type","!=","前置三元定位检测")]}'>
 
                     <div>左面:</div>
                     <div class="o_address_format">
@@ -397,8 +394,10 @@
                         <field name='X_deviation_angle'/>
                     </group>
                 </page>
+
             </xpath>
 
+
             <xpath expr="//page[1]" position="before">
                 <page string="CNC程序" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
                     <field name="cnc_ids" widget="one2many" string="工作程序">