报废不申请重新编程时新生成的制造订单没有程序

Merge Request: Merge branch 'develop' into feature/验证合并的逻辑

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

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

@@ -1,27 +1,20 @@
 # -*- coding: utf-8 -*-
-import asyncio
 import base64
-import cProfile
-import concurrent
 import datetime
-import io
 import logging
 import json
 import os
-import pstats
 import re
-import threading
-import time
-from concurrent.futures import ThreadPoolExecutor, ProcessPoolExecutor
 import requests
 from itertools import groupby
 from collections import defaultdict, namedtuple
 
-from odoo import api, fields, models, SUPERUSER_ID, _, tools
+from odoo import api, fields, models, SUPERUSER_ID, _
 from odoo.exceptions import UserError, ValidationError
 from odoo.addons.sf_base.commons.common import Common
 from odoo.tools import float_compare, float_round, float_is_zero, format_datetime
 
+
 class MrpProduction(models.Model):
     _inherit = 'mrp.production'
     _description = "制造订单"
@@ -766,105 +759,64 @@ class MrpProduction(models.Model):
         # if self.product_id.tracking == 'serial':
         #     self._set_qty_producing()
 
-
     # 重载根据工序生成工单的程序：如果产品BOM中没有工序时，
     # 根据产品对应的模板类型中工序，去生成工单；
     # CNC加工工序的选取规则：
     # 如果自动报价有带过来预分配的机床，
     # 则根据设备找到工作中心；否则采用前面描述的工作中心分配机制；
     # 其他规则限制： 默认只分配给工作中心状态为非故障的工作中心；
-    def process_production(self):
-        workorders_values = []
-        # production = self.env['mrp.production'].browse(production_id)
-        product_qty = self.product_uom_id._compute_quantity(self.product_qty,
-                                                                  self.bom_id.product_uom_id)
-        exploded_boms, dummy = self.bom_id.explode(self.product_id,
-                                                         product_qty / self.bom_id.product_qty,
-                                                         picking_type=self.bom_id.picking_type_id)
-        for bom, bom_data in exploded_boms:
-            # If the operations of the parent BoM and phantom BoM are the same, don't recreate work orders.
-            if not (bom.operation_ids and (not bom_data['parent_line'] or bom_data[
-                'parent_line'].bom_id.operation_ids != bom.operation_ids)):
-                continue
-            for operation in bom.operation_ids:
-                if operation._skip_operation_line(bom_data['product']):
-                    continue
-                workorders_values += [{
-                    'name': operation.name,
-                    'production_id': self.id,
-                    'workcenter_id': operation.workcenter_id.id,
-                    'product_uom_id': self.product_uom_id.id,
-                    'operation_id': operation.id,
-                    'state': 'pending',
-                }]
-        if self.product_id.categ_id.type in ['成品', '坯料']:
-            # # 根据工序设计生成工单
-            technology_design_ids = sorted(self.technology_design_ids, key=lambda x: x.sequence)
-            for route in technology_design_ids:
-                workorder_has = self.env['mrp.workorder'].search(
-                    [('technology_design_id', '=', route.id), ('production_id', '=', self.id)])
-                if not workorder_has:
-                    if route.route_id.routing_type not in ['表面工艺']:
-                        workorders_values.append(
-                            self.env['mrp.workorder'].json_workorder_str(self, route))
-                    else:
-                        product_production_process = self.env['product.template'].search(
-                            [('server_product_process_parameters_id', '=', route.process_parameters_id.id)])
-                        workorders_values.append(
-                            self.env[
-                                'mrp.workorder']._json_workorder_surface_process_str(
-                                self, route, product_production_process.seller_ids[0].partner_id.id))
-        return workorders_values
-
-    def _set_workorder_duration_expected(self):
-        try:
-            # 在每个线程中创建独立的 ORM 环境
-            with api.Environment.manage():
-                new_cr = self.pool.cursor()
-                self = self.with_env(self.env(cr=new_cr))
-                # program_ids = self.sudo().env['loyalty.program'].browse(program_ids.ids)
-                # 使用独立的环境来处理数据库事务
-                # 在独立的环境中对 workorder 进行操作
-                production = self.sudo().env['mrp.production'].browse(self.id)
-                workorders_values = production.process_production()
-                production.write({'workorder_ids': workorders_values})
-                for workorder in production.workorder_ids:
-                    workorder.duration_expected = workorder._get_duration_expected()
-                # 可以进行其他与工作单相关的操作
-                # workorder_env.write({'...'})
-                return production
-        except Exception as e:
-            logging.error(f"Error processing workorder {workorder.id}: {e}")
-        # workorders_values = self.process_production(self)
-        # print('_set_workorder_duration_expected wqio ', self)
-        # self.write({'workorder_ids': workorders_values})
-        # for workorder in self.workorder_ids:
-        #     workorder.duration_expected = workorder._get_duration_expected()
 
     def _create_workorder3(self, item):
-        with ThreadPoolExecutor(max_workers=os.cpu_count()) as executor:
-            futures = []
-            for production in self:
-                if not production.bom_id or not production.product_id:
+        for production in self:
+            if not production.bom_id or not production.product_id:
+                continue
+            workorders_values = []
+            product_qty = production.product_uom_id._compute_quantity(production.product_qty,
+                                                                      production.bom_id.product_uom_id)
+            exploded_boms, dummy = production.bom_id.explode(production.product_id,
+                                                             product_qty / production.bom_id.product_qty,
+                                                             picking_type=production.bom_id.picking_type_id)
+
+            for bom, bom_data in exploded_boms:
+                # If the operations of the parent BoM and phantom BoM are the same, don't recreate work orders.
+                if not (bom.operation_ids and (not bom_data['parent_line'] or bom_data[
+                    'parent_line'].bom_id.operation_ids != bom.operation_ids)):
                     continue
-                # 提交每个生产任务到线程池
-                futures.append(executor.submit(production._set_workorder_duration_expected))
-
-            # 等待所有线程完成任务
-            results = []
-            for future in futures:
-                try:
-                    result = future.result()
-                    if result:
-                        results.append(result)
-
-                except Exception as e:
-                    logging.error(f"Error processing production: {e}")
-            return results
+                for operation in bom.operation_ids:
+                    if operation._skip_operation_line(bom_data['product']):
+                        continue
+                    workorders_values += [{
+                        'name': operation.name,
+                        'production_id': production.id,
+                        'workcenter_id': operation.workcenter_id.id,
+                        'product_uom_id': production.product_uom_id.id,
+                        'operation_id': operation.id,
+                        'state': 'pending',
+                    }]
+            if production.product_id.categ_id.type in ['成品', '坯料']:
+                # # 根据工序设计生成工单
+                technology_design_ids = sorted(production.technology_design_ids, key=lambda x: x.sequence)
+                for route in technology_design_ids:
+                    workorder_has = self.env['mrp.workorder'].search(
+                        [('technology_design_id', '=', route.id), ('production_id', '=', production.id)])
+                    if not workorder_has:
+                        if route.route_id.routing_type not in ['表面工艺']:
+                            workorders_values.append(
+                                self.env['mrp.workorder'].json_workorder_str(production, route))
+                        else:
+                            product_production_process = self.env['product.template'].search(
+                                [('server_product_process_parameters_id', '=', route.process_parameters_id.id)])
+                            workorders_values.append(
+                                self.env[
+                                    'mrp.workorder']._json_workorder_surface_process_str(
+                                    production, route, product_production_process.seller_ids[0].partner_id.id))
+            production.workorder_ids = workorders_values
+            for workorder in production.workorder_ids:
+                workorder.duration_expected = workorder._get_duration_expected()
 
     # 外协出入库单处理
-    def get_subcontract_pick_purchase(self,productions):
-        production_all = productions.sorted(lambda x: x.id)
+    def get_subcontract_pick_purchase(self):
+        production_all = self.sorted(lambda x: x.id)
         product_id_to_production_names = {}
         grouped_product_ids = {k: list(g) for k, g in
                                groupby(production_all, key=lambda x: x.product_id.id)}
@@ -873,10 +825,9 @@ class MrpProduction(models.Model):
         sorted_workorders = None
         for production in production_all:
             proc_workorders = []
-            process_parameter_workorder=production.workorder_ids.filtered(lambda w: w.surface_technics_parameters_id and w.is_subcontract and w.state!='cancel')
-            # process_parameter_workorder = self.env['mrp.workorder'].search(
-            #     [('surface_technics_parameters_id', '!=', False), ('production_id', '=', production.id),
-            #      ('is_subcontract', '=', True), ('state', '!=', 'cancel')], order='sequence asc')
+            process_parameter_workorder = self.env['mrp.workorder'].search(
+                [('surface_technics_parameters_id', '!=', False), ('production_id', '=', production.id),
+                 ('is_subcontract', '=', True), ('state', '!=', 'cancel')], order='sequence asc')
             if process_parameter_workorder:
                 # 将这些特殊表面工艺工单的采购单与调拨单置为失效
                 for workorder in process_parameter_workorder:
@@ -991,49 +942,48 @@ class MrpProduction(models.Model):
                                 if purchase_order_line:
                                     line.unlink()
 
-    def _process_reset_work_order_sequence(self,rec):
-        workorder_ids = rec.workorder_ids
-        technology_design_ids = rec.technology_design_ids
-        if workorder_ids.filtered(lambda item: item.state in ('返工', 'rework')):
-            # 获取返工后新生成的工单
-            work_ids = workorder_ids.filtered(lambda item: item.sequence == 0)
-            # 对工单进行逐个插入
-            for work_id in work_ids:
-                order_rework_ids = rec.workorder_ids.filtered(
-                    lambda item: (item.sequence > 0 and work_id.name == item.name
-                                  and work_id.processing_panel == item.processing_panel))
-                order_rework_ids = sorted(order_rework_ids, key=lambda item: item.sequence, reverse=True)
-                work_id.sequence = order_rework_ids[0].sequence + 1
-                # 对该工单之后的工单工序进行加一
-                work_order_ids = rec.workorder_ids.filtered(
-                    lambda item: item.sequence >= work_id.sequence and item.id != work_id.id)
-                for work in work_order_ids:
-                    work.sequence = work.sequence + 1
-
-        else:
-            # 将工艺设计生成的工单序号赋值给工单的序号
-            for work in workorder_ids:
-                td_ids = technology_design_ids.filtered(
-                    lambda item: (item.route_id.name in work.name and item.process_parameters_id
-                                  and item.process_parameters_id == work.surface_technics_parameters_id) or
-                                 (item.route_id.name == work.name and item.panel
-                                  and item.panel == work.processing_panel))
-                if work.name == '人工线下加工':
-                    td_ids = technology_design_ids.filtered(lambda item: (item.route_id.name in work.name))
-                if td_ids:
-                    work.sequence = td_ids[0].sequence
-            cancel_work_ids = workorder_ids.filtered(lambda item: item.state in ('已取消', 'cancel'))
-            if cancel_work_ids:
-                sequence = max(workorder_ids.filtered(lambda item: item.state not in ('已取消', 'cancel')),
-                               key=lambda w: w.sequence).sequence
-                for cw in cancel_work_ids:
-                    cw.sequence = sequence + 1
-    def _reset_work_order_sequence(self,productions):
+    def _reset_work_order_sequence(self):
         """
         工单工序排序方法(新)
         """
-        for rec in productions:
-            self._process_reset_work_order_sequence(rec)
+        for rec in self:
+            workorder_ids = rec.workorder_ids
+            technology_design_ids = rec.technology_design_ids
+            if workorder_ids.filtered(lambda item: item.state in ('返工', 'rework')):
+                # 获取返工后新生成的工单
+                work_ids = workorder_ids.filtered(lambda item: item.sequence == 0)
+                # 对工单进行逐个插入
+                for work_id in work_ids:
+                    order_rework_ids = rec.workorder_ids.filtered(
+                        lambda item: (item.sequence > 0 and work_id.name == item.name
+                                      and work_id.processing_panel == item.processing_panel))
+                    order_rework_ids = sorted(order_rework_ids, key=lambda item: item.sequence, reverse=True)
+                    work_id.sequence = order_rework_ids[0].sequence + 1
+                    # 对该工单之后的工单工序进行加一
+                    work_order_ids = rec.workorder_ids.filtered(
+                        lambda item: item.sequence >= work_id.sequence and item.id != work_id.id)
+                    for work in work_order_ids:
+                        work.sequence = work.sequence + 1
+
+            else:
+                # 将工艺设计生成的工单序号赋值给工单的序号
+                for work in workorder_ids:
+                    td_ids = technology_design_ids.filtered(
+                        lambda item: (item.route_id.name in work.name and item.process_parameters_id
+                                      and item.process_parameters_id == work.surface_technics_parameters_id) or
+                                     (item.route_id.name == work.name and item.panel
+                                      and item.panel == work.processing_panel))
+                    if work.name == '人工线下加工':
+                        td_ids = technology_design_ids.filtered(lambda item: (item.route_id.name in work.name))
+                    if td_ids:
+                        work.sequence = td_ids[0].sequence
+                cancel_work_ids = workorder_ids.filtered(lambda item: item.state in ('已取消', 'cancel'))
+                if cancel_work_ids:
+                    sequence = max(workorder_ids.filtered(lambda item: item.state not in ('已取消', 'cancel')),
+                                   key=lambda w: w.sequence).sequence
+                    for cw in cancel_work_ids:
+                        cw.sequence = sequence + 1
+
     def _reset_work_order_sequence_1(self):
         """
         工单工序排序方法（旧）
@@ -1129,9 +1079,9 @@ class MrpProduction(models.Model):
 
     # 创建工单并进行排序
     def _create_workorder(self, item):
-        productions = self._create_workorder3(item)
-        self._reset_work_order_sequence(productions)
-        return productions
+        self._create_workorder3(item)
+        self._reset_work_order_sequence()
+        return True
 
     def production_process(self, pro_plan):
         type_map = {'装夹预调': False, 'CNC加工': False, '解除装夹': False}
@@ -1466,36 +1416,36 @@ class MrpProduction(models.Model):
             #                    'production_id': False})
             # productions.procurement_group_id.mrp_production_ids.move_dest_ids.write(
             #     {'group_id': self.env['procurement.group'].search([('name', '=', sale_order.name)])})
-            stock_picking_remanufacture = self.env['stock.picking'].search([('origin', '=', productions.name)])
-            for pick in stock_picking_remanufacture:
-                if pick.name.startswith('WH/PC/') or pick.name.startswith('WH/INT/'):
-                    if pick.move_ids:
-                        product_type_id = pick.move_ids[0].product_id.categ_id
-                        if product_type_id.name == '坯料':
-                            location_id = self.env['stock.location'].search([('name', '=', '坯料存货区')])
-                            if not location_id:
-                                logging.info(f'没有搜索到【坯料存货区】: {location_id}')
-                                break
-                            if pick.picking_type_id.name == '内部调拨':
-                                if pick.location_dest_id.product_type != product_type_id:
-                                    pick.location_dest_id = location_id.id
-                            elif pick.picking_type_id.name == '生产发料':
-                                if pick.location_id.product_type != product_type_id:
-                                    pick.location_id = location_id.id
-            scarp_process_parameter_workorder = self.env['mrp.workorder'].search(
-                [('surface_technics_parameters_id', '!=', False), ('production_id', '=', self.id),
-                 ('is_subcontract', '=', True)])
-            if scarp_process_parameter_workorder:
-                production_programming = self.env['mrp.production'].search(
-                    [('programming_no', '=', self.programming_no), ('id', '!=', productions.id)], order='name asc')
-                production_list = [production.name for production in production_programming]
-                purchase_orders = self.env['purchase.order'].search([('origin', 'ilike', ','.join(production_list))])
-                for purchase_item in purchase_orders.order_line:
-                    for process_item in scarp_process_parameter_workorder:
-                        if purchase_item.product_id.categ_type == '表面工艺':
-                            if purchase_item.product_id.server_product_process_parameters_id == process_item.surface_technics_parameters_id:
-                                if purchase_orders.origin.find(productions.name) == -1:
-                                    purchase_orders.origin += ',' + productions.name
+            # stock_picking_remanufacture = self.env['stock.picking'].search([('origin', '=', productions.name)])
+            # for pick in stock_picking_remanufacture:
+            #     if pick.name.startswith('WH/PC/') or pick.name.startswith('WH/INT/'):
+            #         if pick.move_ids:
+            #             product_type_id = pick.move_ids[0].product_id.categ_id
+            #             if product_type_id.name == '坯料':
+            #                 location_id = self.env['stock.location'].search([('name', '=', '坯料存货区')])
+            #                 if not location_id:
+            #                     logging.info(f'没有搜索到【坯料存货区】: {location_id}')
+            #                     break
+            #                 if pick.picking_type_id.name == '内部调拨':
+            #                     if pick.location_dest_id.product_type != product_type_id:
+            #                         pick.location_dest_id = location_id.id
+            #                 elif pick.picking_type_id.name == '生产发料':
+            #                     if pick.location_id.product_type != product_type_id:
+            #                         pick.location_id = location_id.id
+            # scarp_process_parameter_workorder = self.env['mrp.workorder'].search(
+            #     [('surface_technics_parameters_id', '!=', False), ('production_id', '=', self.id),
+            #      ('is_subcontract', '=', True)])
+            # if scarp_process_parameter_workorder:
+            #     production_programming = self.env['mrp.production'].search(
+            #         [('programming_no', '=', self.programming_no), ('id', '!=', productions.id)], order='name asc')
+            #     production_list = [production.name for production in production_programming]
+            #     purchase_orders = self.env['purchase.order'].search([('origin', 'ilike', ','.join(production_list))])
+            #     for purchase_item in purchase_orders.order_line:
+            #         for process_item in scarp_process_parameter_workorder:
+            #             if purchase_item.product_id.categ_type == '表面工艺':
+            #                 if purchase_item.product_id.server_product_process_parameters_id == process_item.surface_technics_parameters_id:
+            #                     if purchase_orders.origin.find(productions.name) == -1:
+            #                         purchase_orders.origin += ',' + productions.name
             if item['is_reprogramming'] is False:
                 productions.programming_state = '已编程'
             else:
@@ -1724,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("更新编程单状态失败,请联系管理员")
@@ -1806,5 +1756,3 @@ class sf_processing_panel(models.Model):
 
     name = fields.Char('加工面')
     active = fields.Boolean('有效', default=True)
-
-

sf_manufacturing/models/mrp_workorder.py

@@ -145,7 +145,7 @@ class ResMrpWorkOrder(models.Model):
     Y10_axis = fields.Float(default=0)
     Z10_axis = fields.Float(default=0)
     X_deviation_angle = fields.Integer(string="X轴偏差度", default=0)
-    test_results = fields.Selection([("合格", "合格"), ("返工", "返工")], default='合格',
+    test_results = fields.Selection([("合格", "合格"), ("返工", "返工"), ("报废", "报废")], default='合格',
                                     string="检测结果", tracking=True)
     cnc_ids = fields.One2many("sf.cnc.processing", 'workorder_id', string="CNC加工程序")
     cmm_ids = fields.One2many("sf.cmm.program", 'workorder_id', string="CMM程序")
@@ -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/models/stock.py

@@ -180,14 +180,14 @@ class StockRule(models.Model):
             productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(company_id).create(
                 productions_values)
             # 将这一批制造订单的采购组根据成品设置为不同的采购组
-            product_group_id = {}
-            for index, production in enumerate(productions):
-                if production.product_id.id not in product_group_id.keys():
-                    product_group_id[production.product_id.id] = production.procurement_group_id.id
-                else:
-                    productions_values[index].update({'name': production.name})
-                    procurement_group_vals = production._prepare_procurement_group_vals(productions_values[index])
-                    production.procurement_group_id = self.env["procurement.group"].create(procurement_group_vals).id
+            # product_group_id = {}
+            # for index, production in enumerate(productions):
+            #     if production.product_id.id not in product_group_id.keys():
+            #         product_group_id[production.product_id.id] = production.procurement_group_id.id
+            #     else:
+            #         productions_values[index].update({'name': production.name})
+            #         procurement_group_vals = production._prepare_procurement_group_vals(productions_values[index])
+            #         production.procurement_group_id = self.env["procurement.group"].create(procurement_group_vals).id
 
             # self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
             # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())

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

@@ -182,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"
@@ -533,7 +533,7 @@
                 <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"-->

sf_manufacturing/wizard/production_technology_wizard.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of YiZuo. See LICENSE file for full copyright and licensing details.
-import cProfile
-import io
-import pstats
-from concurrent.futures import ThreadPoolExecutor
+import logging
+from itertools import groupby
 from odoo import models, api, fields, _
 
 
@@ -15,71 +13,6 @@ class ProductionTechnologyWizard(models.TransientModel):
     origin = fields.Char(string='源单据')
     is_technology_confirm = fields.Boolean(default=True)
 
-    def _process_production(self,productions,technology_designs):
-        for production in productions:
-            # self._process_production_special_design(production,technology_designs)
-            with ThreadPoolExecutor(max_workers=4) as executor:
-                executor.submit(self._process_production_special_design, production,technology_designs)
-    def _process_production_special_design(self,production,technology_designs):
-        if production != self.production_id:
-            self.env['sf.technology.design'].sudo().unified_procedure_multiple_work_orders(technology_designs,
-                                                                                           production)
-        # 特殊表面工艺
-        special_design = self.env['sf.technology.design'].sudo().search(
-            [('routing_tag', '=', 'special'), ('production_id', '=', production.id),
-             ('is_auto', '=', False), ('active', 'in', [True, False])])
-        for special in special_design:
-            workorders_values = []
-            if special.active is False:
-                # is_cancel = False
-                # 工单采购单外协出入库单皆需取消
-                domain = [('production_id', '=', special.production_id.id)]
-                if special.process_parameters_id:
-                    domain += [('surface_technics_parameters_id', '=', special.process_parameters_id.id),
-                               ('state', '!=', 'cancel')]
-                else:
-                    domain += [('technology_design_id', '=', special.id), ('state', '!=', 'cancel')]
-                workorder = self.env['mrp.workorder'].search(domain)
-                # previous_workorder = self.env['mrp.workorder'].search(
-                #     [('sequence', '=', workorder.sequence - 1), ('routing_type', '=', '表面工艺'),
-                #      ('production_id', '=', workorder.production_id.id)])
-                # if previous_workorder:
-                #     if previous_workorder.supplier_id != workorder.supplier_id:
-                #         is_cancel = True
-                # if workorder.state != 'cancel' and is_cancel is True:
-                workorder.write({'state': 'cancel'})
-                workorder.picking_ids.write({'state': 'cancel'})
-                workorder.picking_ids.move_ids.write({'state': 'cancel'})
-                purchase_order = self.env['purchase.order'].search(
-                    [('origin', '=', workorder.production_id.name), ('purchase_type', '=', 'consignment')])
-                for line in purchase_order.order_line:
-                    if line.product_id.server_product_process_parameters_id == workorder.surface_technics_parameters_id:
-                        purchase_order.write({'state': 'cancel'})
-            else:
-                if special.production_id.workorder_ids:
-                    workorder = self.env['mrp.workorder'].search(
-                        [('technology_design_id', '=', special.id), ('production_id', '=', special.production_id.id),
-                         ('state', '!=', 'cancel')])
-                    if not workorder:
-                        if special.route_id.routing_type == '表面工艺':
-                            product_production_process = self.env['product.template'].search(
-                                [('server_product_process_parameters_id', '=', special.process_parameters_id.id)])
-                            workorders_values.append(
-                                self.env[
-                                    'mrp.workorder']._json_workorder_surface_process_str(special.production_id, special,
-                                                                                         product_production_process.seller_ids[
-                                                                                             0].partner_id.id))
-                        else:
-                            workorders_values.append(
-                                self.env['mrp.workorder'].json_workorder_str(special.production_id, special))
-                        special.production_id.write({'workorder_ids': workorders_values})
-                    else:
-                        if len(workorder.blocked_by_workorder_ids) > 1:
-                            if workorder.sequence == 1:
-                                workorder.blocked_by_workorder_ids = None
-                            else:
-                                if workorder.blocked_by_workorder_ids:
-                                    workorder.blocked_by_workorder_ids = blocked_by_workorder_ids[0]
     def confirm(self):
         if self.is_technology_confirm is True and self.production_id.product_id.categ_id.type in ['成品', '坯料']:
             domain = [('origin', '=', self.origin), ('state', '=', 'technology_to_confirmed'),
@@ -90,24 +23,88 @@ class ProductionTechnologyWizard(models.TransientModel):
             [('production_id', '=', self.production_id.id), ('active', 'in', [True, False])])
         # technology_designs = self.production_id.technology_design_ids
         productions = self.env['mrp.production'].search(domain)
-        pr = cProfile.Profile()
-        pr.enable()
-        self._process_production(productions,technology_designs)
-        productions = productions._create_workorder(False)
+        for production in productions:
+            if production != self.production_id:
+                self.env['sf.technology.design'].sudo().unified_procedure_multiple_work_orders(technology_designs,
+                                                                                               production)
+            # 特殊表面工艺
+            special_design = self.env['sf.technology.design'].sudo().search(
+                [('routing_tag', '=', 'special'), ('production_id', '=', production.id),
+                 ('is_auto', '=', False), ('active', 'in', [True, False])])
+            for special in special_design:
+                workorders_values = []
+                if special.active is False:
+                    # is_cancel = False
+                    # 工单采购单外协出入库单皆需取消
+                    domain = [('production_id', '=', special.production_id.id)]
+                    if special.process_parameters_id:
+                        domain += [('surface_technics_parameters_id', '=', special.process_parameters_id.id), ('state', '!=', 'cancel')]
+                    else:
+                        domain += [('technology_design_id', '=', special.id), ('state', '!=', 'cancel')]
+                    workorder = self.env['mrp.workorder'].search(domain)
+                    # previous_workorder = self.env['mrp.workorder'].search(
+                    #     [('sequence', '=', workorder.sequence - 1), ('routing_type', '=', '表面工艺'),
+                    #      ('production_id', '=', workorder.production_id.id)])
+                    # if previous_workorder:
+                    #     if previous_workorder.supplier_id != workorder.supplier_id:
+                    #         is_cancel = True
+                    # if workorder.state != 'cancel' and is_cancel is True:
+                    workorder.write({'state': 'cancel'})
+                    workorder.picking_ids.write({'state': 'cancel'})
+                    workorder.picking_ids.move_ids.write({'state': 'cancel'})
+                    purchase_order = self.env['purchase.order'].search(
+                        [('origin', '=', workorder.production_id.name), ('purchase_type', '=', 'consignment')])
+                    for line in purchase_order.order_line:
+                        if line.product_id.server_product_process_parameters_id == workorder.surface_technics_parameters_id:
+                            purchase_order.write({'state': 'cancel'})
+                else:
+                    if special.production_id.workorder_ids:
+                        workorder = self.env['mrp.workorder'].search(
+                            [('technology_design_id', '=', special.id), ('production_id', '=', special.production_id.id), ('state', '!=', 'cancel')])
+                        if not workorder:
+                            if special.route_id.routing_type == '表面工艺':
+                                product_production_process = self.env['product.template'].search(
+                                    [('server_product_process_parameters_id', '=', special.process_parameters_id.id)])
+                                workorders_values.append(
+                                    self.env[
+                                        'mrp.workorder']._json_workorder_surface_process_str(special.production_id, special,
+                                                                                             product_production_process.seller_ids[
+                                                                                                 0].partner_id.id))
+                            else:
+                                workorders_values.append(
+                                    self.env['mrp.workorder'].json_workorder_str(special.production_id, special))
+                            special.production_id.write({'workorder_ids': workorders_values})
+                        else:
+                            if len(workorder.blocked_by_workorder_ids) > 1:
+                                if workorder.sequence == 1:
+                                    workorder.blocked_by_workorder_ids = None
+                                else:
+                                    if workorder.blocked_by_workorder_ids:
+                                        workorder.blocked_by_workorder_ids = blocked_by_workorder_ids[0]
+        productions._create_workorder(False)
         if self.production_id.product_id.categ_id.type == '成品':
-            self.production_id.get_subcontract_pick_purchase(productions)
+            productions.get_subcontract_pick_purchase()
+        productions.is_adjust = False
         for item in productions:
-            item.is_adjust = False
             workorder = item.workorder_ids.filtered(lambda wo: wo.state not in ('cancel')).sorted(
                 key=lambda a: a.sequence)
             if workorder[0].state in ['pending']:
                 if workorder[0].production_id.product_id.categ_id.type == '成品' and item.programming_state != '已编程':
                     workorder[0].state = 'waiting'
-        pr.disable()  # 停止性能分析
-
-        # 将结果输出到 StringIO
-        s = io.StringIO()
-        ps = pstats.Stats(pr, stream=s)
-        ps.strip_dirs().sort_stats('cumulative').print_stats()
-        analysis_output = s.getvalue()
+            if item.is_remanufacture and item.programming_state == '已编程':
+                mrp_production = self.env['mrp.production'].sudo().search(
+                    [('remanufacture_production_id', '=', item.name)])
+                workorder_ids = mrp_production.workorder_ids.filtered(
+                    lambda ap: ap.routing_type in ('装夹预调', 'CNC加工'))
+                for workorder_id in workorder_ids:
+                    workorder = item.workorder_ids.filtered(lambda
+                                                                ap: ap.routing_type == workorder_id.routing_type and ap.processing_panel == workorder_id.processing_panel)
+                    if workorder:
+                        if workorder.routing_type == '装夹预调':
+                            workorder.write(
+                                {'processing_drawing': workorder_id.processing_drawing})
+                        if workorder.routing_type == 'CNC加工':
+                            workorder.write(
+                                {'cnc_worksheet': workorder_id.cnc_worksheet, 'cnc_ids': workorder_id.cnc_ids,
+                                 'cmm_ids': workorder_id.cmm_ids})
         return productions

sf_manufacturing/wizard/production_wizard.py

@@ -53,4 +53,5 @@ class ProductionWizard(models.TransientModel):
             if self.is_reprogramming is True:
                 self.mrp_production_id.update_programming_state(trigger_time=datetime.now().strftime('%Y-%m-%d %H:%M:%S'))
             new_production = self.mrp_production_id.recreateManufacturing(ret)
+            new_production.technology_design_ids = self.mrp_production_id.technology_design_ids
             self.mrp_production_id.write({'remanufacture_production_id': new_production.id})

sf_quality/models/quality.py

@@ -27,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", "操机"),
@@ -48,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,7 +62,9 @@ class QualityCheck(models.Model):
     def do_pass(self):
         self.ensure_one()
         super().do_pass()
-        if self.workorder_id and self.individuation_page_PTD is True:
+        if self.workorder_id:
+            if self.workorder_id.state in ('pending', 'waiting'):
+                raise ValidationError('工单未就绪!')
             # 1）将页签“判定结果”的检测结果值同步到【工单_后置三元检测_检测结果】
             if self.test_results in ['返工', '报废']:
                 raise ValidationError('请重新选择【判定结果】-【检测结果】')
@@ -74,7 +76,9 @@ class QualityCheck(models.Model):
     def do_fail(self):
         self.ensure_one()
         super().do_fail()
-        if self.workorder_id and self.individuation_page_PTD is True:
+        if self.workorder_id:
+            if self.workorder_id.state in ('pending', 'waiting'):
+                raise ValidationError('工单未就绪!')
             # 1）将页签“判定结果”的检测结果值同步到【工单_后置三元检测_检测结果】
             if not self.test_results:
                 raise ValidationError('请填写【判定结果】里的信息')

sf_quality/models/quality_cnc_test.py

@@ -25,7 +25,7 @@ class SfQualityCncTest(models.Model):
         ('pass', '合格'),
         ('fail', '不合格')], string='判定结果')
     number = fields.Integer('数量', default=1)
-    test_results = fields.Selection([("合格", "合格"), ("返工", "返工")], string="检测结果")
+    test_results = fields.Selection([("合格", "合格"), ("返工", "返工"), ("报废", "报废")], string="检测结果")
     reason = fields.Selection(
         [("programming", "编程"), ("cutter", "刀具"), ("clamping", "装夹"), ("operate computer", "操机"),
          ("technology", "工艺"), ("customer redrawing", "客户改图")], string="原因")

sf_quality/views/quality_check_view.xml

@@ -9,22 +9,24 @@
                 <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), ('individuation_page_PTD', '=', False)]}"/>
-                <field name="equipment_id" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}"/>
+                <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), ('individuation_page_PTD', '=', 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), ('individuation_page_PTD', '=', False)]}"/>
+                <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), ('individuation_page_PTD', '=', False)]}"/>
-                <field name="is_inspect" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}"/>
+                       attrs="{'invisible': [('production_id', '=', False)]}"/>
+                <field name="is_inspect" attrs="{'invisible': [('production_id', '=', False)]}"/>
             </xpath>
             <xpath expr="//page[@name='notes']" position="before">
-                <page string="检测报告" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}">
+                <page string="检测报告" attrs="{'invisible': [('production_id', '=', False)]}">
                     <field name="detection_report" string="" widget="pdf_viewer"/>
                 </page>
-                <page string="判定结果" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}">
+                <page string="判定结果" attrs="{'invisible': [('production_id', '=', False)]}">
                     <group>
                         <group>
                             <field name="test_results" attrs="{'readonly': [('quality_state','in', ['pass', 'fail'])]}"/>
@@ -35,25 +37,33 @@
                         </group>
                     </group>
                 </page>
-                <page string="2D图纸" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}">
+                <page string="2D图纸" attrs="{'invisible': [('production_id', '=', False)]}">
                     <field name="machining_drawings" string="" widget="adaptive_viewer"/>
                 </page>
-                <page string="客户质量标准" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}">
+                <page string="客户质量标准" attrs="{'invisible': [('production_id', '=', False)]}">
                     <field name="quality_standard" string="" widget="adaptive_viewer"/>
                 </page>
                 <page string="其他"
-                      attrs="{'invisible': ['|','|', ('quality_state', 'not in', ['pass', 'fail']), ('production_id', '=', False),('individuation_page_PTD', '=', 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: