From 60bd5002bc717718a68e8adcd2c771238a01c411 Mon Sep 17 00:00:00 2001 From: gqh Date: Wed, 19 Oct 2022 17:19:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8D=95=E4=B8=80=E5=88=B6?= =?UTF-8?q?=E9=80=A0=E5=87=BA=E5=BA=93=E5=8D=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_bf_connect/__manifest__.py | 3 +- sf_bf_connect/controllers/__init__.py | 1 + sf_bf_connect/controllers/controllers.py | 32 ++ sf_bf_connect/models/__init__.py | 2 + sf_bf_connect/models/sf_process_order.py | 34 ++ .../views/sale_process_order_view.xml | 18 + .../models/sf_production.py | 357 +++++++++++------- 7 files changed, 302 insertions(+), 145 deletions(-) create mode 100644 sf_bf_connect/controllers/__init__.py create mode 100644 sf_bf_connect/controllers/controllers.py create mode 100644 sf_bf_connect/models/__init__.py create mode 100644 sf_bf_connect/models/sf_process_order.py create mode 100644 sf_bf_connect/views/sale_process_order_view.xml diff --git a/sf_bf_connect/__manifest__.py b/sf_bf_connect/__manifest__.py index ac357826..612bc615 100644 --- a/sf_bf_connect/__manifest__.py +++ b/sf_bf_connect/__manifest__.py @@ -10,8 +10,9 @@ """, 'category': 'YZ', 'website': 'https://www.sf.cs.jikimo.com', - 'depends': [], + 'depends': ['account', 'sf_base', 'base', 'sale'], 'data': [ + 'views/sale_process_order_view.xml' ], 'demo': [ ], diff --git a/sf_bf_connect/controllers/__init__.py b/sf_bf_connect/controllers/__init__.py new file mode 100644 index 00000000..4644261c --- /dev/null +++ b/sf_bf_connect/controllers/__init__.py @@ -0,0 +1 @@ +from .import controllers diff --git a/sf_bf_connect/controllers/controllers.py b/sf_bf_connect/controllers/controllers.py new file mode 100644 index 00000000..91304469 --- /dev/null +++ b/sf_bf_connect/controllers/controllers.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +import json +import logging +from datetime import date, timedelta +from odoo import http +from odoo.http import request +from odoo.addons.mrs_gateway_api.models.common import Common +from odoo.addons.mrs_gateway_api.models.basicdata_str import BasicDataStr + + +class Sf_Bf_Connect(http.Controller): + + @http.route('/api/bfm_process_order/list', type='json', auth='none', methods=['GET', 'POST'], csrf=False, + cors="*") + def get_bfm_process_order_list(self, **kw): + """ + 获取业务平台传送来的业务平台订单 + :param kw: + :return: + """ + result = json.loads('bfm_process_order_list') + for item in result: + self.env['mrs.production.process'].create({ + "id": item['id'], + "model_file": item['model_file'], + "model_name": item['model_name'], + "type": item['type'], + "surface_technics": item['surface_technics'], + "unit_price": item['unit_price'], + "amount": item['amount'], + "money": item['money'] + }) diff --git a/sf_bf_connect/models/__init__.py b/sf_bf_connect/models/__init__.py new file mode 100644 index 00000000..b6c1e8a8 --- /dev/null +++ b/sf_bf_connect/models/__init__.py @@ -0,0 +1,2 @@ +from . import sf_process_order + diff --git a/sf_bf_connect/models/sf_process_order.py b/sf_bf_connect/models/sf_process_order.py new file mode 100644 index 00000000..e3947692 --- /dev/null +++ b/sf_bf_connect/models/sf_process_order.py @@ -0,0 +1,34 @@ +from odoo import models,fields +from odoo.exceptions import ValidationError + + +class bfmOrderLine(models.Model): + _name = 'sf.bfm.order.line' + _description = '业务平台订单' + + model_file = fields.Binary('模型文件', attachment=False) + model_name = fields.char('模型名称') + type = fields.Many2one('mrs.materials.model', '型号') + surface_technics = fields.Many2one('mrs.production.process', string='表面工艺') + # technological_parameter = fields.Many2one('',string='工艺参数') + unit_price = fields.Float('单价') + amount = fields.Integer('数量') + money = fields.Float('金额') + + +class sale(models.Model): + _inherit = 'sale.order' + + bfm_process_order_ids = fields.Many2one('sf.bfm.order.line', string='业务平台订单') + + + + + + + + + + + + diff --git a/sf_bf_connect/views/sale_process_order_view.xml b/sf_bf_connect/views/sale_process_order_view.xml new file mode 100644 index 00000000..898ade1b --- /dev/null +++ b/sf_bf_connect/views/sale_process_order_view.xml @@ -0,0 +1,18 @@ + + + + + sale.order + + + + + + + + + + + + + \ No newline at end of file diff --git a/sf_manufacturing_orders/models/sf_production.py b/sf_manufacturing_orders/models/sf_production.py index 5191d791..6995005a 100644 --- a/sf_manufacturing_orders/models/sf_production.py +++ b/sf_manufacturing_orders/models/sf_production.py @@ -29,163 +29,232 @@ class MrpProduction(models.Model): _inherit = 'mrp.production' _description = "制造订单" - # @api.model - # def create(self, values): - # n = values - # if values['product_qty']== 1.0: - # return self.env['mrp.production'].create1(values) - # else: - # for i in range(int(values.get('product_qty'))): - # b = n - # b['product_qty'] = 1.0 - # self.env['mrp.production'].create1(b) - - # @api.model - # def create(self, values): - # # Remove from `move_finished_ids` the by-product moves and then move `move_byproduct_ids` - # # into `move_finished_ids` to avoid duplicate and inconsistency. - # if values.get('move_finished_ids', False): - # values['move_finished_ids'] = list( - # filter(lambda move: move[2]['byproduct_id'] is False, values['move_finished_ids'])) - # if values.get('move_byproduct_ids', False): - # values['move_finished_ids'] = values.get('move_finished_ids', []) + values['move_byproduct_ids'] - # del values['move_byproduct_ids'] - # if not values.get('name', False) or values['name'] == _('New'): - # picking_type_id = values.get('picking_type_id') or self._get_default_picking_type() - # picking_type_id = self.env['stock.picking.type'].browse(picking_type_id) - # if picking_type_id: - # values['name'] = picking_type_id.sequence_id.next_by_id() - # else: - # values['name'] = self.env['ir.sequence'].next_by_code('mrp.production') or _('New') - # if not values.get('procurement_group_id'): - # procurement_group_vals = self._prepare_procurement_group_vals(values) - # values['procurement_group_id'] = self.env["procurement.group"].create(procurement_group_vals).id - # production = super(MrpProduction, self).create(values) - # (production.move_raw_ids | production.move_finished_ids).write({ - # 'group_id': production.procurement_group_id.id, - # 'origin': production.name - # }) - # production.move_raw_ids.write({'date': production.date_planned_start}) - # production.move_finished_ids.write({'date': production.date_planned_finished}) - # # Trigger move_raw creation when importing a file - # if 'import_file' in self.env.context: - # production._onchange_move_raw() - # production._onchange_move_finished() - # return production - - class StockRule(models.Model): _inherit = 'stock.rule' + @api.model - def _run_manufacture(self, procurements): - productions_values_by_company = defaultdict(list) - errors = [] + 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. + + # list1 = [] + # for item in procurements: + # num = int(item[0].product_qty) + # 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 + # + # list1.append(tuple(item1)) + # else: + # list1.append(item) + 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) + 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", '=', procurement.product_id.display_name), ('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) + ["&", ("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 - if isinstance(orders_vals, list): - for vals in orders_vals: - productions_values_by_company[procurement.company_id.id].append(vals) + list2.append(tuple(item1)) else: - productions_values_by_company[procurement.company_id.id].append(orders_vals) + list2.append(item) + else: + list2.append(item) - if errors: - raise ProcurementException(errors) + 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' - 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) - self.env['stock.move'].sudo().create(productions._get_moves_raw_values()) - self.env['stock.move'].sudo().create(productions._get_moves_finished_values()) - 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() + 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 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) + 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 - 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 + # @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 - 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