diff --git a/sf_base/__manifest__.py b/sf_base/__manifest__.py deleted file mode 100644 index 967e1ba1..00000000 --- a/sf_base/__manifest__.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. -{ - 'name': '机企猫藏智能工厂 基础模块', - 'version': '1.0', - 'summary': '智能工厂基础模块', - 'sequence': 1, - 'description': """ -在本模块，定义了主要的角色、菜单、基础业务对象 - """, - 'category': 'YZ', - 'website': 'https://www.sf.jikimo.com', - 'depends': ['account', 'base', 'mrp','sale'], - 'data': [ - 'security/group_security.xml', - 'security/ir.model.access.csv', - 'data/product_data.xml', - 'views/mrs_base_view.xml', - 'views/mrs_common_view.xml', - 'views/menu_view.xml', - 'views/sale_order_view.xml', - 'views/product_template_view.xml', - 'views/mrp_routing_workcenter_view.xml', - - - - ], - 'demo': [ - ], - 'qweb': [ - ], - 'installable': True, - 'application': False, - 'auto_install': False, -} diff --git a/sf_base/models/process.py b/sf_base/models/process.py index ede17d15..18dae613 100644 --- a/sf_base/models/process.py +++ b/sf_base/models/process.py @@ -13,12 +13,13 @@ class ResMrpRoutingWorkcenter(models.Model): _inherit = 'mrp.routing.workcenter' routing_type = fields.Selection([ - ('装夹', '装夹'), - ('前置三元定位检测', '前置三元定位检测'), - ('CNC加工', 'CNC加工'), - ('置三元质量检测', '置三元质量检测'), - ('解除装夹', '解除装夹'), - ], string="工序类型") + ('获取CNC加工程序', '获取CNC加工程序'), + ('装夹', '装夹'), + ('前置三元定位检测', '前置三元定位检测'), + ('CNC加工', 'CNC加工'), + ('置三元质量检测', '置三元质量检测'), + ('解除装夹', '解除装夹'), + ], string="工序类型") is_repeat = fields.Boolean('重复', default=False) workcenter_id = fields.Many2one('mrp.workcenter', required=False) workcenter_ids = fields.Many2many('mrp.workcenter', 'rel_workcenter_route', required=True) @@ -54,6 +55,14 @@ class ModelTypeRoutingSort(models.Model): sequence = fields.Integer('Sequence') route_workcenter_id = fields.Many2one('mrp.routing.workcenter') is_repeat = fields.Boolean('重复', related='route_workcenter_id.is_repeat') + routing_type = fields.Selection([ + ('获取CNC加工程序', '获取CNC加工程序'), + ('装夹', '装夹'), + ('前置三元定位检测', '前置三元定位检测'), + ('CNC加工', 'CNC加工'), + ('置三元质量检测', '置三元质量检测'), + ('解除装夹', '解除装夹'), + ], string="工序类型", related='route_workcenter_id.routing_type') workcenter_ids = fields.Many2many('mrp.workcenter', required=False, related='route_workcenter_id.workcenter_ids') model_type_id = fields.Many2one('sf.model.type') diff --git a/sf_bpm_api/__manifest__.py b/sf_bpm_api/__manifest__.py deleted file mode 100644 index f8e6070f..00000000 --- a/sf_bpm_api/__manifest__.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. -{ - 'name': '机企猫智能工厂 API模块', - 'version': '1.0', - 'summary': '智能工厂API模块', - 'sequence': 1, - 'description': """ - 在本模块，接收业务平台订单 - """, - 'category': 'sf', - 'website': 'https://www.sf.cs.jikimo.com', - 'depends': ['sale', 'sf_base'], - 'data': [ - 'data/product_data.xml', - - ], - 'demo': [ - ], - 'qweb': [ - ], - 'installable': True, - 'application': False, - 'auto_install': False, -} diff --git a/sf_bpm_api/models/__init__.py b/sf_bpm_api/models/__init__.py index 4c183668..1b8cfb6d 100644 --- a/sf_bpm_api/models/__init__.py +++ b/sf_bpm_api/models/__init__.py @@ -1,5 +1,3 @@ -from . import sale_order -from . import product_template from . import http from . import models diff --git a/sf_bpm_api/models/product_template.py b/sf_bpm_api/models/product_template.py deleted file mode 100644 index 08f2237c..00000000 --- a/sf_bpm_api/models/product_template.py +++ /dev/null @@ -1,86 +0,0 @@ -from odoo import models, fields -from odoo.exceptions import ValidationError - - -class ResProductTemplate(models.Model): - _inherit = 'product.template' - - # 模型的长,宽,高,体积,精度,材料 - model_long = fields.Float('长[mm]', digits=(16, 3)) - model_width = fields.Float('宽[mm]', digits=(16, 3)) - model_height = fields.Float('高[mm]', digits=(16, 3)) - model_volume = fields.Float('体积[mm³]', digits=(16, 3)) - model_precision = fields.Float('精度要求', digits=(16, 3)) - model_materials_id = fields.Many2one('mrs.production.materials', string='材料') - model_materials_type_id = fields.Many2one('mrs.materials.model', string='型号') - # 胚料的长,宽,高 - embryo_long = fields.Float('长[mm]', digits=(16, 3)) - embryo_width = fields.Float('宽[mm]', digits=(16, 3)) - embryo_height = fields.Float('高[mm]', digits=(16, 3)) - embryo_materials_id = fields.Many2one('mrs.production.materials', string='材料') - embryo_materials_type_id = fields.Many2one('mrs.materials.model', string='型号') - - # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品 - def product_create(self, product_id, item, order_id, order_number, i): - copy_product_id = product_id.with_user(self.env.ref("base.user_admin")).copy() - copy_product_id.product_tmpl_id.active = True - vals = { - 'name': '%s-%s' % (order_id.name, i), - 'model_long': item['model_long'], - 'model_width': item['model_width'], - 'model_height': item['model_height'], - 'model_volume': item['model_volume'], - 'list_price': item['price'], - 'model_materials_id': self.env['mrs.production.materials'].search( - [('materials_no', '=', item['texture_code'])]).id, - 'model_materials_type_id': self.env['mrs.materials.model'].search( - [('materials_no', '=', item['texture_type_code'])]).id, - 'default_code': '%s-%s' % (order_number, i), - 'barcode': item['barcode'], - 'active': True - } - copy_product_id.sudo().write(vals) - return copy_product_id - - -class ResProductCategory(models.Model): - _inherit = "product.category" - - is_embryo = fields.Boolean('胚料') - - -class ResMrpBom(models.Model): - _inherit = 'mrp.bom' - - # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品后再次进行创建bom - def bom_create(self, product): - bom_id = self.env['mrp.bom'].create({ - 'product_tmpl_id': product.product_tmpl_id.id, - 'type': 'normal', - 'product_qty': 1, - 'product_uom_id': 1 - }) - return bom_id - - # 生成产品BOM匹配胚料，胚料的匹配规则： - # 一、匹配的胚料类别需要带有胚料的标签； - # 二、胚料的材料型号与生成产品的材料型号一致； - # 三、胚料的长宽高均要大于模型的长宽高； - # 四、如果匹配成功多个胚料，则选取体积最小的胚料； - def bom_create_Line(self, product): - embryo = self.env['product.product'].search( - [('categ_id.is_embryo', '=', True), ('embryo_materials_type_id', '=', product.model_materials_type_id.id), - ('embryo_long', '>', product.model_long), ('embryo_width', '>', product.model_width), - ('embryo_height', '>', product.model_height) - ], - limit=1, - order='volume desc' - ) - vals = { - 'bom_id': self.id, - 'product_id': embryo.id, - 'product_tmpl_id': embryo.product_tmpl_id.id, - 'product_qty': 1, - 'product_uom_id': 1 - } - return self.env['mrp.bom.line'].create(vals) diff --git a/sf_bpm_api/models/sale_order.py b/sf_bpm_api/models/sale_order.py deleted file mode 100644 index 1618a4e3..00000000 --- a/sf_bpm_api/models/sale_order.py +++ /dev/null @@ -1,34 +0,0 @@ -from odoo import models, fields -from odoo.exceptions import ValidationError -import datetime - - -class ReSaleOrder(models.Model): - _inherit = 'sale.order' - - deadline_of_delivery = fields.Date('交货截止日期') - - # 业务平台分配工厂后在智能工厂先创建销售订单 - def sale_order_create(self, deadline_of_delivery, company_id): - now_time = datetime.datetime.now() - order_id = self.env['sale.order'].sudo().create({ - 'company_id': company_id.id, - 'date_order': now_time, - 'name': self.env['ir.sequence'].next_by_code('sale.order', sequence_date=now_time), - 'partner_id': 8, - 'state': 'sale', - 'user_id': 6, - 'deadline_of_delivery': deadline_of_delivery - }) - return order_id - - # 业务平台分配工厂时在创建完产品后再创建销售明细信息 - def sale_order_create_line(self, product, item): - vals = { - 'order_id': self.id, - 'product_id': product.id, - 'name': '%s/%s/%s/%s/%s' % (item['model_long'], item['model_width'], item['model_height'], item['model_volume'], product.model_materials_id.name), - 'price_unit': item['price'], - 'product_uom_qty': item['number'] - } - return self.env['sale.order.line'].create(vals) diff --git a/sf_bpm_api/views/product_template_view.xml b/sf_bpm_api/views/product_template_view.xml deleted file mode 100644 index 406330e3..00000000 --- a/sf_bpm_api/views/product_template_view.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - product.template.form.inherit.sf - product.template - - - - - - - - - - - - - - - - - - - - - - - - - - - - product.category.form.inherit.sf - product.category - - - - - - - - - \ No newline at end of file diff --git a/sf_bpm_api/views/sale_order_view.xml b/sf_bpm_api/views/sale_order_view.xml deleted file mode 100644 index 58abd5be..00000000 --- a/sf_bpm_api/views/sale_order_view.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - sale.order.form.inherit.sf - sale.order - - - - - - - - - \ No newline at end of file diff --git a/sf_manufacturing_orders/models/mrp_workorder.py b/sf_manufacturing_orders/models/mrp_workorder.py index 7997d82d..efed5ecb 100644 --- a/sf_manufacturing_orders/models/mrp_workorder.py +++ b/sf_manufacturing_orders/models/mrp_workorder.py @@ -11,5 +11,13 @@ class ResMrpWorkOrder(models.Model): workcenter_id = fields.Many2one('mrp.workcenter', required=False) processing_panel = fields.Char('加工面') + routing_type = fields.Selection([ + ('获取CNC加工程序', '获取CNC加工程序'), + ('装夹', '装夹'), + ('前置三元定位检测', '前置三元定位检测'), + ('CNC加工', 'CNC加工'), + ('置三元质量检测', '置三元质量检测'), + ('解除装夹', '解除装夹'), + ], string="工序类型") diff --git a/sf_manufacturing_orders/models/sf_production.py b/sf_manufacturing_orders/models/sf_production.py deleted file mode 100644 index 79bba3db..00000000 --- a/sf_manufacturing_orders/models/sf_production.py +++ /dev/null @@ -1,292 +0,0 @@ -# -*- coding: utf-8 -*- -import logging -from collections import defaultdict, namedtuple -from odoo.addons.stock.models.stock_rule import ProcurementException - -from dateutil.relativedelta import relativedelta - -from odoo import SUPERUSER_ID, _, api, fields, models, registry -from odoo.exceptions import UserError -from odoo.osv import expression -from odoo.tools import float_compare, float_is_zero, html_escape -from odoo.tools.misc import split_every - -_logger = logging.getLogger(__name__) - - -class ProductTemplate(models.Model): - _inherit = 'product.template' - _description = '产品模板' - - single_manufacturing = fields.Boolean(string="单个制造") - - -class ProcurementGroup(models.Model): - _inherit = 'procurement.group' - - -class MrpProduction(models.Model): - _inherit = 'mrp.production' - _description = "制造订单" - - # 重载根据工序生成工单的程序：如果产品BOM中没有工序时， - # 根据产品对应的模板类型中工序，去生成工单； - # CNC加工工序的选取规则： - # 如果自动报价有带过来预分配的机床， - # 则根据设备找到工作中心；否则采用前面描述的工作中心分配机制； - # 其他规则限制： 默认只分配给工作中心状态为非故障的工作中心； - - def _create_workorder(self): - for production in self: - if not production.bom_id or not production.product_id: - continue - workorders_values = [] - - product_qty = production.product_uom_id._compute_quantity(production.product_qty, - production.bom_id.product_uom_id) - exploded_boms, dummy = production.bom_id.explode(production.product_id, - product_qty / production.bom_id.product_qty, - picking_type=production.bom_id.picking_type_id) - - for bom, bom_data in exploded_boms: - # If the operations of the parent BoM and phantom BoM are the same, don't recreate work orders. - if not (bom.operation_ids and (not bom_data['parent_line'] or bom_data[ - 'parent_line'].bom_id.operation_ids != bom.operation_ids)): - continue - for operation in bom.operation_ids: - if operation._skip_operation_line(bom_data['product']): - continue - workorders_values += [{ - 'name': operation.name, - 'production_id': production.id, - 'workcenter_id': operation.workcenter_id.id, - 'product_uom_id': production.product_uom_id.id, - 'operation_id': operation.id, - 'state': 'pending', - }] - # 根据加工面板的面数及对应的工序模板生成工单 - for k in (production.product_id.processing_panel.split(',')): - for route in production.product_id.model_type_id.routing_tmpl_ids: - if route: - workorders_values_str = [0, '', { - 'product_uom_id': production.product_uom_id.id, - 'qty_producing': 0, - 'operation_id': False, - 'name': route.route_workcenter_id.name, - 'processing_panel': k, - - 'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids), - 'date_planned_start': False, - 'date_planned_finished': False, - 'duration_expected': 60, - 'duration': 0 - }] - workorders_values.append(workorders_values_str) - production.workorder_ids = workorders_values - for workorder in production.workorder_ids: - workorder.duration_expected = workorder._get_duration_expected() - - -class StockRule(models.Model): - _inherit = 'stock.rule' - - @api.model - def _run_pull(self, procurements): - moves_values_by_company = defaultdict(list) - mtso_products_by_locations = defaultdict(list) - - # To handle the `mts_else_mto` procure method, we do a preliminary loop to - # isolate the products we would need to read the forecasted quantity, - # in order to to batch the read. We also make a sanitary check on the - # `location_src_id` field. - - for procurement, rule in procurements: - if not rule.location_src_id: - msg = _('No source location defined on stock rule: %s!') % (rule.name,) - raise ProcurementException([(procurement, msg)]) - - if rule.procure_method == 'mts_else_mto': - mtso_products_by_locations[rule.location_src_id].append(procurement.product_id.id) - - # Get the forecasted quantity for the `mts_else_mto` procurement. - forecasted_qties_by_loc = {} - for location, product_ids in mtso_products_by_locations.items(): - products = self.env['product.product'].browse(product_ids).with_context(location=location.id) - forecasted_qties_by_loc[location] = {product.id: product.free_qty for product in products} - - # Prepare the move values, adapt the `procure_method` if needed. - procurements = sorted(procurements, key=lambda proc: float_compare(proc[0].product_qty, 0.0, - precision_rounding=proc[ - 0].product_uom.rounding) > 0) - list2 = [] - for item in procurements: - num = int(item[0].product_qty) - product = self.env['product.template'].search( - ["&", ("name", '=', item[0].product_id.display_name), ('single_manufacturing', '!=', False)]) - if product: - 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, - location_id=item[0].location_id, - name=item[0].name, - origin=item[0].origin, - company_id=item[0].company_id, - values=item[0].values, - ) - item1 = list(item) - item1[0] = s - - list2.append(tuple(item1)) - else: - list2.append(item) - else: - list2.append(item) - - for procurement, rule in list2: - procure_method = rule.procure_method - if rule.procure_method == 'mts_else_mto': - qty_needed = procurement.product_uom._compute_quantity(procurement.product_qty, - procurement.product_id.uom_id) - if float_compare(qty_needed, 0, precision_rounding=procurement.product_id.uom_id.rounding) <= 0: - procure_method = 'make_to_order' - for move in procurement.values.get('group_id', self.env['procurement.group']).stock_move_ids: - if move.rule_id == rule and float_compare(move.product_uom_qty, 0, - precision_rounding=move.product_uom.rounding) > 0: - procure_method = move.procure_method - break - forecasted_qties_by_loc[rule.location_src_id][procurement.product_id.id] -= qty_needed - elif float_compare(qty_needed, forecasted_qties_by_loc[rule.location_src_id][procurement.product_id.id], - precision_rounding=procurement.product_id.uom_id.rounding) > 0: - procure_method = 'make_to_order' - else: - forecasted_qties_by_loc[rule.location_src_id][procurement.product_id.id] -= qty_needed - procure_method = 'make_to_stock' - - move_values = rule._get_stock_move_values(*procurement) - move_values['procure_method'] = procure_method - moves_values_by_company[procurement.company_id.id].append(move_values) - - for company_id, moves_values in moves_values_by_company.items(): - # create the move as SUPERUSER because the current user may not have the rights to do it (mto product launched by a sale for example) - moves = self.env['stock.move'].with_user(SUPERUSER_ID).sudo().with_company(company_id).create(moves_values) - # Since action_confirm launch following procurement_group we should activate it. - moves._action_confirm() - - return True - - # @api.model - # def _run_manufacture(self, procurements): - # productions_values_by_company = defaultdict(list) - # errors = [] - # for procurement, rule in procurements: - # 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. - # continue - # bom = rule._get_matching_bom(procurement.product_id, procurement.company_id, procurement.values) - # - # product = self.env['product.template'].search( - # ["&", ("id", '=', procurement.product_id.id), ('single_manufacturing', '!=', False)]) - # if not product: - # productions_values_by_company[procurement.company_id.id].append( - # rule._prepare_mo_vals1(*procurement, bom)) - # else: - # orders_vals = rule._prepare_mo_vals(*procurement, bom) - # - # if isinstance(orders_vals, list): - # for vals in orders_vals: - # productions_values_by_company[procurement.company_id.id].append(vals) - # else: - # productions_values_by_company[procurement.company_id.id].append(orders_vals) - # - # if errors: - # raise ProcurementException(errors) - # - # 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 (mto product launched by a sale for example) - # productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(company_id).create( - # productions_values) - # a = self.env['stock.move'].sudo().create(productions._get_moves_raw_values()) - # b = self.env['stock.move'].sudo().create(productions._get_moves_finished_values()) - # c = productions._create_workorder() - # 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: - # 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) - # return True - # - # def _prepare_mo_vals1(self, product_id, product_qty, product_uom, location_id, name, origin, company_id, values, - # bom): - # date_planned = self._get_date_planned(product_id, company_id, values) - # date_deadline = values.get('date_deadline') or date_planned + relativedelta( - # days=company_id.manufacturing_lead) + relativedelta(days=product_id.produce_delay) - # mo_values = { - # 'origin': origin, - # 'product_id': product_id.id, - # 'product_description_variants': values.get('product_description_variants'), - # 'product_qty': product_qty, - # 'product_uom_id': product_uom.id, - # 'location_src_id': self.location_src_id.id or self.picking_type_id.default_location_src_id.id or location_id.id, - # 'location_dest_id': location_id.id, - # 'bom_id': bom.id, - # 'date_deadline': date_deadline, - # 'date_planned_start': date_planned, - # 'date_planned_finished': fields.Datetime.from_string(values['date_planned']), - # 'procurement_group_id': False, - # 'propagate_cancel': self.propagate_cancel, - # 'orderpoint_id': values.get('orderpoint_id', False) and values.get('orderpoint_id').id, - # 'picking_type_id': self.picking_type_id.id or values['warehouse_id'].manu_type_id.id, - # 'company_id': company_id.id, - # 'move_dest_ids': values.get('move_dest_ids') and [(4, x.id) for x in values['move_dest_ids']] or False, - # 'user_id': False, - # } - # # Use the procurement group created in _run_pull mrp override - # # Preserve the origin from the original stock move, if available - # if location_id.warehouse_id.manufacture_steps == 'pbm_sam' and values.get('move_dest_ids') and values.get( - # 'group_id') and values['move_dest_ids'][0].origin != values['group_id'].name: - # origin = values['move_dest_ids'][0].origin - # mo_values.update({ - # 'name': values['group_id'].name, - # 'procurement_group_id': values['group_id'].id, - # 'origin': origin, - # }) - # return mo_values - # - # def _prepare_mo_vals(self, product_id, product_qty, product_uom, location_id, name, origin, company_id, values, - # bom): - # - # mo_lists = [] - # for num in range(1, int(product_qty) + 1): - # vals = super(StockRule, self)._prepare_mo_vals(product_id, 1.0, product_uom, location_id, name, origin, - # company_id, values, - # bom) - # vals.update({ - # # 'name': values['group_id'].name, - # 'procurement_group_id': values['group_id'].id, - # # 'origin': origin, - # }) - # mo_lists.append(vals) - # - # return mo_lists