Accept Merge Request #2255: (feature/6711 -> develop)

Merge Request: 日计划量对工单id去重

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

jikimo_demand_plan_queue/__init__.py

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import models

jikimo_demand_plan_queue/__manifest__.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+{
+    'name': '机企猫 需求计划排程队列',
+    'version': '1.0',
+    'summary': """ 使用队列进行排程 """,
+    'author': 'fox',
+    'website': '',
+    'category': '',
+    'depends': ['queue_job_batch', 'sf_demand_plan'],
+    'data': [
+        
+    ],
+    
+    'application': True,
+    'installable': True,
+    'auto_install': False,
+    'license': 'LGPL-3',
+}

jikimo_demand_plan_queue/models/__init__.py

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import production_demand_plan

jikimo_demand_plan_queue/models/production_demand_plan.py

@@ -0,0 +1,20 @@
+from odoo import models, fields
+
+
+class ProductionDemandPlan(models.Model):
+    _inherit = 'sf.production.demand.plan'
+
+
+    def _do_production_schedule(self, pro_plan_list):
+        """使用队列进行排程"""
+        batch_size = 10
+        current_time = fields.Datetime.now().strftime('%Y%m%d%H%M%S')
+        index = 1
+        for i in range(0, len(pro_plan_list), batch_size):
+            batch = self.env['queue.job.batch'].get_new_batch('plan-%s-%s' % (current_time, index))
+            pro_plans = pro_plan_list[i:i+batch_size]
+            pro_plans.with_context(
+                job_batch=batch
+            ).with_delay().do_production_schedule()
+            index += 1
+        batch.enqueue()

sf_demand_plan/models/sf_production_demand_plan.py

@@ -72,7 +72,6 @@ class SfProductionDemandPlan(models.Model):
     model_long = fields.Char('尺寸(mm)', compute='_compute_model_long')
     blank_type = fields.Selection([('圆料', '圆料'), ('方料', '方料')], string='坯料分类',
                                   related='product_id.blank_type')
-    blank_precision = fields.Selection([('精坯', '精坯'), ('粗坯', '粗坯')], string='坯料类型', related='product_id.blank_precision')
     embryo_long = fields.Char('坯料尺寸(mm)', compute='_compute_embryo_long')
     materials_id = fields.Char('材料', compute='_compute_materials_id', store=True)
     model_machining_precision = fields.Selection(selection=_get_machining_precision, string='精度',
@@ -327,9 +326,13 @@ class SfProductionDemandPlan(models.Model):
             date_planned_start = datetime.combine(date_part, time_part)
             pro_plan_list.production_line_id = sf_production_line.id
             pro_plan_list.date_planned_start = date_planned_start
+            self._do_production_schedule(pro_plan_list)
+
+    def _do_production_schedule(self, pro_plan_list):
         for pro_plan in pro_plan_list:
             pro_plan.do_production_schedule()
 
+
     def button_action_print(self):
         return {
             'res_model': 'sf.demand.plan.print.wizard',

sf_demand_plan/static/src/scss/style.css

@@ -82,8 +82,3 @@
         cursor: pointer;
     }
 }
-
-th[data-name=processing_time] + th::before{
-    content: '待执行单据';
-    line-height: 38px;
-}

sf_demand_plan/views/demand_plan.xml

@@ -4,15 +4,14 @@
         <field name="model">sf.production.demand.plan</field>
         <field name="arch" type="xml">
             <tree string="需求计划" default_order="sequence desc,id desc" editable="bottom"
-                  class="demand_plan_tree freeze-columns-before-part_number">
+                  class="demand_plan_tree">
                 <header>
                     <button string="打印" name="button_action_print" type="object"
                             class="btn-primary"/>
-                    <button string="创建工艺设计任务" name="%(sf_manufacturing.action_create_technology_design_task_wizard)d" 
-                            type="action" class="btn-secondary" context="{'active_model': 'sf.production.demand.plan', 'active_ids': active_ids}"/>
                 </header>
                 <field name="sequence" widget="handle"/>
                 <field name="id" optional="hide"/>
+                <field name="priority"/>
                 <field name="status"/>
                 <field name="customer_name"/>
                 <field name="order_remark"/>
@@ -30,7 +29,6 @@
                 <field name="qty_to_deliver"/>
                 <field name="model_long"/>
                 <field name="blank_type" optional="hide"/>
-                <field name="blank_precision"/>
                 <field name="embryo_long"/>
                 <field name="materials_id"/>
                 <field name="model_machining_precision"/>
@@ -45,10 +43,7 @@
                 <field name="date_order"/>
                 <field name="contract_code"/>
                 <field name="plan_remark"/>
-                <field name="priority" decoration-danger="priority == '1'"
+                <field name="processing_time"/>
-                       decoration-warning="priority == '2'"
-                       decoration-info="priority == '3'"
-                       decoration-success="priority == '4'"/>
                 <field name="material_check" optional="hide"/>
                 <field name="hide_action_open_mrp_production" invisible="1"/>
                 <field name="hide_action_purchase_orders" invisible="1"/>
@@ -67,7 +62,6 @@
                 <field name="planned_start_date"/>
                 <field name="actual_start_date"/>
                 <field name="actual_end_date"/>
-                <field name="processing_time"/>
                 <field name="create_date" optional="hide" string="创建时间"/>
                 <field name="create_uid" optional="hide" string="创建人"/>
                 <field name="write_date" string="更新时间"/>
@@ -97,8 +91,7 @@
                 <group expand="0" string="Group By">
                     <filter name="group_by_priority" string="优先级" domain="[]" context="{'group_by': 'priority'}"/>
                     <filter name="group_by_status" string="状态" domain="[]" context="{'group_by': 'status'}"/>
-                    <filter name="group_by_customer_name" string="客户" domain="[]"
+                    <filter name="group_by_customer_name" string="客户" domain="[]" context="{'group_by': 'customer_name'}"/>
-                            context="{'group_by': 'customer_name'}"/>
                     <filter name="group_by_is_incoming_material" string="客供料" domain="[]"
                             context="{'group_by': 'is_incoming_material'}"/>
                     <filter name="group_by_supply_method" string="供货方式" domain="[]"
@@ -129,9 +122,4 @@
             action="sf_production_demand_plan_action"
             parent="sf_plan.sf_production_plan_menu"
     />
-
-    <!--    调拨动作中屏蔽验证-->
-    <record id="stock.action_validate_picking" model="ir.actions.server">
-        <field name="binding_model_id" eval="False"/>
-    </record>
 </odoo>

sf_dlm/models/product_supplierinfo.py

@@ -3,7 +3,6 @@ import logging
 
 import re
 from odoo import models, fields, api
-from odoo.exceptions import ValidationError
 
 
 class ResProductCategory(models.Model):
@@ -48,14 +47,11 @@ class ResMrpBomMo(models.Model):
                 item.subcontractor_name = ''
 
     def bom_create_line_has(self, embryo):
-        product = self.product_tmpl_id
-        if product.unit_number in (0, None, False):
-            raise ValidationError(f'产品{product.name}单件用量的值不能为{product.unit_number}')
         vals = {
             'bom_id': self.id,
             'product_id': embryo.id,
             'product_tmpl_id': embryo.product_tmpl_id.id,
-            'product_qty': product.unit_number,
+            'product_qty': 1,
             'product_uom_id': 1
         }
         return self.env['mrp.bom.line'].sudo().create(vals)

sf_dlm_management/views/product_template_management_view.xml

@@ -95,8 +95,6 @@
                     <page string="加工参数">
                         <group>
                             <group string="模型">
-                                <field name="blank_type" readonly="1"/>
-                                <field name="blank_precision" readonly="1"/>
                                 <label for="model_long" string="坯料尺寸[mm]"/>
                                 <div class="o_address_format">
                                     <label for="model_long" string="长"/>
@@ -106,7 +104,7 @@
                                     <label for="model_height" string="高"/>
                                     <field name="model_height" class="o_address_zip"/>
                                 </div>
-                                <field name="unit_number" readonly="1"/>
+                                <field name="blank_type" readonly="1"/>
                                 <field name="model_volume" string="体积[mm³]"/>
                                 <field name="product_model_type_id" string="模型类型"/>
                                 <field name="model_processing_panel" placeholder="例如R,U" string="加工面板"

sf_machine_connect/controllers/controllers.py

@@ -437,7 +437,7 @@ class Sf_Dashboard_Connect(http.Controller):
                     ('state', 'in', ['ready', 'progress', 'done'])
                 ])
 
-                plan_data_total_counts = sum(plan_data_total.mapped('qty_produced'))
+                plan_data_total_counts = sum(plan_data_total.mapped('qty_production'))
 
                 # # 工单完成量
                 # plan_data_finish_counts = plan_obj.search_count(
@@ -601,8 +601,11 @@ class Sf_Dashboard_Connect(http.Controller):
         line_list = ast.literal_eval(kw['line_list'])
         begin_time_str = kw['begin_time'].strip('"')
         end_time_str = kw['end_time'].strip('"')
-        begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
+        # 将时间减去8小时（UTC+8转UTC）
-        end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
+        begin_time = (datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S') - timedelta(hours=8))
+        end_time = (datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S') - timedelta(hours=8))
+        # begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
+        # end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
         # print('line_list: %s' % line_list)
         print('kw', kw)
         time_unit = kw.get('time_unit', 'day').strip('"')  # 默认单位为天
@@ -637,6 +640,15 @@ class Sf_Dashboard_Connect(http.Controller):
 
         if time_unit == 'hour':
 
+            # 计划量，目前只能从mail.message中筛选出
+            plan_order_messages = request.env['mail.message'].sudo().search([
+                ('model', '=', 'mrp.workorder'),
+                ('create_date', '>=', begin_time.strftime('%Y-%m-%d %H:%M:%S')),
+                ('create_date', '<=', end_time.strftime('%Y-%m-%d %H:%M:%S')),
+                ('tracking_value_ids.field_desc', '=', '状态'),
+                ('tracking_value_ids.new_value_char', '=', '就绪')
+            ])
+                
             for line in line_list:
                 date_field_name = 'date_finished'  # 替换为你模型中的实际字段名
                 order_counts = []
@@ -678,19 +690,10 @@ class Sf_Dashboard_Connect(http.Controller):
                     )                    
 
                     # 使用小时和分钟作为键，确保每个小时的数据有独立的键
-                    key = start_time.strftime('%H:%M:%S')  # 只取小时:分钟:秒作为键
+                    key = (start_time + timedelta(hours=8)).strftime('%H:%M:%S')  # 只取小时:分钟:秒作为键
                     # time_count_dict[key] = len(orders)
                     time_count_dict[key] = sum(interval_orders.mapped('qty_produced'))
 
-                # 计划量，目前只能从mail.message中筛选出
-                plan_order_messages = request.env['mail.message'].sudo().search([
-                    ('model', '=', 'mrp.workorder'),
-                    ('create_date', '>=', begin_time.strftime('%Y-%m-%d %H:%M:%S')),
-                    ('create_date', '<=', end_time.strftime('%Y-%m-%d %H:%M:%S')),
-                    ('tracking_value_ids.field_desc', '=', '状态'),
-                    ('tracking_value_ids.new_value_char', '=', '就绪')
-                ])
-
                 for time_interval in time_intervals:
                     start_time, end_time = time_interval
 
@@ -706,7 +709,9 @@ class Sf_Dashboard_Connect(http.Controller):
                         and o.create_date <= end_time
                     )
 
-                    interval_orders = request.env['mrp.workorder'].sudo().browse(interval_plan_orders.mapped('res_id'))
+                    interval_order_ids = set(interval_plan_orders.mapped('res_id'))
+
+                    interval_orders = request.env['mrp.workorder'].sudo().browse(interval_order_ids)
                     if line == '业绩总览':
                         interval_orders = interval_orders.filtered(lambda o: o.routing_type in ['人工线下加工', 'CNC加工'])
                     elif line == '人工线下加工中心':
@@ -715,9 +720,9 @@ class Sf_Dashboard_Connect(http.Controller):
                         interval_orders = interval_orders.filtered(lambda o: o.routing_type == 'CNC加工' and o.production_line_id.name == line)
 
                     # 使用小时和分钟作为键，确保每个小时的数据有独立的键
-                    key = start_time.strftime('%H:%M:%S')  # 只取小时:分钟:秒作为键
+                    key = (start_time + timedelta(hours=8)).strftime('%H:%M:%S')  # 只取小时:分钟:秒作为键
                     # time_count_dict[key] = len(orders)
-                    plan_count_dict[key] = sum(interval_orders.mapped('qty_produced'))
+                    plan_count_dict[key] = sum(interval_orders.mapped('qty_production'))
 
                 # order_counts.append()
                 res['data'][line] = {
@@ -859,21 +864,37 @@ class Sf_Dashboard_Connect(http.Controller):
         """
         # res = {'status': 1, 'message': '成功', 'not_done_data': [], 'done_data': []}
         res = {'status': 1, 'message': '成功', 'data': {}}
+        # 解决产品名称取到英文的问题
+        request.update_context(lang='zh_CN')
         plan_obj = request.env['sf.production.plan'].sudo()
         work_order_obj = request.env['mrp.workorder'].sudo()
+        # 获取mrp.workorder的state字段的selection内容
+        state_dict = dict(request.env['mrp.workorder'].sudo()._fields['state'].selection)
         line_list = ast.literal_eval(kw['line_list'])
         begin_time_str = kw['begin_time'].strip('"')
         end_time_str = kw['end_time'].strip('"')
         begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
         end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
         # print('line_list: %s' % line_list)
-        not_done_data = []
-        done_data = []
         final_data = {}
-        not_done_index = 1
+
-        done_index = 1
+        # 获取当前时间，并计算24小时前的时间
+        current_time = datetime.now()
+        time_48_hours_ago = current_time - timedelta(hours=48)
+
+        # # 计划量，目前只能从mail.message中筛选出
+        # plan_order_messages = request.env['mail.message'].sudo().search([
+        #     ('model', '=', 'mrp.workorder'),
+        #     ('create_date', '>=', time_48_hours_ago.strftime('%Y-%m-%d %H:%M:%S')),
+        #     ('tracking_value_ids.field_desc', '=', '状态'),
+        #     ('tracking_value_ids.new_value_char', 'in', ['就绪', '生产中'])
+        # ])
 
         for line in line_list:
+            not_done_data = []
+            done_data = []
+            not_done_index = 1
+            done_index = 1
 
             if line == '业绩总览':
                 work_order_domain = [('routing_type', 'in', ['人工线下加工', 'CNC加工'])]
@@ -889,21 +910,31 @@ class Sf_Dashboard_Connect(http.Controller):
             #     [('production_line_id.name', '=', line), ('state', 'not in', ['finished']),
             #      ('production_id.state', 'not in', ['cancel', 'done']), ('active', '=', True)
             #      ])
-            not_done_orders = work_order_obj.search(work_order_domain + 
+            not_done_orders = work_order_obj.search(work_order_domain + [
-                [('state', 'in', ['ready', 'progress'])], order='id asc'
+                    ('state', 'in', ['ready', 'progress']),
+                    ('date_planned_start', '>=', time_48_hours_ago)
+                ], order='id asc'
             )
+            # not_done_orders = request.env['mrp.workorder'].sudo().browse(plan_order_messages.mapped('res_id'))
+            # if line == '业绩总览':
+            #     not_done_orders = not_done_orders.filtered(lambda o: o.routing_type in ['人工线下加工', 'CNC加工'])
+            # elif line == '人工线下加工中心':
+            #     not_done_orders = not_done_orders.filtered(lambda o: o.routing_type == '人工线下加工')
+            # else:
+            #     not_done_orders = not_done_orders.filtered(lambda o: o.routing_type == 'CNC加工' and o.production_line_id.name == line)
+
 
             # 完成订单
             # 获取当前时间，并计算24小时前的时间
-            current_time = datetime.now()
+            # current_time = datetime.now()
-            time_24_hours_ago = current_time - timedelta(hours=24)
+            # time_24_hours_ago = current_time - timedelta(hours=24)
 
             finish_orders = work_order_obj.search(work_order_domain + [
-                ('state', 'in', ['finished']),
+                ('state', 'in', ['done']),
                 ('production_id.state', 'not in', ['cancel']),
-                ('date_finished', '>=', time_24_hours_ago)
+                ('date_finished', '>=', time_48_hours_ago)
             ], order='id asc')
-            # print(finish_orders)
+            # logging.info('完成订单: %s' % finish_orders)
 
             # 获取所有未完成订单的ID列表
             order_ids = [order.id for order in not_done_orders]
@@ -939,14 +970,6 @@ class Sf_Dashboard_Connect(http.Controller):
                 material_match = re.search(material_pattern, blank_name)
                 material = material_match.group(1) if material_match else 'No match found'
 
-                state_dict = {
-                    'draft': '待排程',
-                    'done': '已排程',
-                    'processing': '生产中',
-                    'finished': '已完成',
-                    'ready': '待加工',
-                    'progress': '生产中',
-                }
 
                 line_dict = {
                     'sequence': not_done_index,
@@ -962,8 +985,6 @@ class Sf_Dashboard_Connect(http.Controller):
                 not_done_index += 1
 
             for finish_order in finish_orders:
-                if not finish_order.actual_end_time:
-                    continue
                 blank_name = ''
                 try:
                     blank_name = finish_order.production_id.move_raw_ids[0].product_id.name
@@ -979,13 +1000,13 @@ class Sf_Dashboard_Connect(http.Controller):
 
                 line_dict = {
                     'sequence': done_index,
-                    'workorder_name': finish_order.name,
+                    'workorder_name': finish_order.production_id.name,
                     'blank_name': blank_name,
                     'material': material,
                     'dimensions': dimensions,
-                    'order_qty': order.qty_produced,
+                    'order_qty': finish_order.qty_produced,
-                    'finish_time': finish_order.actual_end_time.strftime(
+                    'finish_time': finish_order.date_finished.strftime(
-                        '%Y-%m-%d %H:%M:%S') if finish_order.actual_end_time else ' '
+                        '%Y-%m-%d %H:%M:%S') if finish_order.date_finished else ' '
 
                 }
                 done_data.append(line_dict)

sf_manufacturing/__manifest__.py

@@ -31,7 +31,6 @@
         'wizard/sf_programming_reason_views.xml',
         'wizard/sale_order_cancel_views.xml',
         'wizard/process_outsourcing.xml',
-        'wizard/create_technology_design_task_wizard_views.xml',
         'views/mrp_views_menus.xml',
         'views/agv_scheduling_views.xml',
         'views/stock_lot_views.xml',
@@ -49,8 +48,6 @@
         'views/mrp_workorder_batch_replan.xml',
         'views/purchase_order_view.xml',
         'views/product_template_views.xml',
-        'views/sf_technology_design_task_views.xml',
-        'views/sf_technology_design_task_dashboard.xml',
         # 'views/stock_warehouse_orderpoint.xml',
     ],
     'assets': {

sf_manufacturing/data/stock_data.xml

@@ -36,14 +36,6 @@
             <field name="padding">5</field>
         </record>
 
-        <record id="sequence_technology_design_task" model="ir.sequence">
-            <field name="name">工艺设计任务编码规则</field>
-            <field name="code">sf.technology.design.task</field>
-            <field name="prefix">TD/%(year)s%(month)s%(day)s/</field>
-            <field name="padding">4</field>
-            <field name="company_id" eval="False"/>
-        </record>
-
         <record id="stock_location_locations_virtual_outcontract" model="stock.location">
             <field name="name">外协</field>
             <field name="location_id" ref="stock.stock_location_locations_virtual"/>

sf_manufacturing/models/__init__.py

@@ -18,5 +18,5 @@ from . import quick_easy_order
 from . import purchase_order
 from . import quality_check
 from . import purchase_request_line
-from . import sf_technology_design_task
+from . import bom
 # from . import stock_warehouse_orderpoint

sf_manufacturing/models/bom.py

@@ -0,0 +1,16 @@
+from odoo import models
+from odoo.osv.expression import AND
+
+
+class MrpBom(models.Model):
+    _inherit = 'mrp.bom'
+
+    def _bom_subcontract_find(self, product, picking_type=None, company_id=False, bom_type='subcontract', subcontractor=False):
+        domain = self._bom_find_domain(product, picking_type=picking_type, company_id=company_id, bom_type=bom_type)
+        if self.env.context.get('stock_picking') == 'outsourcing':
+            return self.search(domain, order='sequence, product_id, id', limit=1)
+        if subcontractor:
+            domain = AND([domain, [('subcontractor_ids', 'parent_of', subcontractor.ids)]])
+            return self.search(domain, order='sequence, product_id, id', limit=1)
+        else:
+            return self.env['mrp.bom']

sf_manufacturing/models/mrp_production.py

@@ -1709,7 +1709,77 @@ class MrpProduction(models.Model):
                         vals['procurement_group_id'] = product_group_id[product_id.id]
                 else:
                     vals['procurement_group_id'] = is_custemer_group_id[key]
-        return super(MrpProduction, self).create(vals_list)
+
+        productions = super(MrpProduction, self).create(vals_list)
+
+        # 查询成品工序排序（自动化产线加工）,供后续使用
+        product_model_type_routing_sorts = self.env['sf.product.model.type.routing.sort'].search([], order='sequence asc')
+        # 查询成品工序排序（人工线下加工）,供后续使用
+        manual_product_model_type_routing_sorts = self.env['sf.manual.product.model.type.routing.sort'].search([], order='sequence asc')
+        # 查询坯料工序排序，供后续使用
+        embryo_model_type_routing_sorts = self.env['sf.embryo.model.type.routing.sort'].search([], order='sequence asc')
+
+        for production in productions:
+            # 生成序列号
+            production.action_generate_serial()
+            # 创建工序模板
+            technology_design_values = []
+            i = 0
+            if production.product_id.categ_id.type == '成品':
+                # 根据加工面板的面数及成品工序模板生成工序设计
+                if production.production_type == '自动化产线加工':
+                    product_routing_workcenter = product_model_type_routing_sorts.filtered(
+                        lambda s: s.product_model_type_id.id == production.product_id.product_model_type_id.id
+                    )
+                else:
+                    product_routing_workcenter = manual_product_model_type_routing_sorts.filtered(
+                        lambda s: s.manual_product_model_type_id.id == production.product_id.product_model_type_id.id
+                    )
+                if production.production_type == '自动化产线加工':
+                    for k in (production.product_id.model_processing_panel.split(',')):
+                        for route in product_routing_workcenter:
+                            i += 1
+                            technology_design_values.append(
+                                self.env['sf.technology.design'].json_technology_design_str(k, route, i, False)
+                            )
+                elif production.production_type == '人工线下加工':
+                    for route in product_routing_workcenter:
+                        i += 1
+                        technology_design_values.append(
+                            self.env['sf.technology.design'].json_technology_design_str('ZM', route, i, False)
+                        )
+                else:
+                    for route in product_routing_workcenter:
+                        i += 1
+                        technology_design_values.append(
+                            self.env['sf.technology.design'].json_technology_design_str(False, route, i, False)
+                        )
+            elif production.product_id.categ_id.type == '坯料':
+                embryo_routing_workcenter = embryo_model_type_routing_sorts.filtered(
+                    lambda s: s.embryo_model_type_id.id == production.product_id.embryo_model_type_id.id
+                )
+                for route_embryo in embryo_routing_workcenter:
+                    i += 1
+                    technology_design_values.append(
+                        self.env['sf.technology.design'].json_technology_design_str(False, route_embryo, i, False)
+                    )
+            # 处理表面工艺
+            for item in production.product_id.product_model_type_id.surface_technics_routing_tmpl_ids:
+                if item.route_workcenter_id.surface_technics_id.id:
+                    for process_param in production.product_id.model_process_parameters_ids:
+                        if item.route_workcenter_id.surface_technics_id == process_param.process_id:
+                            technology_design_values.append(
+                            self.env['sf.technology.design'].json_technology_design_str(
+                                False,
+                                item.route_workcenter_id,
+                                i,
+                                process_param
+                            )
+                        )
+            production.technology_design_ids = technology_design_values
+        # 设置制造订单状态为待工艺确认
+        productions.write({'state': 'technology_to_confirmed'})
+        return productions
 
     @api.depends('procurement_group_id.stock_move_ids.created_purchase_line_id.order_id',
                  'procurement_group_id.stock_move_ids.move_orig_ids.purchase_line_id.order_id')

sf_manufacturing/models/product_template.py

@@ -27,11 +27,9 @@ class ResProductMo(models.Model):
     categ_type = fields.Selection(string='产品的类别', related='categ_id.type', store=True)
     model_name = fields.Char('模型名称')
     blank_type = fields.Selection([('圆料', '圆料'), ('方料', '方料')], string='坯料分类')
-    blank_precision = fields.Selection([('精坯', '精坯'), ('粗坯', '粗坯')], string='坯料类型')
     model_long = fields.Float('模型长(mm)', digits=(16, 3))
     model_width = fields.Float('模型宽(mm)', digits=(16, 3))
     model_height = fields.Float('模型高(mm)', digits=(16, 3))
-    unit_number = fields.Float('单件用量', digits=(16, 3), default=1)
     model_volume = fields.Float('模型体积(m³)')
     model_area = fields.Float('模型表面积(m²)')
     model_machining_precision = fields.Selection(selection=_get_machining_precision, string='加工精度')
@@ -903,11 +901,9 @@ class ResProductMo(models.Model):
         vals = {
             'name': product_name,
             'blank_type': item.get('blank_type'),
-            'blank_precision': item.get('blank_precision'),
             'model_long': item.get('blank_length') if blank_bool else self.format_float(item['model_long'] + embryo_redundancy_id.long),
             'model_width': item.get('blank_width') if blank_bool else self.format_float(item['model_width'] + embryo_redundancy_id.width),
             'model_height': item.get('blank_height') if blank_bool else self.format_float(item['model_height'] + embryo_redundancy_id.height),
-            'unit_number': item.get('unit_number'),
             'model_volume': self.format_float(((item['model_long'] + embryo_redundancy_id.long) *
                              (item['model_width'] + embryo_redundancy_id.width) *
                              (item['model_height'] + embryo_redundancy_id.height))) if not blank_bool else (

sf_manufacturing/models/sf_technology_design_task.py

@@ -1,251 +0,0 @@
-# -*- coding: utf-8 -*-
-from odoo import fields, models, api, _
-from odoo.exceptions import ValidationError
-
-
-class SfTechnologyDesignTask(models.Model):
-    _name = 'sf.technology.design.task'
-    _description = '工艺设计任务'
-    _order = 'create_date desc'
-    _inherit = ['mail.thread', 'mail.activity.mixin']
-
-    # 基本信息
-    name = fields.Char('任务编号', required=True, copy=False, readonly=True, 
-                      default=lambda self: _('New'))
-    state = fields.Selection([
-        ('pending', '待工艺设计'),
-        ('in_progress', '进行中'),
-        ('completed', '已完成'),
-        ('cancelled', '已取消'),
-    ], string='状态', default='pending', tracking=True)
-    
-    # 关联需求计划
-    demand_plan_id = fields.Many2one('sf.production.demand.plan', string='需求计划', required=True, ondelete='cascade')
-    
-    # 销售订单信息
-    sale_order_id = fields.Many2one('sale.order', string='销售订单', compute='_compute_sale_order_info', store=True)
-    sale_order_line_id = fields.Many2one('sale.order.line', string='销售订单明细', compute='_compute_sale_order_info', store=True)
-    customer_name = fields.Char('客户名称', compute='_compute_sale_order_info', store=True)
-    
-    # 产品信息
-    product_id = fields.Many2one('product.product', string='产品名称', compute='_compute_product_info', store=True)
-    part_name = fields.Char('零件名称', compute='_compute_product_info', store=True)
-    part_number = fields.Char('零件图号', compute='_compute_product_info', store=True)
-    model_id = fields.Char('模型ID', compute='_compute_product_info', store=True)
-    
-    # 产品类型和文件
-    product_type = fields.Selection([
-        ('standard', '标准件'),
-        ('custom', '定制件'),
-        ('prototype', '样件'),
-    ], string='零件类型', default='custom', store=True)
-    model_file = fields.Binary('模型文件', compute='_compute_model_info', store=True)
-    model_filename = fields.Char('模型文件名', compute='_compute_model_info', store=True)
-    
-    # 材料信息
-    materials_id = fields.Many2one('sf.production.materials', string='材料及型号', compute='_compute_material_info', store=True)
-    blank_type = fields.Selection([('圆料', '圆料'), ('方料', '方料')], string='坯料分类', compute='_compute_material_info', store=True)
-    blank_precision = fields.Selection([('精坯', '精坯'), ('粗坯', '粗坯')], string='坯料类型', compute='_compute_material_info', store=True)
-    embryo_long = fields.Char('坯料尺寸', compute='_compute_embryo_long', store=True)
-    
-    # 加工信息
-    machining_precision = fields.Selection([
-        ('0.10', '±0.10mm'),
-        ('0.05', '±0.05mm'),
-        ('0.03', '±0.03mm'),
-        ('0.02', '±0.02mm'),
-        ('0.01', '±0.01mm')
-    ], string='加工精度', compute='_compute_machining_info', store=True)
-    machining_panel = fields.Char('加工面', compute='_compute_machining_info', store=True)
-    
-    # 订单信息
-    product_uom_qty = fields.Float('订单数量', compute='_compute_order_info', store=True)
-    is_incoming_material = fields.Boolean('客供料', compute='_compute_order_info', store=True)
-    
-    # 工艺参数
-    clamping_times = fields.Integer('装夹次数', default=1)
-    single_clamping_duration = fields.Float('单次装夹时长(分钟)', default=30.0)
-    cnc_processing_duration = fields.Float('CNC加工时长(分钟)', default=0.0)
-    
-    # 质量要求
-    customer_quality_requirements = fields.Text('客户质量要求')
-    processing_drawing_2d = fields.Binary('2D加工图纸')
-    processing_drawing_filename = fields.Char('2D图纸文件名')
-    
-    # 时间信息
-    create_date = fields.Datetime('创建时间', default=fields.Datetime.now)
-    start_date = fields.Datetime('开始时间')
-    complete_date = fields.Datetime('完成时间')
-    deadline = fields.Datetime('截止时间')
-    
-    # 负责人
-    assigned_to = fields.Many2one('res.users', string='负责人', tracking=True)
-    created_by = fields.Many2one('res.users', string='创建人', default=lambda self: self.env.user, readonly=True)
-    
-    # 备注
-    notes = fields.Text('备注')
-    
-    @api.depends('demand_plan_id')
-    def _compute_sale_order_info(self):
-        for record in self:
-            if record.demand_plan_id:
-                record.sale_order_id = record.demand_plan_id.sale_order_id
-                record.sale_order_line_id = record.demand_plan_id.sale_order_line_id
-                record.customer_name = record.demand_plan_id.customer_name
-            else:
-                record.sale_order_id = False
-                record.sale_order_line_id = False
-                record.customer_name = ""
-
-    @api.depends('demand_plan_id')
-    def _compute_product_info(self):
-        for record in self:
-            if record.demand_plan_id and record.demand_plan_id.product_id:
-                record.product_id = record.demand_plan_id.product_id
-                if record.product_id.product_tmpl_id:
-                    record.part_name = record.product_id.product_tmpl_id.part_name
-                    record.part_number = record.product_id.product_tmpl_id.part_number
-                    record.model_id = record.product_id.product_tmpl_id.model_id
-                else:
-                    record.part_name = ""
-                    record.part_number = ""
-                    record.model_id = ""
-            else:
-                record.product_id = False
-                record.part_name = ""
-                record.part_number = ""
-                record.model_id = ""
-
-    @api.depends('product_id')
-    def _compute_model_info(self):
-        for record in self:
-            if record.product_id and record.product_id.product_tmpl_id:
-                template = record.product_id.product_tmpl_id
-                record.model_file = template.model_file
-                record.model_filename = template.model_name
-            else:
-                record.model_file = False
-                record.model_filename = ""
-
-    @api.depends('product_id')
-    def _compute_material_info(self):
-        for record in self:
-            if record.product_id and record.product_id.product_tmpl_id:
-                template = record.product_id.product_tmpl_id
-                record.materials_id = template.materials_id
-                record.blank_type = template.blank_type
-                record.blank_precision = template.blank_precision
-            else:
-                record.materials_id = False
-                record.blank_type = False
-                record.blank_precision = False
-
-    @api.depends('product_id')
-    def _compute_machining_info(self):
-        for record in self:
-            if record.product_id and record.product_id.product_tmpl_id:
-                template = record.product_id.product_tmpl_id
-                record.machining_precision = template.model_machining_precision
-                record.machining_panel = template.model_processing_panel
-            else:
-                record.machining_precision = False
-                record.machining_panel = ""
-
-    @api.depends('demand_plan_id')
-    def _compute_order_info(self):
-        for record in self:
-            if record.demand_plan_id:
-                record.product_uom_qty = record.demand_plan_id.product_uom_qty
-                record.is_incoming_material = record.demand_plan_id.is_incoming_material
-            else:
-                record.product_uom_qty = 0.0
-                record.is_incoming_material = False
-
-    @api.depends('product_id')
-    def _compute_embryo_long(self):
-        for record in self:
-            if record.product_id and record.product_id.product_tmpl_id:
-                template = record.product_id.product_tmpl_id
-                record.embryo_long = f"{template.model_long}×{template.model_width}×{template.model_height}"
-            else:
-                record.embryo_long = ""
-
-    @api.model
-    def create(self, vals):
-        if vals.get('name', _('New')) == _('New'):
-            vals['name'] = self.env['ir.sequence'].next_by_code('sf.technology.design.task') or _('New')
-        return super(SfTechnologyDesignTask, self).create(vals)
-    
-    def action_start_design(self):
-        """开始工艺设计"""
-        self.ensure_one()
-        if self.state != 'pending':
-            raise ValidationError(_('只有待工艺设计的任务才能开始设计'))
-        self.write({
-            'state': 'in_progress',
-            'start_date': fields.Datetime.now(),
-        })
-        self.message_post(body=_('工艺设计任务已开始'))
-    
-    def action_complete_design(self):
-        """完成工艺设计"""
-        self.ensure_one()
-        if self.state != 'in_progress':
-            raise ValidationError(_('只有进行中的任务才能完成'))
-        self.write({
-            'state': 'completed',
-            'complete_date': fields.Datetime.now(),
-        })
-        self.message_post(body=_('工艺设计任务已完成'))
-    
-    def action_cancel_task(self):
-        """取消任务"""
-        self.ensure_one()
-        if self.state in ['completed']:
-            raise ValidationError(_('已完成的任务不能取消'))
-        self.write({
-            'state': 'cancelled',
-        })
-        self.message_post(body=_('工艺设计任务已取消'))
-    
-    def action_reset_to_pending(self):
-        """重置为待工艺设计"""
-        self.ensure_one()
-        if self.state not in ['in_progress', 'cancelled']:
-            raise ValidationError(_('只有进行中或已取消的任务才能重置'))
-        self.write({
-            'state': 'pending',
-            'start_date': False,
-            'complete_date': False,
-        })
-        self.message_post(body=_('工艺设计任务已重置为待设计状态'))
-    
-    @api.model
-    def create_from_demand_plan(self, demand_plan_ids):
-        """从需求计划创建工艺设计任务"""
-        tasks = self.env['sf.technology.design.task']
-        for demand_plan in demand_plan_ids:
-            # 检查是否已存在工艺设计任务
-            existing_task = self.search([
-                ('demand_plan_id', '=', demand_plan.id),
-                ('state', 'not in', ['cancelled'])
-            ], limit=1)
-            
-            if not existing_task:
-                task_vals = {
-                    'demand_plan_id': demand_plan.id,
-                    'deadline': fields.Datetime.now() + fields.timedelta(days=3),  # 默认3天期限
-                }
-                task = self.create(task_vals)
-                tasks |= task
-        
-        return tasks
-    
-    def get_task_count_by_state(self):
-        """获取各状态的任务数量"""
-        return {
-            'pending': self.search_count([('state', '=', 'pending')]),
-            'in_progress': self.search_count([('state', '=', 'in_progress')]),
-            'completed': self.search_count([('state', '=', 'completed')]),
-            'cancelled': self.search_count([('state', '=', 'cancelled')]),
-        } 

sf_manufacturing/models/stock.py

@@ -95,35 +95,36 @@ class StockRule(models.Model):
                                                                            precision_rounding=proc[
                                                                                0].product_uom.rounding) > 0)
         list2 = []
-        for item in procurements:
+        for procurement, rule in procurements:
-            num = int(item[0].product_qty)
+            num = int(procurement.product_qty)
 
-            product = self.env['product.product'].search(
+            warehouse_id = rule.warehouse_id
-                [("id", '=', item[0].product_id.id)])
+            if not warehouse_id:
-            product_tmpl = self.env['product.template'].search(
+                warehouse_id = rule.location_dest_id.warehouse_id
-                ["&", ("id", '=', product.product_tmpl_id.id), ('single_manufacturing', "!=", False)])
+            manu_rule = rule.route_id.rule_ids.filtered(lambda r: r.action == 'manufacture' and r.warehouse_id == warehouse_id)
-            if product_tmpl:
+
+            if procurement.product_id.product_tmpl_id.single_manufacturing and manu_rule:
                 if num > 1:
                     for no in range(1, num + 1):
                         Procurement = namedtuple('Procurement', ['product_id', 'product_qty',
                                                                  'product_uom', 'location_id', 'name', 'origin',
                                                                  'company_id',
                                                                  'values'])
-                        s = Procurement(product_id=item[0].product_id, product_qty=1.0, product_uom=item[0].product_uom,
+                        s = Procurement(product_id=procurement.product_id, product_qty=1.0, product_uom=procurement.product_uom,
-                                        location_id=item[0].location_id,
+                                        location_id=procurement.location_id,
-                                        name=item[0].name,
+                                        name=procurement.name,
-                                        origin=item[0].origin,
+                                        origin=procurement.origin,
-                                        company_id=item[0].company_id,
+                                        company_id=procurement.company_id,
-                                        values=item[0].values,
+                                        values=procurement.values,
                                         )
-                        item1 = list(item)
+                        # item1 = list(item)
-                        item1[0] = s
+                        # item1[0] = s
 
-                        list2.append(tuple(item1))
+                        list2.append((s, rule))
                 else:
-                    list2.append(item)
+                    list2.append((procurement, rule))
             else:
-                list2.append(item)
+                list2.append((procurement, rule))
 
         for procurement, rule in list2:
             procure_method = rule.procure_method
@@ -162,215 +163,203 @@ class StockRule(models.Model):
             [('res_id', '=', res_id), ('res_field', '=', res_field)], limit=1)
         attachment_info.write({'name': name})
 
-    @api.model
+    # @api.model
-    def _run_manufacture(self, procurements):
+    # def _run_manufacture(self, procurements):
-        productions_values_by_company = defaultdict(list)
+    #     productions_values_by_company = defaultdict(list)
-        errors = []
+    #     errors = []
-        for procurement, rule in procurements:
+    #     for procurement, rule in procurements:
-            if float_compare(procurement.product_qty, 0, precision_rounding=procurement.product_uom.rounding) <= 0:
+    #         if float_compare(procurement.product_qty, 0, precision_rounding=procurement.product_uom.rounding) <= 0:
-                # If procurement contains negative quantity, don't create a MO that would be for a negative value.
+    #             # If procurement contains negative quantity, don't create a MO that would be for a negative value.
-                continue
+    #             continue
-            bom = rule._get_matching_bom(procurement.product_id, procurement.company_id, procurement.values)
+    #         bom = rule._get_matching_bom(procurement.product_id, procurement.company_id, procurement.values)
 
-            productions_values_by_company[procurement.company_id.id].append(rule._prepare_mo_vals(*procurement, bom))
+    #         productions_values_by_company[procurement.company_id.id].append(rule._prepare_mo_vals(*procurement, bom))
 
-        if errors:
+    #     if errors:
-            raise ProcurementException(errors)
+    #         raise ProcurementException(errors)
 
-        for company_id, productions_values in productions_values_by_company.items():
+    #     for company_id, productions_values in productions_values_by_company.items():
-            # create the MO as SUPERUSER because the current user may not have the rights to do it
+    #         # create the MO as SUPERUSER because the current user may not have the rights to do it
-            # (mto product launched by a sale for example)
+    #         # (mto product launched by a sale for example)
-            '''创建制造订单'''
+    #         '''创建制造订单'''
-            productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(company_id).create(
+    #         productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(company_id).create(
-                productions_values)
+    #             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
+    #         # productions._create_workorder()
+    #         #
+    #         # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
+    #         productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \
+    #                                        (
+    #                                                p.move_dest_ids.procure_method != 'make_to_order' and not
+    #                                        p.move_raw_ids and not p.workorder_ids)).action_confirm()
+    #         # 处理 根据制造订单生成的采购单坯料入库时到原材料库，手动将原材料位置该为坯料存货区
+    #         for production in productions:
+    #             if production.picking_ids:
+    #                 product_type_id = production.picking_ids[0].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
+    #                     for picking_id in production.picking_ids:
+    #                         if picking_id.picking_type_id.name == '内部调拨':
+    #                             if picking_id.location_dest_id.product_type != product_type_id:
+    #                                 picking_id.location_dest_id = location_id.id
+    #                         elif picking_id.picking_type_id.name == '生产发料':
+    #                             if picking_id.location_id.product_type != product_type_id:
+    #                                 picking_id.location_id = location_id.id
+
+    #         for production in productions:
+    #             '''
+    #             创建制造订单时生成序列号
+    #             '''
+    #             # production.action_generate_serial()
+    #             origin_production = production.move_dest_ids and production.move_dest_ids[
+    #                 0].raw_material_production_id or False
+    #             orderpoint = production.orderpoint_id
+    #             if orderpoint and orderpoint.create_uid.id == SUPERUSER_ID and orderpoint.trigger == 'manual':
+    #                 production.message_post(
+    #                     body=_('This production order has been created from Replenishment Report.'),
+    #                     message_type='comment',
+    #                     subtype_xmlid='mail.mt_note')
+    #             elif orderpoint:
+    #                 production.message_post_with_view(
+    #                     'mail.message_origin_link',
+    #                     values={'self': production, 'origin': orderpoint},
+    #                     subtype_id=self.env.ref('mail.mt_note').id)
+    #             elif origin_production:
+    #                 production.message_post_with_view(
+    #                     'mail.message_origin_link',
+    #                     values={'self': production, 'origin': origin_production},
+    #                     subtype_id=self.env.ref('mail.mt_note').id)
+
+    #             '''
+    #             创建生产计划
+    #             '''
+    #             # 工单耗时
+    #             # workorder_duration = 0
+    #             # for workorder in production.workorder_ids:
+    #             #     workorder_duration += workorder.duration_expected
+
+    #             # sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)])
+    #             # # 如果订单为空，则获取来源制造订单的销售单
+    #             # if not sale_order:
+    #             #     mrp_production = self.env['mrp.production'].sudo().search([('name', '=', production.origin)],
+    #             #                                                               limit=1)
+    #             #     if mrp_production:
+    #             #         sale_order = self.env['sale.order'].sudo().search([('name', '=', mrp_production.origin)])
+    #             # else:
+    #             #     mrp_production = production
+    #             # # if sale_order:
+    #             # # sale_order.write({'schedule_status': 'to schedule'})
+    #             # self.env['sf.production.plan'].sudo().with_company(company_id).create({
+    #             #     'name': production.name,
+    #             #     'order_deadline': sale_order.deadline_of_delivery,
+    #             #     'production_id': production.id,
+    #             #     'date_planned_start': production.date_planned_start,
+    #             #     'origin': mrp_production.origin,
+    #             #     'product_qty': production.product_qty,
+    #             #     'product_id': production.product_id.id,
+    #             #     'state': 'draft',
+    #             # })
+    #         all_production = productions
+    #         grouped_product_ids = {k: list(g) for k, g in groupby(all_production, key=lambda x: x.product_id.id)}
+    #         # 初始化一个字典来存储每个product_id对应的生产订单名称列表
+    #         product_id_to_production_names = {}
+    #         # 对于每个product_id，获取其所有生产订单的名称
+    #         for product_id, all_production in grouped_product_ids.items():
+    #             # 为同一个product_id创建一个生产订单名称列表
+    #             product_id_to_production_names[product_id] = [production.name for production in all_production]
+    #         for production_item in productions:
+    #             technology_design_values = []
+    #             # production_programming = self.env['mrp.production'].search(
+    #             #     [('product_id.id', '=', production_item.product_id.id),
+    #             #      ('origin', '=', production_item.origin)],
+    #             #     limit=1, order='id asc')
+    #             # if production_item.product_id.id in product_id_to_production_names:
+    #             #     # 同一个产品多个制造订单对应一个编程单和模型库
+    #             #     # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
+    #             #     if not production_item.programming_no and production_item.production_type in ['自动化产线加工',
+    #             #                                                                                   '人工线下加工']:
+    #             #         if not production_programming.programming_no:
+    #             #             production_item.fetchCNC(
+    #             #                 ', '.join(product_id_to_production_names[production_item.product_id.id]))
+    #             #         else:
+    #             #             production_item.write({'programming_no': production_programming.programming_no,
+    #             #                                    'programming_state': '编程中'})
+    #             i = 0
+    #             if production_item.product_id.categ_id.type == '成品':
+    #                 # 根据加工面板的面数及成品工序模板生成工序设计
+    #                 if production_item.production_type == '自动化产线加工':
+    #                     model = 'sf.product.model.type.routing.sort'
+    #                     domain = [
+    #                         ('product_model_type_id', '=', production_item.product_id.product_model_type_id.id)]
     #                 else:
-            #         productions_values[index].update({'name': production.name})
+    #                     model = 'sf.manual.product.model.type.routing.sort'
-            #         procurement_group_vals = production._prepare_procurement_group_vals(productions_values[index])
+    #                     domain = [('manual_product_model_type_id', '=',
-            #         production.procurement_group_id = self.env["procurement.group"].create(procurement_group_vals).id
+    #                                production_item.product_id.product_model_type_id.id)]
-
+    #                 product_routing_workcenter = self.env[model].search(domain, order='sequence asc')
-            # self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
+    #                 if production_item.production_type == '自动化产线加工':
-            # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
+    #                     for k in (production_item.product_id.model_processing_panel.split(',')):
-
+    #                         for route in product_routing_workcenter:
-            '''
+    #                             i += 1
-            创建工单
+    #                             technology_design_values.append(
-            '''
+    #                                 self.env['sf.technology.design'].json_technology_design_str(k, route, i, False))
-            # productions._create_workorder()
+    #                 elif production_item.production_type == '人工线下加工':
-            #
+    #                     for route in product_routing_workcenter:
-            # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
+    #                         i += 1
-            productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \
+    #                         technology_design_values.append(
-                                           (
+    #                             self.env['sf.technology.design'].json_technology_design_str('ZM', route, i, False))
-                                                   p.move_dest_ids.procure_method != 'make_to_order' and not
+    #                 else:
-                                           p.move_raw_ids and not p.workorder_ids)).action_confirm()
+    #                     for route in product_routing_workcenter:
-            # 处理 根据制造订单生成的采购单坯料入库时到原材料库，手动将原材料位置该为坯料存货区
+    #                         i += 1
-            for production in productions:
+    #                         technology_design_values.append(
-                if production.picking_ids:
+    #                             self.env['sf.technology.design'].json_technology_design_str(False, route, i, False))
-                    product_type_id = production.picking_ids[0].move_ids[0].product_id.categ_id
+    #             elif production_item.product_id.categ_id.type == '坯料':
-                    if product_type_id.name == '坯料':
+    #                 embryo_routing_workcenter = self.env['sf.embryo.model.type.routing.sort'].search(
-                        location_id = self.env['stock.location'].search([('name', '=', '坯料存货区')])
+    #                     [('embryo_model_type_id', '=', production_item.product_id.embryo_model_type_id.id)],
-                        if not location_id:
+    #                     order='sequence asc'
-                            logging.info(f'没有搜索到【坯料存货区】: {location_id}')
+    #                 )
-                            break
+    #                 for route_embryo in embryo_routing_workcenter:
-                        for picking_id in production.picking_ids:
+    #                     i += 1
-                            if picking_id.picking_type_id.name == '内部调拨':
+    #                     technology_design_values.append(
-                                if picking_id.location_dest_id.product_type != product_type_id:
+    #                         self.env['sf.technology.design'].json_technology_design_str(False, route_embryo, i,
-                                    picking_id.location_dest_id = location_id.id
+    #                                                                                     False))
-                            elif picking_id.picking_type_id.name == '生产发料':
+    #             surface_technics_arr = []
-                                if picking_id.location_id.product_type != product_type_id:
+    #             route_workcenter_arr = []
-                                    picking_id.location_id = location_id.id
+    #             for item in production_item.product_id.product_model_type_id.surface_technics_routing_tmpl_ids:
-
+    #                 if item.route_workcenter_id.surface_technics_id.id:
-            for production in productions:
+    #                     for process_param in production_item.product_id.model_process_parameters_ids:
-                '''
+    #                         if item.route_workcenter_id.surface_technics_id == process_param.process_id:
-                创建制造订单时生成序列号
+    #                             surface_technics_arr.append(
-                '''
+    #                                 item.route_workcenter_id.surface_technics_id.id)
-                production.action_generate_serial()
+    #                             route_workcenter_arr.append(item.route_workcenter_id.id)
-                origin_production = production.move_dest_ids and production.move_dest_ids[
+    #             if surface_technics_arr:
-                    0].raw_material_production_id or False
+    #                 production_process = self.env['sf.production.process'].search(
-                orderpoint = production.orderpoint_id
+    #                     [('id', 'in', surface_technics_arr)],
-                if orderpoint and orderpoint.create_uid.id == SUPERUSER_ID and orderpoint.trigger == 'manual':
+    #                     order='sequence asc'
-                    production.message_post(
+    #                 )
-                        body=_('This production order has been created from Replenishment Report.'),
+    #                 for p in production_process:
-                        message_type='comment',
+    #                     logging.info('production_process:%s' % p.name)
-                        subtype_xmlid='mail.mt_note')
+    #                     process_parameters = production_item.product_id.model_process_parameters_ids.filtered(
-                elif orderpoint:
+    #                         lambda pm: pm.process_id.id == p.id)
-                    production.message_post_with_view(
+    #                     for process_parameter in process_parameters:
-                        'mail.message_origin_link',
+    #                         i += 1
-                        values={'self': production, 'origin': orderpoint},
+    #                         route_production_process = self.env[
-                        subtype_id=self.env.ref('mail.mt_note').id)
+    #                             'mrp.routing.workcenter'].search(
-                elif origin_production:
+    #                             [('surface_technics_id', '=', p.id),
-                    production.message_post_with_view(
+    #                              ('id', 'in', route_workcenter_arr)])
-                        'mail.message_origin_link',
+    #                         technology_design_values.append(
-                        values={'self': production, 'origin': origin_production},
+    #                             self.env['sf.technology.design'].json_technology_design_str(False,
-                        subtype_id=self.env.ref('mail.mt_note').id)
+    #                                                                                         route_production_process,
-
+    #                                                                                         i,
-                '''
+    #                                                                                         process_parameter))
-                创建生产计划
+    #             production_item.technology_design_ids = technology_design_values
-                '''
+    #         productions.write({'state': 'technology_to_confirmed'})
-                # 工单耗时
+    #         return True
-                workorder_duration = 0
-                for workorder in production.workorder_ids:
-                    workorder_duration += workorder.duration_expected
-
-                sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)])
-                # 如果订单为空，则获取来源制造订单的销售单
-                if not sale_order:
-                    mrp_production = self.env['mrp.production'].sudo().search([('name', '=', production.origin)],
-                                                                              limit=1)
-                    if mrp_production:
-                        sale_order = self.env['sale.order'].sudo().search([('name', '=', mrp_production.origin)])
-                else:
-                    mrp_production = production
-                # if sale_order:
-                # sale_order.write({'schedule_status': 'to schedule'})
-                self.env['sf.production.plan'].sudo().with_company(company_id).create({
-                    'name': production.name,
-                    'order_deadline': sale_order.deadline_of_delivery,
-                    'production_id': production.id,
-                    'date_planned_start': production.date_planned_start,
-                    'origin': mrp_production.origin,
-                    'product_qty': production.product_qty,
-                    'product_id': production.product_id.id,
-                    'state': 'draft',
-                })
-            all_production = productions
-            grouped_product_ids = {k: list(g) for k, g in groupby(all_production, key=lambda x: x.product_id.id)}
-            # 初始化一个字典来存储每个product_id对应的生产订单名称列表
-            product_id_to_production_names = {}
-            # 对于每个product_id，获取其所有生产订单的名称
-            for product_id, all_production in grouped_product_ids.items():
-                # 为同一个product_id创建一个生产订单名称列表
-                product_id_to_production_names[product_id] = [production.name for production in all_production]
-            for production_item in productions:
-                technology_design_values = []
-                production_programming = self.env['mrp.production'].search(
-                    [('product_id.id', '=', production_item.product_id.id),
-                     ('origin', '=', production_item.origin)],
-                    limit=1, order='id asc')
-                if production_item.product_id.id in product_id_to_production_names:
-                    # 同一个产品多个制造订单对应一个编程单和模型库
-                    # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
-                    if not production_item.programming_no and production_item.production_type in ['自动化产线加工',
-                                                                                                  '人工线下加工']:
-                        if not production_programming.programming_no:
-                            production_item.fetchCNC(
-                                ', '.join(product_id_to_production_names[production_item.product_id.id]))
-                        else:
-                            production_item.write({'programming_no': production_programming.programming_no,
-                                                   'programming_state': '编程中'})
-                i = 0
-                if production_item.product_id.categ_id.type == '成品':
-                    # 根据加工面板的面数及成品工序模板生成工序设计
-                    if production_item.production_type == '自动化产线加工':
-                        model = 'sf.product.model.type.routing.sort'
-                        domain = [
-                            ('product_model_type_id', '=', production_item.product_id.product_model_type_id.id)]
-                    else:
-                        model = 'sf.manual.product.model.type.routing.sort'
-                        domain = [('manual_product_model_type_id', '=',
-                                   production_item.product_id.product_model_type_id.id)]
-                    product_routing_workcenter = self.env[model].search(domain, order='sequence asc')
-                    if production_item.production_type == '自动化产线加工':
-                        for k in (production_item.product_id.model_processing_panel.split(',')):
-                            for route in product_routing_workcenter:
-                                i += 1
-                                technology_design_values.append(
-                                    self.env['sf.technology.design'].json_technology_design_str(k, route, i, False))
-                    elif production_item.production_type == '人工线下加工':
-                        for route in product_routing_workcenter:
-                            i += 1
-                            technology_design_values.append(
-                                self.env['sf.technology.design'].json_technology_design_str('ZM', route, i, False))
-                    else:
-                        for route in product_routing_workcenter:
-                            i += 1
-                            technology_design_values.append(
-                                self.env['sf.technology.design'].json_technology_design_str(False, route, i, False))
-                elif production_item.product_id.categ_id.type == '坯料':
-                    embryo_routing_workcenter = self.env['sf.embryo.model.type.routing.sort'].search(
-                        [('embryo_model_type_id', '=', production_item.product_id.embryo_model_type_id.id)],
-                        order='sequence asc'
-                    )
-                    for route_embryo in embryo_routing_workcenter:
-                        i += 1
-                        technology_design_values.append(
-                            self.env['sf.technology.design'].json_technology_design_str(False, route_embryo, i,
-                                                                                        False))
-                surface_technics_arr = []
-                route_workcenter_arr = []
-                for item in production_item.product_id.product_model_type_id.surface_technics_routing_tmpl_ids:
-                    if item.route_workcenter_id.surface_technics_id.id:
-                        for process_param in production_item.product_id.model_process_parameters_ids:
-                            if item.route_workcenter_id.surface_technics_id == process_param.process_id:
-                                surface_technics_arr.append(
-                                    item.route_workcenter_id.surface_technics_id.id)
-                                route_workcenter_arr.append(item.route_workcenter_id.id)
-                if surface_technics_arr:
-                    production_process = self.env['sf.production.process'].search(
-                        [('id', 'in', surface_technics_arr)],
-                        order='sequence asc'
-                    )
-                    for p in production_process:
-                        logging.info('production_process:%s' % p.name)
-                        process_parameters = production_item.product_id.model_process_parameters_ids.filtered(
-                            lambda pm: pm.process_id.id == p.id)
-                        for process_parameter in process_parameters:
-                            i += 1
-                            route_production_process = self.env[
-                                'mrp.routing.workcenter'].search(
-                                [('surface_technics_id', '=', p.id),
-                                 ('id', 'in', route_workcenter_arr)])
-                            technology_design_values.append(
-                                self.env['sf.technology.design'].json_technology_design_str(False,
-                                                                                            route_production_process,
-                                                                                            i,
-                                                                                            process_parameter))
-                production_item.technology_design_ids = technology_design_values
-            productions.write({'state': 'technology_to_confirmed'})
-            return True
 
 
 class ProductionLot(models.Model):
@@ -1216,6 +1205,20 @@ class ReStockMove(models.Model):
                 res['lot_id'] = self.subcontract_workorder_id.production_id.move_raw_ids.move_line_ids[0].lot_id.id
         return res
 
+    def _get_subcontract_bom(self):
+        self.ensure_one()
+        purchase_type = getattr(self.picking_id.purchase_id, 'purchase_type', False)
+        if purchase_type:
+            self = self.with_context(stock_picking=purchase_type)
+        bom = self.env['mrp.bom'].sudo()._bom_subcontract_find(
+            self.product_id,
+            picking_type=self.picking_type_id,
+            company_id=self.company_id.id,
+            bom_type='subcontract',
+            subcontractor=self.picking_id.partner_id
+        )
+        return bom
+
 
 class ReStockQuant(models.Model):
     _inherit = 'stock.quant'

sf_manufacturing/security/ir.model.access.csv

@@ -196,9 +196,3 @@ access_sf_sale_order_cancel_wizard,sf_sale_order_cancel_wizard,model_sf_sale_ord
 access_sf_sale_order_cancel_line,sf_sale_order_cancel_line,model_sf_sale_order_cancel_line,sf_base.group_sf_order_user,1,0,1,1
 
 access_product_creation_wizard,product_creation_wizard,model_product_creation_wizard,base.group_user,1,1,1,0
-access_sf_technology_design_task_group_sf_mrp_user,sf_technology_design_task_group_sf_mrp_user,model_sf_technology_design_task,sf_base.group_sf_mrp_user,1,1,1,0
-access_sf_technology_design_task_group_sf_mrp_manager,sf_technology_design_task_group_sf_mrp_manager,model_sf_technology_design_task,sf_base.group_sf_mrp_manager,1,1,1,1
-access_sf_technology_design_task_group_plan_dispatch,sf_technology_design_task_group_plan_dispatch,model_sf_technology_design_task,sf_base.group_plan_dispatch,1,1,1,0
-access_sf_technology_design_task_group_production_engineer,sf_technology_design_task_group_production_engineer,model_sf_technology_design_task,sf_base.group_production_engineer,1,1,1,0
-access_sf_create_technology_design_task_wizard_group_sf_mrp_user,sf_create_technology_design_task_wizard_group_sf_mrp_user,model_sf_create_technology_design_task_wizard,sf_base.group_sf_mrp_user,1,1,1,0
-access_sf_create_technology_design_task_wizard_group_sf_mrp_manager,sf_create_technology_design_task_wizard_group_sf_mrp_manager,model_sf_create_technology_design_task_wizard,sf_base.group_sf_mrp_manager,1,1,1,0

sf_manufacturing/views/sf_technology_design_task_dashboard.xml

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <!-- 工艺设计任务仪表板视图 -->
-    <record id="view_sf_technology_design_task_dashboard" model="ir.ui.view">
-        <field name="name">sf.technology.design.task.dashboard</field>
-        <field name="model">sf.technology.design.task</field>
-        <field name="arch" type="xml">
-            <kanban class="o_kanban_small_column" default_group_by="state">
-                <field name="name"/>
-                <field name="state"/>
-                <field name="product_id"/>
-                <field name="part_name"/>
-                <field name="assigned_to"/>
-                <field name="deadline"/>
-                <field name="create_date"/>
-                <templates>
-                    <t t-name="kanban-box">
-                        <div class="oe_kanban_global_click">
-                            <div class="oe_kanban_content">
-                                <div class="o_kanban_record_top">
-                                    <div class="o_kanban_record_headings">
-                                        <strong class="o_kanban_record_title">
-                                            <field name="name"/>
-                                        </strong>
-                                    </div>
-                                </div>
-                                <div class="o_kanban_record_body">
-                                    <div class="o_kanban_primary_left">
-                                        <field name="product_id"/>
-                                    </div>
-                                    <div class="o_kanban_primary_right">
-                                        <field name="part_name"/>
-                                    </div>
-                                </div>
-                                <div class="o_kanban_record_bottom">
-                                    <div class="oe_kanban_bottom_left">
-                                        <field name="assigned_to"/>
-                                    </div>
-                                    <div class="oe_kanban_bottom_right">
-                                        <field name="deadline"/>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </t>
-                </templates>
-            </kanban>
-        </field>
-    </record>
-
-    <!-- 工艺设计任务仪表板动作 -->
-    <record id="action_sf_technology_design_task_dashboard" model="ir.actions.act_window">
-        <field name="name">工艺设计任务仪表板</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.technology.design.task</field>
-        <field name="view_mode">kanban</field>
-        <field name="view_id" ref="view_sf_technology_design_task_dashboard"/>
-        <field name="context">{'search_default_filter_pending': 1}</field>
-        <field name="help" type="html">
-            <p class="o_view_nocontent_smiling_face">
-                创建第一个工艺设计任务
-            </p>
-            <p>
-                工艺设计任务用于管理产品工艺设计流程，包括从需求计划到工艺完成的整个过程。
-            </p>
-        </field>
-    </record>
-
-    <!-- 工艺设计任务仪表板菜单 -->
-    <menuitem id="menu_sf_technology_design_task_dashboard"
-              name="工艺设计仪表板"
-              sequence="15"
-              action="action_sf_technology_design_task_dashboard"
-              parent="mrp.menu_mrp_manufacturing"/>
-
-</odoo> 

sf_manufacturing/views/sf_technology_design_task_views.xml

@@ -1,280 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <!-- 工艺设计任务列表视图 -->
-    <record id="view_sf_technology_design_task_tree" model="ir.ui.view">
-        <field name="name">sf.technology.design.task.tree</field>
-        <field name="model">sf.technology.design.task</field>
-        <field name="arch" type="xml">
-            <tree string="工艺设计任务" default_order="create_date desc" 
-                  class="technology_design_task_tree freeze-columns-before-part_number">
-                <header>
-                    <button string="开始设计" name="action_start_design" type="object" 
-                            class="btn-primary" attrs="{'invisible': [('state', '!=', 'pending')]}"/>
-                    <button string="完成设计" name="action_complete_design" type="object" 
-                            class="btn-success" attrs="{'invisible': [('state', '!=', 'in_progress')]}"/>
-                    <button string="取消任务" name="action_cancel_task" type="object" 
-                            class="btn-secondary" attrs="{'invisible': [('state', 'in', ['completed'])]}"/>
-                    <button string="重置任务" name="action_reset_to_pending" type="object" 
-                            class="btn-warning" attrs="{'invisible': [('state', 'not in', ['in_progress', 'cancelled'])]}"/>
-                </header>
-                
-                <!-- 主要字段 -->
-                <field name="name" string="任务编号"/>
-                <field name="state" widget="badge" 
-                       decoration-success="state == 'completed'" 
-                       decoration-warning="state == 'in_progress'" 
-                       decoration-danger="state == 'cancelled'"/>
-                <field name="sale_order_id" string="销售单号"/>
-                <field name="product_id" string="产品名称"/>
-                <field name="part_name" string="零件名称"/>
-                <field name="part_number" string="零件图号"/>
-                <field name="product_type" string="零件类型"/>
-                <field name="model_id" string="模型ID" optional="hide"/>
-                <field name="model_filename" string="模型文件" optional="hide"/>
-                <field name="materials_id" string="材料及型号"/>
-                <field name="blank_type" string="坯料分类" optional="hide"/>
-                <field name="blank_precision" string="坯料类型" optional="hide"/>
-                <field name="embryo_long" string="坯料尺寸" optional="hide"/>
-                <field name="machining_precision" string="加工精度" optional="hide"/>
-                <field name="machining_panel" string="加工面" optional="hide"/>
-                <field name="product_uom_qty" string="订单数量"/>
-                <field name="is_incoming_material" string="客供料"/>
-                <field name="clamping_times" string="装夹次数" optional="hide"/>
-                <field name="single_clamping_duration" string="单次装夹时长" optional="hide"/>
-                <field name="cnc_processing_duration" string="CNC加工时长" optional="hide"/>
-                <field name="customer_quality_requirements" string="客户质量要求" optional="hide"/>
-                <field name="processing_drawing_filename" string="2D加工图纸" optional="hide"/>
-                <field name="customer_name" string="客户名称" optional="hide"/>
-                
-                <!-- 时间字段 -->
-                <field name="create_date" string="创建时间" optional="hide"/>
-                <field name="start_date" string="开始时间" optional="hide"/>
-                <field name="complete_date" string="完成时间" optional="hide"/>
-                <field name="deadline" string="截止时间" optional="hide"/>
-                
-                <!-- 负责人字段 -->
-                <field name="assigned_to" string="负责人" optional="hide"/>
-                <field name="created_by" string="创建人" optional="hide"/>
-                
-                <!-- 备注 -->
-                <field name="notes" string="备注" optional="hide"/>
-            </tree>
-        </field>
-    </record>
-
-    <!-- 工艺设计任务搜索视图 -->
-    <record id="view_sf_technology_design_task_search" model="ir.ui.view">
-        <field name="name">sf.technology.design.task.search</field>
-        <field name="model">sf.technology.design.task</field>
-        <field name="arch" type="xml">
-            <search>
-                <field name="name"/>
-                <field name="sale_order_id"/>
-                <field name="product_id"/>
-                <field name="part_name"/>
-                <field name="part_number"/>
-                <field name="customer_name"/>
-                <field name="materials_id"/>
-                <field name="assigned_to"/>
-                <field name="created_by"/>
-                
-                <filter name="filter_pending" string="待工艺设计" domain="[('state', '=', 'pending')]"/>
-                <filter name="filter_in_progress" string="进行中" domain="[('state', '=', 'in_progress')]"/>
-                <filter name="filter_completed" string="已完成" domain="[('state', '=', 'completed')]"/>
-                <filter name="filter_cancelled" string="已取消" domain="[('state', '=', 'cancelled')]"/>
-                
-                <separator/>
-                
-                <filter name="filter_my_tasks" string="我的任务" domain="[('assigned_to', '=', uid)]"/>
-                <filter name="filter_overdue" string="已逾期" domain="[('deadline', '&lt;', context_today()), ('state', 'not in', ['completed', 'cancelled'])]"/>
-                
-                <group expand="0" string="Group By">
-                    <filter name="group_by_state" string="状态" domain="[]" context="{'group_by': 'state'}"/>
-                    <filter name="group_by_sale_order" string="销售单号" domain="[]" context="{'group_by': 'sale_order_id'}"/>
-                    <filter name="group_by_product" string="产品" domain="[]" context="{'group_by': 'product_id'}"/>
-                    <filter name="group_by_customer" string="客户" domain="[]" context="{'group_by': 'customer_name'}"/>
-                    <filter name="group_by_assigned_to" string="负责人" domain="[]" context="{'group_by': 'assigned_to'}"/>
-                    <filter name="group_by_created_by" string="创建人" domain="[]" context="{'group_by': 'created_by'}"/>
-                    <filter name="group_by_create_date" string="创建日期" domain="[]" context="{'group_by': 'create_date:day'}"/>
-                    <filter name="group_by_deadline" string="截止日期" domain="[]" context="{'group_by': 'deadline:day'}"/>
-                </group>
-            </search>
-        </field>
-    </record>
-
-    <!-- 工艺设计任务表单视图 -->
-    <record id="view_sf_technology_design_task_form" model="ir.ui.view">
-        <field name="name">sf.technology.design.task.form</field>
-        <field name="model">sf.technology.design.task</field>
-        <field name="arch" type="xml">
-            <form string="工艺设计任务">
-                <header>
-                    <button name="action_start_design" string="开始设计" type="object" 
-                            class="btn-primary" attrs="{'invisible': [('state', '!=', 'pending')]}"/>
-                    <button name="action_complete_design" string="完成设计" type="object" 
-                            class="btn-success" attrs="{'invisible': [('state', '!=', 'in_progress')]}"/>
-                    <button name="action_cancel_task" string="取消任务" type="object" 
-                            class="btn-secondary" attrs="{'invisible': [('state', 'in', ['completed'])]}"/>
-                    <button name="action_reset_to_pending" string="重置任务" type="object" 
-                            class="btn-warning" attrs="{'invisible': [('state', 'not in', ['in_progress', 'cancelled'])]}"/>
-                    <field name="state" widget="statusbar" 
-                           statusbar_visible="pending,in_progress,completed"/>
-                </header>
-                
-                <sheet>
-                    <div class="oe_title">
-                        <h1>
-                            <field name="name" readonly="1"/>
-                        </h1>
-                    </div>
-                    
-                    <group>
-                        <group string="基本信息">
-                            <field name="demand_plan_id"/>
-                            <field name="sale_order_id"/>
-                            <field name="customer_name"/>
-                            <field name="assigned_to"/>
-                            <field name="created_by"/>
-                        </group>
-                        <group string="时间信息">
-                            <field name="create_date"/>
-                            <field name="start_date"/>
-                            <field name="complete_date"/>
-                            <field name="deadline"/>
-                        </group>
-                    </group>
-                    
-                    <notebook>
-                        <page string="产品信息">
-                            <group>
-                                <group string="产品详情">
-                                    <field name="product_id"/>
-                                    <field name="part_name"/>
-                                    <field name="part_number"/>
-                                    <field name="product_type"/>
-                                    <field name="model_id"/>
-                                    <field name="model_file" filename="model_filename"/>
-                                    <field name="model_filename" invisible="1"/>
-                                </group>
-                                <group string="材料信息">
-                                    <field name="materials_id"/>
-                                    <field name="blank_type"/>
-                                    <field name="blank_precision"/>
-                                    <field name="embryo_long"/>
-                                </group>
-                            </group>
-                        </page>
-                        
-                        <page string="加工信息">
-                            <group>
-                                <group string="加工参数">
-                                    <field name="machining_precision"/>
-                                    <field name="machining_panel"/>
-                                    <field name="product_uom_qty"/>
-                                    <field name="is_incoming_material"/>
-                                </group>
-                                <group string="工艺参数">
-                                    <field name="clamping_times"/>
-                                    <field name="single_clamping_duration"/>
-                                    <field name="cnc_processing_duration"/>
-                                </group>
-                            </group>
-                        </page>
-                        
-                        <page string="质量要求">
-                            <group>
-                                <field name="customer_quality_requirements" nolabel="1"/>
-                            </group>
-                            <group string="图纸文件">
-                                <field name="processing_drawing_2d" filename="processing_drawing_filename"/>
-                                <field name="processing_drawing_filename" invisible="1"/>
-                            </group>
-                        </page>
-                        
-                        <page string="备注">
-                            <field name="notes" nolabel="1"/>
-                        </page>
-                    </notebook>
-                </sheet>
-                
-                <div class="oe_chatter">
-                    <field name="message_follower_ids"/>
-                    <field name="activity_ids"/>
-                    <field name="message_ids"/>
-                </div>
-            </form>
-        </field>
-    </record>
-
-    <!-- 工艺设计任务动作 -->
-    <record id="action_sf_technology_design_task" model="ir.actions.act_window">
-        <field name="name">工艺设计任务</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.technology.design.task</field>
-        <field name="view_mode">tree,form</field>
-        <field name="context">{'search_default_filter_pending': 1}</field>
-        <field name="help" type="html">
-            <p class="o_view_nocontent_smiling_face">
-                创建第一个工艺设计任务
-            </p>
-            <p>
-                工艺设计任务用于管理产品工艺设计流程，包括从需求计划到工艺完成的整个过程。
-            </p>
-        </field>
-    </record>
-
-    <!-- 工艺设计任务菜单 -->
-    <menuitem id="menu_sf_technology_design_task"
-              name="工艺设计任务"
-              sequence="20"
-              action="action_sf_technology_design_task"
-              parent="mrp.menu_mrp_manufacturing"/>
-
-    <!-- 工艺设计任务看板视图 -->
-    <record id="view_sf_technology_design_task_kanban" model="ir.ui.view">
-        <field name="name">sf.technology.design.task.kanban</field>
-        <field name="model">sf.technology.design.task</field>
-        <field name="arch" type="xml">
-            <kanban class="o_kanban_small_column" default_group_by="state">
-                <field name="name"/>
-                <field name="state"/>
-                <field name="product_id"/>
-                <field name="part_name"/>
-                <field name="assigned_to"/>
-                <field name="deadline"/>
-                <templates>
-                    <t t-name="kanban-box">
-                        <div class="oe_kanban_global_click">
-                            <div class="oe_kanban_content">
-                                <div class="o_kanban_record_top">
-                                    <div class="o_kanban_record_headings">
-                                        <strong class="o_kanban_record_title">
-                                            <field name="name"/>
-                                        </strong>
-                                    </div>
-                                </div>
-                                <div class="o_kanban_record_body">
-                                    <div class="o_kanban_primary_left">
-                                        <field name="product_id"/>
-                                    </div>
-                                    <div class="o_kanban_primary_right">
-                                        <field name="part_name"/>
-                                    </div>
-                                </div>
-                                <div class="o_kanban_record_bottom">
-                                    <div class="oe_kanban_bottom_left">
-                                        <field name="assigned_to"/>
-                                    </div>
-                                    <div class="oe_kanban_bottom_right">
-                                        <field name="deadline"/>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </t>
-                </templates>
-            </kanban>
-        </field>
-    </record>
-
-</odoo> 

sf_manufacturing/wizard/__init__.py

@@ -7,4 +7,3 @@ from . import mrp_workorder_batch_replan_wizard
 from . import sf_programming_reason
 from . import sale_order_cancel
 from . import process_outsourcing
-from . import create_technology_design_task_wizard

sf_manufacturing/wizard/create_technology_design_task_wizard.py

@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-
-from odoo import fields, models, api, _
-from odoo.exceptions import UserError
-
-
-class CreateTechnologyDesignTaskWizard(models.TransientModel):
-    _name = 'sf.create.technology.design.task.wizard'
-    _description = '创建工艺设计任务向导'
-
-    demand_plan_ids = fields.Many2many('sf.production.demand.plan', string='需求计划', required=True)
-    assigned_to = fields.Many2one('res.users', string='负责人', default=lambda self: self.env.user)
-    deadline = fields.Datetime('截止时间', required=True)
-    notes = fields.Text('备注')
-
-    @api.model
-    def default_get(self, fields_list):
-        res = super(CreateTechnologyDesignTaskWizard, self).default_get(fields_list)
-        if self.env.context.get('active_model') == 'sf.production.demand.plan':
-            demand_plan_ids = self.env.context.get('active_ids', [])
-            res['demand_plan_ids'] = [(6, 0, demand_plan_ids)]
-        return res
-
-    def action_create_tasks(self):
-        """创建工艺设计任务"""
-        if not self.demand_plan_ids:
-            raise UserError(_('请选择需求计划'))
-        
-        # 检查是否已存在工艺设计任务
-        existing_tasks = self.env['sf.technology.design.task'].search([
-            ('demand_plan_id', 'in', self.demand_plan_ids.ids),
-            ('state', 'not in', ['cancelled'])
-        ])
-        
-        if existing_tasks:
-            raise UserError(_('以下需求计划已存在工艺设计任务：\n%s') % 
-                          '\n'.join([task.demand_plan_id.name for task in existing_tasks]))
-        
-        # 创建工艺设计任务
-        tasks = self.env['sf.technology.design.task']
-        for demand_plan in self.demand_plan_ids:
-            task_vals = {
-                'demand_plan_id': demand_plan.id,
-                'assigned_to': self.assigned_to.id,
-                'deadline': self.deadline,
-                'notes': self.notes,
-            }
-            task = self.env['sf.technology.design.task'].create(task_vals)
-            tasks |= task
-        
-        # 返回工艺设计任务列表视图
-        return {
-            'type': 'ir.actions.act_window',
-            'name': _('工艺设计任务'),
-            'res_model': 'sf.technology.design.task',
-            'view_mode': 'tree,form',
-            'domain': [('id', 'in', tasks.ids)],
-            'context': {'search_default_filter_pending': 1},
-        } 

sf_manufacturing/wizard/create_technology_design_task_wizard_views.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <record id="view_create_technology_design_task_wizard_form" model="ir.ui.view">
-        <field name="name">sf.create.technology.design.task.wizard.form</field>
-        <field name="model">sf.create.technology.design.task.wizard</field>
-        <field name="arch" type="xml">
-            <form string="创建工艺设计任务">
-                <group>
-                    <field name="demand_plan_ids" widget="many2many_tags"/>
-                    <field name="assigned_to"/>
-                    <field name="deadline"/>
-                    <field name="notes"/>
-                </group>
-                <footer>
-                    <button name="action_create_tasks" string="创建任务" type="object" class="btn-primary"/>
-                    <button string="取消" class="btn-secondary" special="cancel"/>
-                </footer>
-            </form>
-        </field>
-    </record>
-
-    <record id="action_create_technology_design_task_wizard" model="ir.actions.act_window">
-        <field name="name">创建工艺设计任务</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.create.technology.design.task.wizard</field>
-        <field name="view_mode">form</field>
-        <field name="target">new</field>
-    </record>
-</odoo> 

sf_mrs_connect/models/__init__.py

@@ -2,3 +2,4 @@ from . import ftp_operate
 from . import res_config_setting
 from . import sync_common
 from . import order_price
+from . import mrp_production

sf_mrs_connect/models/mrp_production.py

@@ -0,0 +1,44 @@
+from itertools import groupby
+from odoo import models, api
+from odoo.tools.misc import OrderedSet
+
+
+class MrpProduction(models.Model):
+    _inherit = 'mrp.production'
+
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        """
+            生成编程单
+        """
+        productions = super().create(vals_list)
+        # 定义变量存储编程单
+        grouped_product_programming_no = {}
+        # 定义产品拼接成的制造订单名称
+        grouped_product_production_name = {}
+        # 查出所有的制造订单，为了适配通过补货生成的制造订单
+        all_productions = self.env['mrp.production'].search([('origin', '=', productions[0].origin)])
+        # 将不同产品的制造订单进行分组
+        grouped_product_productions = {k: list(g) for k, g in groupby(all_productions, key=lambda x: x.product_id.id)}
+
+        for product_id, grouped_productions in grouped_product_productions.items():
+            # 产品对应的编程单号
+            if product_id not in grouped_product_programming_no:
+                # 使用列表推导式获取非空的programming_no
+                programming_nos = [p.programming_no for p in grouped_productions if p.programming_no if p.programming_no is not False]
+                if programming_nos:
+                    grouped_product_programming_no[product_id] = programming_nos[0]
+            grouped_product_production_name[product_id] = ','.join(list(map(lambda p:p.name, grouped_productions)))
+        # 同一个产品的制造订单只请求一次CNC编程
+        for production in productions:
+            if not production.programming_no and production.production_type in ['自动化产线加工','人工线下加工']:
+                if production.product_id.id not in grouped_product_programming_no:
+                    production.fetchCNC(grouped_product_production_name[production.product_id.id])
+                    grouped_product_programming_no[production.product_id.id] = production.programming_no
+                else:
+                    production.write({
+                        'programming_no': grouped_product_programming_no[production.product_id.id],
+                        'programming_state': '编程中'
+                    })
+        return productions

sf_plan/models/__init__.py

@@ -3,3 +3,4 @@
 
 from . import custom_plan
 from . import change_manufactuing
+from . import mrp_production

sf_plan/models/mrp_production.py

@@ -0,0 +1,41 @@
+from odoo import models, api
+
+
+class MrpProduction(models.Model):
+    _inherit = 'mrp.production'
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        """
+            创建生产计划
+        """
+        productions = super().create(vals_list)
+
+        for production in productions:
+            # 工单耗时
+            workorder_duration = 0
+            for workorder in production.workorder_ids:
+                workorder_duration += workorder.duration_expected
+
+            sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)])
+            # 如果订单为空，则获取来源制造订单的销售单
+            if not sale_order:
+                mrp_production = self.env['mrp.production'].sudo().search([('name', '=', production.origin)],
+                                                                            limit=1)
+                if mrp_production:
+                    sale_order = self.env['sale.order'].sudo().search([('name', '=', mrp_production.origin)])
+            else:
+                mrp_production = production
+            # if sale_order:
+            # sale_order.write({'schedule_status': 'to schedule'})
+            self.env['sf.production.plan'].sudo().with_company(production.company_id).create({
+                'name': production.name,
+                'order_deadline': sale_order.deadline_of_delivery,
+                'production_id': production.id,
+                'date_planned_start': production.date_planned_start,
+                'origin': mrp_production.origin,
+                'product_qty': production.product_qty,
+                'product_id': production.product_id.id,
+                'state': 'draft',
+            })
+        return productions

sf_quality/data/insepection_report_template.xml

@@ -200,8 +200,8 @@
                                 <p></p>
                             </div>
                         </div> -->
-
                         <!-- 页脚固定在底部 -->
+
                         <!-- <div style="position: absolute; bottom: 0; left: 0; right: 0;"> -->
                             <t t-call="sf_quality.report_quality_footer"/>
                         <!-- </div> -->
@@ -329,9 +329,11 @@
                         </div> -->
 
                         <!-- 页脚固定在底部 -->
+<!--                        <t t-if="loop.index == len(docs) - 1">-->
                         <!-- <div style="position: absolute; bottom: 0; left: 0; right: 0;"> -->
                             <t t-call="sf_quality.html_report_quality_footer"/>
                         <!-- </div> -->
+<!--                        </t>-->
                     </div>
                 </t>
             </t>

sf_quality/models/stock.py

@@ -1,11 +1,41 @@
+import logging
+
 from odoo import api, models
+from odoo.exceptions import ValidationError, UserError
 
 
 class StockPicking(models.Model):
     _inherit = 'stock.picking'
 
+    def _compute_check(self):
+        super()._compute_check()
+        for picking in self:
+            picking_to_quality = picking.get_picking_to_quality()
+            if not picking_to_quality:
+                picking.quality_check_todo = False
+                break
+            else:
+                need_quality_line = picking.get_need_quality_line(picking_to_quality)
+                if not need_quality_line or all(not line.get('need_done_check_ids') for line in need_quality_line):
+                    picking.quality_check_todo = False
+
+    def check_quality(self):
+        self.ensure_one()
+        # checkable_products = self.mapped('move_line_ids').mapped('product_id')
+        # checks = self.check_ids.filtered(lambda check: check.quality_state == 'none' and (
+        #         check.product_id in checkable_products or check.measure_on == 'operation'))
+        checks = self.env['quality.check']
+        picking_to_quality = self._get_picking_to_quality()
+        need_quality_line = self.get_need_quality_line(picking_to_quality)
+        if need_quality_line and any(line.get('need_done_check_ids') for line in need_quality_line):
+            for item in need_quality_line:
+                checks += item.get('need_done_check_ids')
+        if checks:
+            return checks.action_open_quality_check_wizard()
+        return False
+
     def button_validate(self):
-        """
+        """=
             出厂检验报告上传
         """
 
@@ -17,33 +47,34 @@ class StockPicking(models.Model):
                 if not out_quality_check.is_factory_report_uploaded:
                     if out_quality_check and self.state == 'assigned':
                         out_quality_check.upload_factory_report()
+        quality_action = self.pinking_checkout_quality()
+        if quality_action:
+            return quality_action
+        res = super(StockPicking, self).button_validate()
+        return res
 
+    def pinking_checkout_quality(self):
         """
             调拨单若关联了质量检查单，验证调拨单时，应校验是否有不合格品，若存在，应弹窗提示：
             “警告：存在不合格产品XXXX n 件、YYYYY m件，继续调拨请点“确认”，否则请取消？”
         """
+        try:
+            self.ensure_one()
             context = self.env.context
-        if not context.get('again_validate') and self.quality_check_ids.filtered(lambda qc: qc.quality_state == 'fail'):
+            if not context.get('pinking_checkout_quality'):
+                picking_to_quality = self._get_picking_to_quality()
+                if not picking_to_quality: return False
+                need_quality_val = self.get_need_quality_line(picking_to_quality)
+                if any(line.get('fail_check_ids') for line in need_quality_val):
                     # 回滚事务，为二次确认/取消做准备
                     self.env.cr.rollback()
-            quality_check_ids = self.quality_check_ids.filtered(lambda qc: qc.quality_state == 'fail')
+                    # 获取存在失败的 质检单 调拨单明细行
-            product_list = list(set([quality_check_id.product_id for quality_check_id in quality_check_ids]))
+                    check_list = [item for item in need_quality_val if item.get('fail_check_ids')]
                     fail_check_text = ''
-            for product_id in product_list:
+                    for item in check_list:
-                check_ids = quality_check_ids.filtered(lambda qc: qc.product_id == product_id)
+                        move_id, pre_done_qty = item.get('move_id'), item.get('pre_done_qty')
-                if all(check_id.measure_on == 'move_line' for check_id in check_ids):
+                        fail_check_text = (f'{fail_check_text}、{move_id.product_id.display_name}  {pre_done_qty}件'
-                    number = sum(check_ids.mapped('qty_line'))
+                                           if fail_check_text != '' else f'{move_id.product_id.display_name}  {pre_done_qty}件')
-                else:
-                    number = sum(self.move_ids_without_package.filtered(
-                        lambda ml: ml.product_id == product_id).mapped('quantity_done'))
-                    if number == 0:
-                        number = sum(self.move_ids_without_package.filtered(
-                            lambda ml: ml.product_id == product_id).mapped('reserved_availability'))
-                        if number == 0:
-                            number = sum(self.move_ids_without_package.filtered(
-                                lambda ml: ml.product_id == product_id).mapped('product_uom_qty'))
-                fail_check_text = (f'{fail_check_text}、{product_id.display_name}  {number}件'
-                                   if fail_check_text != '' else f'{product_id.display_name}  {number}件')
                     return {
                         'type': 'ir.actions.act_window',
                         'res_model': 'picking.validate.check.wizard',
@@ -53,7 +84,96 @@ class StockPicking(models.Model):
                         'context': {
                             'default_picking_id': self.id,
                             'default_fail_check_text': f'警告：存在不合格产品{fail_check_text}，继续调拨请点“确认”，否则请取消？',
-                    'again_validate': True}
+                            'pinking_checkout_quality': True}
                     }
-        res = super(StockPicking, self).button_validate()
+            else:
+                return False
+        except Exception as e:
+            logging.info('pinking_checkout_quality()方法报错：%s' % e)
+            raise ValidationError('调拨单验证质检单是否合格时报错,请联系管理员处理！！')
+
+    def get_need_quality_line(self, picking_to_quality):
+        """
+            # 对需要进行质检，还没有质检完成的明细行进行统计
+            # 1、当【质量标准_控制方式】=“产品、作业”，仅校验“预完成数量”>0的产品行对应的质检单必须处理。
+              2、当【质量标准_控制方式】=“数量”时，仅校验“预完成数量”>0的产品行对应的质检单必须处理：
+                1）每一类的“总单数”=【调拨单_需求】时，则已处理的质检单“单数”≥“预完成数量”时，可执行调拨单验证；
+                2）每一类的“总单数”<【调拨单_需求】时，则已处理的质检单“单数”≥0时，可执行调拨单验证；
+        """
+        res = []
+        for item in picking_to_quality:
+            need_done_check_ids = self.env['quality.check']
+            fail_check_ids = self.env['quality.check']
+            move_id, pre_done_qty, check_ids = item.values()
+            check_ids_1 = check_ids.filtered(lambda qc: qc.measure_on in ('operation', 'product'))
+            if check_ids_1:
+                check_ids_1_done = check_ids_1.filtered(lambda qc: qc.quality_state in ('pass', 'fail'))
+                check_ids_1_fail = check_ids_1.filtered(lambda qc: qc.quality_state == 'fail')
+                check_ids_1_none = check_ids_1.filtered(lambda qc: qc.quality_state == 'none')
+                if check_ids_1 and not check_ids_1_done:
+                    need_done_check_ids += check_ids_1_none
+                if check_ids_1_fail:
+                    fail_check_ids += check_ids_1_fail
+
+            check_ids_2 = check_ids.filtered(lambda qc: qc.measure_on == 'move_line')
+            if check_ids_2:
+                check_ids_2_done = check_ids_2.filtered(lambda qc: qc.quality_state in ('pass', 'fail'))
+                check_ids_2_fail = check_ids_2.filtered(lambda qc: qc.quality_state == 'fail')
+                check_ids_2_none = check_ids_2.filtered(lambda qc: qc.quality_state == 'none')
+                # 每一类的“总单数”=【调拨单_需求】时，则已处理的质检单“单数”≥“预完成数量”时，可执行调拨单验证；
+                if len(check_ids_2) >= move_id.product_uom_qty and len(check_ids_2_done) < pre_done_qty:
+                    need_done_check_ids += check_ids_2_none
+                # 每一类的“总单数”<【调拨单_需求】时，则已处理的质检单“单数”≥0时，可执行调拨单验证
+                elif len(check_ids_2) < move_id.product_uom_qty and len(check_ids_2_done) == 0:
+                    need_done_check_ids += check_ids_2_none
+                if check_ids_2_fail:
+                    fail_check_ids += check_ids_2_fail
+
+            if need_done_check_ids or fail_check_ids:
+                res.append({'move_id': move_id,
+                            'pre_done_qty': pre_done_qty,
+                            'check_ids': check_ids,
+                            'fail_check_ids': fail_check_ids,
+                            'need_done_check_ids': need_done_check_ids})
         return res
+
+    def get_picking_to_quality(self):
+        self.ensure_one()
+        return self._get_picking_to_quality()
+
+    def _get_picking_to_quality(self):
+        """
+            对需要质检的明细行进行统计(针对“预完成数量”>0的行)
+        """
+        quality_piking_line_list = []
+        pre_done_qty_lines = self._get_pinking_pre_done_qty()
+        for line in pre_done_qty_lines:
+            move_id, pre_done_qty = line.values()
+            if pre_done_qty == 0:
+                continue
+            product_id = move_id.product_id
+            check_ids = self.check_ids.filtered(lambda c: c.product_id == product_id)
+            quality_piking_line_list.append({'move_id': move_id, 'pre_done_qty': pre_done_qty, 'check_ids': check_ids})
+        return quality_piking_line_list
+
+    def _get_pinking_pre_done_qty(self):
+        """
+            return: 明细行 及 预完成数量
+            1、若调拨单所有明细行的【完成】=0，且任意行的【预留】<【需求】，则验证时将会话是否需创建欠单。
+                ---->此时“预完成数量”=【预留】
+            2、若调拨单任意行的0<【完成】<【需求】，且则验证时将会话是否需创建欠单
+                ---->此时“预完成数量”=【完成】
+        """
+        # if all(move_id.quantity_done == 0 for move_id in self.move_ids_without_package):
+        #     pre_done_qty = [{'move_id': move_id, 'pre_done_qty': move_id.reserved_availability} for move_id in
+        #                     self.move_ids_without_package]
+        # else:
+        #     pre_done_qty = [{'move_id': move_id, 'pre_done_qty': move_id.quantity_done} for move_id in
+        #                     self.move_ids_without_package]
+        pre_done_qty = []
+        for move_id in self.move_ids_without_package:
+            if move_id.quantity_done > 0:
+                pre_done_qty.append({'move_id': move_id, 'pre_done_qty': move_id.quantity_done})
+            else:
+                pre_done_qty.append({'move_id': move_id, 'pre_done_qty': move_id.reserved_availability})
+        return pre_done_qty