From 111c0f6dae80c8cd7ff491011d1207ab2dacd57c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= Date: Wed, 6 Nov 2024 17:53:33 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_sale_route_picking/__init__.py | 4 + jikimo_sale_route_picking/__manifest__.py | 26 ++++++ .../controllers/__init__.py | 2 + jikimo_sale_route_picking/controllers/main.py | 46 ++++++++++ .../data/product_templates.xml | 85 +++++++++++++++++++ .../data/stock_routes.xml | 31 +++++++ jikimo_sale_route_picking/models/__init__.py | 3 + .../models/product_product.py | 7 ++ .../models/product_template.py | 10 +++ .../security/group_security.xml | 10 +++ .../security/ir.model.access.csv | 8 ++ .../views/product_product_views.xml | 15 ++++ .../views/sale_order_views.xml | 83 ++++++++++++++++++ .../product_template_management_view.xml | 10 +-- sf_plan_management/i18n/zh_CN.po | 2 +- sf_sale/models/sale_order.py | 10 +-- sf_sale/views/sale_order_view.xml | 8 +- 17 files changed, 342 insertions(+), 18 deletions(-) create mode 100644 jikimo_sale_route_picking/__init__.py create mode 100644 jikimo_sale_route_picking/__manifest__.py create mode 100644 jikimo_sale_route_picking/controllers/__init__.py create mode 100644 jikimo_sale_route_picking/controllers/main.py create mode 100644 jikimo_sale_route_picking/data/product_templates.xml create mode 100644 jikimo_sale_route_picking/data/stock_routes.xml create mode 100644 jikimo_sale_route_picking/models/__init__.py create mode 100644 jikimo_sale_route_picking/models/product_product.py create mode 100644 jikimo_sale_route_picking/models/product_template.py create mode 100644 jikimo_sale_route_picking/security/group_security.xml create mode 100644 jikimo_sale_route_picking/security/ir.model.access.csv create mode 100644 jikimo_sale_route_picking/views/product_product_views.xml create mode 100644 jikimo_sale_route_picking/views/sale_order_views.xml diff --git a/jikimo_sale_route_picking/__init__.py b/jikimo_sale_route_picking/__init__.py new file mode 100644 index 00000000..7909ef3a --- /dev/null +++ b/jikimo_sale_route_picking/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +from . import models + +from . import controllers diff --git a/jikimo_sale_route_picking/__manifest__.py b/jikimo_sale_route_picking/__manifest__.py new file mode 100644 index 00000000..b72e9a37 --- /dev/null +++ b/jikimo_sale_route_picking/__manifest__.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +{ + 'name': '机企猫 供货路线选择', + 'version': '16.0.1.0.0', + 'summary': """ 报价单提供（自动化产线加工/人工线下加工/外购/委外加工）多种供货路线选择 """, + 'author': 'fox', + 'website': '', + 'category': '', + 'depends': ['product', 'sf_dlm_management', 'sale_stock'], + "data": [ + 'security/group_security.xml', + 'security/ir.model.access.csv', + 'data/stock_routes.xml', + 'data/product_templates.xml', + 'views/sale_order_views.xml', + 'views/product_product_views.xml', + ],'assets': { + # 'web.assets_backend': [ + # 'jikimo_sale_route_picking/static/src/**/*' + # ], + }, + 'application': True, + 'installable': True, + 'auto_install': False, + 'license': 'LGPL-3', +} diff --git a/jikimo_sale_route_picking/controllers/__init__.py b/jikimo_sale_route_picking/controllers/__init__.py new file mode 100644 index 00000000..cd4d6a8b --- /dev/null +++ b/jikimo_sale_route_picking/controllers/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import main \ No newline at end of file diff --git a/jikimo_sale_route_picking/controllers/main.py b/jikimo_sale_route_picking/controllers/main.py new file mode 100644 index 00000000..0c0390e7 --- /dev/null +++ b/jikimo_sale_route_picking/controllers/main.py @@ -0,0 +1,46 @@ +import logging +import json +from odoo import http +from odoo.http import request +from odoo.addons.sf_bf_connect.controllers.controllers import Sf_Bf_Connect + +_logger = logging.getLogger(__name__) + +class JikimoSaleRoutePicking(Sf_Bf_Connect): + + @http.route('/api/bfm_process_order/list', type='http', auth='sf_token', methods=['GET', 'POST'], csrf=False, + cors="*") + def get_bfm_process_order_list(self, **kw): + """ + 接收业务平台加工订单分配工厂时传送来的订单数据并生成销售订单和产品及坯料 + :param kw: + :return: + """ + res = {'status': 1, 'factory_order_no': ''} + _logger.info('get_bfm_process_order_list:%s' % kw['order_number']) + try: + product_id = request.env.ref('jikimo_sale_route_picking.product_template_default').sudo() + company_id = request.env.ref('base.main_company').sudo() + bfm_process_order_list = json.loads(kw['bfm_process_order_list']) + order_id = request.env['sale.order'].with_user(request.env.ref("base.user_admin")).sale_order_create( + company_id, kw['delivery_name'], kw['delivery_telephone'], kw['delivery_address'], + kw['delivery_end_date'], kw['payments_way'], kw['pay_way'], state='draft') + i = 1 + # 给sale_order的default_code字段赋值 + aa = request.env['sale.order'].sudo().search([('name', '=', order_id.name)]) + _logger.info('get_bfm_process_or===================================:%s' % order_id.name) + aa.default_code = kw['order_number'] + if kw.get('logistics_way'): + aa.logistics_way = kw['logistics_way'] + _logger.info('get_bfm_process_order_listaaaaaaaaaaaaaaaaaaaaaaaaaaaa================:%s' % aa.default_code) + for item in bfm_process_order_list: + product = request.env['product.template'].sudo().product_create(product_id, item, order_id, + kw['order_number'], i) + order_id.with_user(request.env.ref("base.user_admin")).sale_order_create_line(product, item) + i += 1 + res['factory_order_no'] = order_id.name + except Exception as e: + _logger.info('get_bfm_process_order_list error:%s' % e) + res['status'] = -1 + res['message'] = '工厂创建销售订单和产品失败，请联系管理员' + return json.JSONEncoder().encode(res) diff --git a/jikimo_sale_route_picking/data/product_templates.xml b/jikimo_sale_route_picking/data/product_templates.xml new file mode 100644 index 00000000..df965fd0 --- /dev/null +++ b/jikimo_sale_route_picking/data/product_templates.xml @@ -0,0 +1,85 @@ + + + + + 人工线下加工模板 + + + + delivery + product + false + + + + true + serial + true + true + + + + 成品外购模板 + + + + serial + product + + + + true + + + + 成品委外加工模板 + + + + serial + product + + + + true + + + + 成品初始化模板 + + + + serial + product + + + + true + + + + + + + + + 坯料客供料模板 + + + + false + serial + product + + + + + + + \ No newline at end of file diff --git a/jikimo_sale_route_picking/data/stock_routes.xml b/jikimo_sale_route_picking/data/stock_routes.xml new file mode 100644 index 00000000..eb6a340c --- /dev/null +++ b/jikimo_sale_route_picking/data/stock_routes.xml @@ -0,0 +1,31 @@ + + + + + 带料加工 + true + true + + 16 + + + + 客供料入库 + incoming + true + + DL + + + + + + 带料收货 + + + + + pull + + + \ No newline at end of file diff --git a/jikimo_sale_route_picking/models/__init__.py b/jikimo_sale_route_picking/models/__init__.py new file mode 100644 index 00000000..f59a4700 --- /dev/null +++ b/jikimo_sale_route_picking/models/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +from . import product_template +from . import product_product diff --git a/jikimo_sale_route_picking/models/product_product.py b/jikimo_sale_route_picking/models/product_product.py new file mode 100644 index 00000000..996a9d5c --- /dev/null +++ b/jikimo_sale_route_picking/models/product_product.py @@ -0,0 +1,7 @@ +from odoo import models, fields + +class ProductProduct(models.Model): + _inherit = 'product.product' + + # 是否客供料 + is_customer_provided = fields.Boolean(string='是否客供料', related='product_tmpl_id.is_customer_provided') diff --git a/jikimo_sale_route_picking/models/product_template.py b/jikimo_sale_route_picking/models/product_template.py new file mode 100644 index 00000000..6b2bc29d --- /dev/null +++ b/jikimo_sale_route_picking/models/product_template.py @@ -0,0 +1,10 @@ +from odoo import models, fields + +class ProductTemplate(models.Model): + _inherit = 'product.template' + + is_manual_processing = fields.Boolean(string='人工线下加工') + is_customer_provided = fields.Boolean(string='客供料') + + def product_create(self, product_id, item, order_id, order_number, i): + product_id = super(ProductTemplate, self).product_create(product_id, item, order_id, order_number, i) diff --git a/jikimo_sale_route_picking/security/group_security.xml b/jikimo_sale_route_picking/security/group_security.xml new file mode 100644 index 00000000..84bf5b89 --- /dev/null +++ b/jikimo_sale_route_picking/security/group_security.xml @@ -0,0 +1,10 @@ + + + + + + 工艺工程师 + + + + \ No newline at end of file diff --git a/jikimo_sale_route_picking/security/ir.model.access.csv b/jikimo_sale_route_picking/security/ir.model.access.csv new file mode 100644 index 00000000..aac13f29 --- /dev/null +++ b/jikimo_sale_route_picking/security/ir.model.access.csv @@ -0,0 +1,8 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_sale_order_group_production_engineer,sale.order_group_production_engineer,sale.model_sale_order,jikimo_sale_route_picking.group_production_engineer,1,1,0,0 +access_sale_order_line_group_production_engineer,sale_order_line_group_production_engineer,sale.model_sale_order_line,jikimo_sale_route_picking.group_production_engineer,1,1,0,0 +access_product_product_group_production_engineer,product_product_group_production_engineer,product.model_product_product,jikimo_sale_route_picking.group_production_engineer,1,0,0,0 +access_product_template_group_production_engineer,product_template_group_production_engineer,product.model_product_template,jikimo_sale_route_picking.group_production_engineer,1,0,0,0 +access_stock_picking_group_production_engineer,stock_picking_group_production_engineer,stock.model_stock_picking,jikimo_sale_route_picking.group_production_engineer,1,0,0,0 +access_stock_move_group_production_engineer,stock_move_group_production_engineer,stock.model_stock_move,jikimo_sale_route_picking.group_production_engineer,1,0,0,0 +access_mrp_bom_group_production_engineer,mrp_bom_group_production_engineer,mrp.model_mrp_bom,jikimo_sale_route_picking.group_production_engineer,1,0,0,0 \ No newline at end of file diff --git a/jikimo_sale_route_picking/views/product_product_views.xml b/jikimo_sale_route_picking/views/product_product_views.xml new file mode 100644 index 00000000..e3f896b5 --- /dev/null +++ b/jikimo_sale_route_picking/views/product_product_views.xml @@ -0,0 +1,15 @@ + + + + view.product.template.form.inherit.sf + product.template + + + + + + + + + + \ No newline at end of file diff --git a/jikimo_sale_route_picking/views/sale_order_views.xml b/jikimo_sale_route_picking/views/sale_order_views.xml new file mode 100644 index 00000000..027a3054 --- /dev/null +++ b/jikimo_sale_route_picking/views/sale_order_views.xml @@ -0,0 +1,83 @@ + + + + view.sale.order.form.inherit.sf + + sale.order + + + + + + + + + + jikimo.sale.order.search.inherit.quotation + sale.order + primary + + + + + + + + + + jikimo.sale.order.search.inherit.quotation + sale.order + primary + + + + + + + + + + + + + + + + + 报价单 + ir.actions.act_window + sale.order + tree,kanban,form,calendar,pivot,graph,activity + + {'search_default_route': 1} + +

+ Create a new quotation, the first step of a new sale! +

+ Once the quotation is confirmed by the customer, it becomes a sales order.
You will be able to create an invoice and collect the payment. +

+ + + + + + + + + + diff --git a/sf_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml index 1862e33c..0fe6413b 100644 --- a/sf_dlm_management/views/product_template_management_view.xml +++ b/sf_dlm_management/views/product_template_management_view.xml @@ -110,15 +110,13 @@ - - + + - - + + diff --git a/sf_plan_management/i18n/zh_CN.po b/sf_plan_management/i18n/zh_CN.po index 0b957921..d9511db1 100644 --- a/sf_plan_management/i18n/zh_CN.po +++ b/sf_plan_management/i18n/zh_CN.po @@ -7059,7 +7059,7 @@ msgstr "" #. module: sf_dlm #: model:product.template,name:sf_dlm.product_template_sf_product_template msgid "CNC加工产品模板" -msgstr "冲压模具滑块" +msgstr "自动化产线加工模板" #. module: sf_tool_management #: model:ir.model,name:sf_tool_management.model_sf_cnc_processing diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py index 53f73aef..251554b5 100644 --- a/sf_sale/models/sale_order.py +++ b/sf_sale/models/sale_order.py @@ -60,7 +60,7 @@ class ReSaleOrder(models.Model): # 业务平台分配工厂后在智能工厂先创建销售订单 def sale_order_create(self, company_id, delivery_name, delivery_telephone, delivery_address, - deadline_of_delivery, payments_way, pay_way): + deadline_of_delivery, payments_way, pay_way, state='sale'): now_time = datetime.datetime.now() partner = self.get_customer() data = { @@ -69,7 +69,7 @@ class ReSaleOrder(models.Model): 'name': self.env['ir.sequence'].next_by_code('sale.order', sequence_date=now_time), 'partner_id': partner.id, 'check_status': 'approved', - 'state': 'sale', + 'state': state, 'user_id': partner.user_id.id, 'person_of_delivery': delivery_name, 'telephone_of_delivery': delivery_telephone, @@ -133,8 +133,7 @@ class ReSaleOrder(models.Model): 'product_uom_qty': item['number'], 'model_glb_file': base64.b64decode(item['model_file']), 'remark': item.get('remark'), - 'is_incoming_material': item.get('is_incoming_material'), - 'incoming_size': item.get('incoming_size'), + 'is_incoming_material': item.get('is_incoming_material') } return self.env['sale.order.line'].with_context(skip_procurement=True).create(vals) @@ -175,8 +174,7 @@ class ResaleOrderLine(models.Model): check_status = fields.Selection(related='order_id.check_status') remark = fields.Char('备注') - is_incoming_material = fields.Boolean('是否带料', default=False) - incoming_size = fields.Char('带料尺寸') + is_incoming_material = fields.Boolean('客供料', default=False) @api.depends('product_template_id') def _compute_model_glb_file(self): diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml index a84a2b44..f5dba649 100644 --- a/sf_sale/views/sale_order_view.xml +++ b/sf_sale/views/sale_order_view.xml @@ -118,8 +118,7 @@ - - + {'readonly': [('state', 'in', ['cancel','sale'])]} @@ -167,7 +166,6 @@ - @@ -207,12 +205,12 @@ 下单时间 - + From 6679c200e1e936ae9de812cf72566a90587108ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= Date: Thu, 7 Nov 2024 08:41:25 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_sale_route_picking/__manifest__.py | 1 - .../security/group_security.xml | 10 ---------- .../security/ir.model.access.csv | 14 +++++++------- .../views/sale_order_views.xml | 6 +++--- 4 files changed, 10 insertions(+), 21 deletions(-) delete mode 100644 jikimo_sale_route_picking/security/group_security.xml diff --git a/jikimo_sale_route_picking/__manifest__.py b/jikimo_sale_route_picking/__manifest__.py index b72e9a37..e3da3a60 100644 --- a/jikimo_sale_route_picking/__manifest__.py +++ b/jikimo_sale_route_picking/__manifest__.py @@ -8,7 +8,6 @@ 'category': '', 'depends': ['product', 'sf_dlm_management', 'sale_stock'], "data": [ - 'security/group_security.xml', 'security/ir.model.access.csv', 'data/stock_routes.xml', 'data/product_templates.xml', diff --git a/jikimo_sale_route_picking/security/group_security.xml b/jikimo_sale_route_picking/security/group_security.xml deleted file mode 100644 index 84bf5b89..00000000 --- a/jikimo_sale_route_picking/security/group_security.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - 工艺工程师 - - - - \ No newline at end of file diff --git a/jikimo_sale_route_picking/security/ir.model.access.csv b/jikimo_sale_route_picking/security/ir.model.access.csv index aac13f29..3b276af9 100644 --- a/jikimo_sale_route_picking/security/ir.model.access.csv +++ b/jikimo_sale_route_picking/security/ir.model.access.csv @@ -1,8 +1,8 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_sale_order_group_production_engineer,sale.order_group_production_engineer,sale.model_sale_order,jikimo_sale_route_picking.group_production_engineer,1,1,0,0 -access_sale_order_line_group_production_engineer,sale_order_line_group_production_engineer,sale.model_sale_order_line,jikimo_sale_route_picking.group_production_engineer,1,1,0,0 -access_product_product_group_production_engineer,product_product_group_production_engineer,product.model_product_product,jikimo_sale_route_picking.group_production_engineer,1,0,0,0 -access_product_template_group_production_engineer,product_template_group_production_engineer,product.model_product_template,jikimo_sale_route_picking.group_production_engineer,1,0,0,0 -access_stock_picking_group_production_engineer,stock_picking_group_production_engineer,stock.model_stock_picking,jikimo_sale_route_picking.group_production_engineer,1,0,0,0 -access_stock_move_group_production_engineer,stock_move_group_production_engineer,stock.model_stock_move,jikimo_sale_route_picking.group_production_engineer,1,0,0,0 -access_mrp_bom_group_production_engineer,mrp_bom_group_production_engineer,mrp.model_mrp_bom,jikimo_sale_route_picking.group_production_engineer,1,0,0,0 \ No newline at end of file +access_sale_order_group_production_engineer,sale.order_group_production_engineer,sale.model_sale_order,sf_base.group_production_engineer,1,1,0,0 +access_sale_order_line_group_production_engineer,sale_order_line_group_production_engineer,sale.model_sale_order_line,sf_base.group_production_engineer,1,1,0,0 +access_product_product_group_production_engineer,product_product_group_production_engineer,product.model_product_product,sf_base.group_production_engineer,1,0,0,0 +access_product_template_group_production_engineer,product_template_group_production_engineer,product.model_product_template,sf_base.group_production_engineer,1,0,0,0 +access_stock_picking_group_production_engineer,stock_picking_group_production_engineer,stock.model_stock_picking,sf_base.group_production_engineer,1,0,0,0 +access_stock_move_group_production_engineer,stock_move_group_production_engineer,stock.model_stock_move,sf_base.group_production_engineer,1,0,0,0 +access_mrp_bom_group_production_engineer,mrp_bom_group_production_engineer,mrp.model_mrp_bom,sf_base.group_production_engineer,1,0,0,0 \ No newline at end of file diff --git a/jikimo_sale_route_picking/views/sale_order_views.xml b/jikimo_sale_route_picking/views/sale_order_views.xml index 027a3054..a178df0a 100644 --- a/jikimo_sale_route_picking/views/sale_order_views.xml +++ b/jikimo_sale_route_picking/views/sale_order_views.xml @@ -60,14 +60,14 @@ From 2798ce6183bc6a571f8fcc3aa69e03adde44b926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= Date: Fri, 8 Nov 2024 16:23:34 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__init__.py | 14 ++ .../__manifest__.py | 26 +++ .../controllers/__init__.py | 2 + .../controllers/main.py | 52 ++++++ .../data/product_data.xml | 85 ++++++++++ .../data/stock_routes.xml | 32 ++++ .../models/__init__.py | 3 + .../models/product_template.py | 31 ++++ .../models/sale_order.py | 156 ++++++++++++++++++ .../security/ir.model.access.csv | 8 + .../views/product_product_views.xml | 15 ++ .../views/sale_order_views.xml | 104 ++++++++++++ 12 files changed, 528 insertions(+) create mode 100644 jikimo_sale_multiple_supply_methods/__init__.py create mode 100644 jikimo_sale_multiple_supply_methods/__manifest__.py create mode 100644 jikimo_sale_multiple_supply_methods/controllers/__init__.py create mode 100644 jikimo_sale_multiple_supply_methods/controllers/main.py create mode 100644 jikimo_sale_multiple_supply_methods/data/product_data.xml create mode 100644 jikimo_sale_multiple_supply_methods/data/stock_routes.xml create mode 100644 jikimo_sale_multiple_supply_methods/models/__init__.py create mode 100644 jikimo_sale_multiple_supply_methods/models/product_template.py create mode 100644 jikimo_sale_multiple_supply_methods/models/sale_order.py create mode 100644 jikimo_sale_multiple_supply_methods/security/ir.model.access.csv create mode 100644 jikimo_sale_multiple_supply_methods/views/product_product_views.xml create mode 100644 jikimo_sale_multiple_supply_methods/views/sale_order_views.xml diff --git a/jikimo_sale_multiple_supply_methods/__init__.py b/jikimo_sale_multiple_supply_methods/__init__.py new file mode 100644 index 00000000..d5b81964 --- /dev/null +++ b/jikimo_sale_multiple_supply_methods/__init__.py @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- +from . import models +from . import controllers + +from odoo import api, SUPERUSER_ID + +def _set_init_product_active_false(cr, registry): + env = api.Environment(cr, SUPERUSER_ID, {}) + # 获取所有需要设置的产品模板 + env.ref('jikimo_sale_multiple_supply_methods.product_template_purchase').product_variant_id.write({'active': False}) + env.ref('jikimo_sale_multiple_supply_methods.product_template_manual_processing').product_variant_id.write({'active': False}) + env.ref('jikimo_sale_multiple_supply_methods.product_template_default').product_variant_id.write({'active': False}) + env.ref('jikimo_sale_multiple_supply_methods.product_template_raw_material_customer_provided').product_variant_id.write({'active': False}) + env.ref('jikimo_sale_multiple_supply_methods.product_template_outsourcing').product_variant_id.write({'active': False}) diff --git a/jikimo_sale_multiple_supply_methods/__manifest__.py b/jikimo_sale_multiple_supply_methods/__manifest__.py new file mode 100644 index 00000000..dec1cf62 --- /dev/null +++ b/jikimo_sale_multiple_supply_methods/__manifest__.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +{ + 'name': '机企猫 多供货方式', + 'version': '16.0.1.0.0', + 'summary': """ 报价单提供（自动化产线加工/人工线下加工/外购/委外加工）多种供货方式选择 """, + 'author': 'fox', + 'website': '', + 'category': '', + 'depends': ['product', 'sf_dlm_management', 'sale_stock'], + "data": [ + 'security/ir.model.access.csv', + 'data/stock_routes.xml', + 'data/product_data.xml', + 'views/sale_order_views.xml', + 'views/product_product_views.xml', + ],'assets': { + # 'web.assets_backend': [ + # 'jikimo_sale_multiple_supply_methods/static/src/**/*' + # ], + }, + 'post_init_hook': '_set_init_product_active_false', + 'application': True, + 'installable': True, + 'auto_install': False, + 'license': 'LGPL-3', +} diff --git a/jikimo_sale_multiple_supply_methods/controllers/__init__.py b/jikimo_sale_multiple_supply_methods/controllers/__init__.py new file mode 100644 index 00000000..cd4d6a8b --- /dev/null +++ b/jikimo_sale_multiple_supply_methods/controllers/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import main \ No newline at end of file diff --git a/jikimo_sale_multiple_supply_methods/controllers/main.py b/jikimo_sale_multiple_supply_methods/controllers/main.py new file mode 100644 index 00000000..9c20e687 --- /dev/null +++ b/jikimo_sale_multiple_supply_methods/controllers/main.py @@ -0,0 +1,52 @@ +import logging +import json +from odoo import http +from odoo.http import request +from odoo.addons.sf_bf_connect.controllers.controllers import Sf_Bf_Connect + +_logger = logging.getLogger(__name__) + +class JikimoSaleRoutePicking(Sf_Bf_Connect): + + @http.route('/api/bfm_process_order/list', type='http', auth='sf_token', methods=['GET', 'POST'], csrf=False, + cors="*") + def get_bfm_process_order_list(self, **kw): + """ + 接收业务平台加工订单分配工厂时传送来的订单数据并生成销售订单和产品及坯料 + :param kw: + :return: + """ + res = {'status': 1, 'factory_order_no': ''} + # _logger.info('get_bfm_process_order_list:%s' % kw['order_number']) + try: + product_tmpl_id = request.env.ref('jikimo_sale_multiple_supply_methods.product_template_default').sudo() + product_id = request.env['product.product'].sudo().search( + [('product_tmpl_id', '=', product_tmpl_id.id), ('active', '=', False)], + limit=1, + order='id asc' + ) + company_id = request.env.ref('base.main_company').sudo() + bfm_process_order_list = json.loads(kw['bfm_process_order_list']) + order_id = request.env['sale.order'].with_user(request.env.ref("base.user_admin")).sale_order_create( + company_id, kw['delivery_name'], kw['delivery_telephone'], kw['delivery_address'], + kw['delivery_end_date'], kw['payments_way'], kw['pay_way'], state='draft') + i = 1 + # 给sale_order的default_code字段赋值 + aa = request.env['sale.order'].sudo().search([('name', '=', order_id.name)]) + _logger.info('get_bfm_process_or===================================:%s' % order_id.name) + aa.default_code = kw['order_number'] + if kw.get('logistics_way'): + aa.logistics_way = kw['logistics_way'] + _logger.info('get_bfm_process_order_listaaaaaaaaaaaaaaaaaaaaaaaaaaaa================:%s' % aa.default_code) + for item in bfm_process_order_list: + product = request.env['product.template'].sudo().product_create(product_id, item, order_id, + kw['order_number'], i) + order_id.with_user(request.env.ref("base.user_admin")).sale_order_create_line(product, item) + i += 1 + res['factory_order_no'] = order_id.name + except Exception as e: + _logger.info('get_bfm_process_order_list error:%s' % e) + res['status'] = -1 + res['message'] = '工厂创建销售订单和产品失败，请联系管理员' + request.cr.rollback() + return json.JSONEncoder().encode(res) diff --git a/jikimo_sale_multiple_supply_methods/data/product_data.xml b/jikimo_sale_multiple_supply_methods/data/product_data.xml new file mode 100644 index 00000000..6f804ad5 --- /dev/null +++ b/jikimo_sale_multiple_supply_methods/data/product_data.xml @@ -0,0 +1,85 @@ + + + + + 人工线下加工模板 + + + + delivery + product + false + + + + true + serial + true + true + + + + 成品外购模板 + + + + serial + product + + + + true + + + + 成品委外加工模板 + + + + serial + product + + + + true + + + + 成品初始化模板 + + + + serial + product + + + + true + + + + + + + + + 坯料客供料模板 + + + + false + serial + product + + + + + + + \ No newline at end of file diff --git a/jikimo_sale_multiple_supply_methods/data/stock_routes.xml b/jikimo_sale_multiple_supply_methods/data/stock_routes.xml new file mode 100644 index 00000000..de4c2106 --- /dev/null +++ b/jikimo_sale_multiple_supply_methods/data/stock_routes.xml @@ -0,0 +1,32 @@ + + + + + 带料加工 + true + true + + 16 + + + + 客供料入库 + incoming + true + + DL + + + + + + + 带料收货 + + + + + pull + + + \ No newline at end of file diff --git a/jikimo_sale_multiple_supply_methods/models/__init__.py b/jikimo_sale_multiple_supply_methods/models/__init__.py new file mode 100644 index 00000000..28c7877f --- /dev/null +++ b/jikimo_sale_multiple_supply_methods/models/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +from . import product_template +from . import sale_order diff --git a/jikimo_sale_multiple_supply_methods/models/product_template.py b/jikimo_sale_multiple_supply_methods/models/product_template.py new file mode 100644 index 00000000..e5b3ba0e --- /dev/null +++ b/jikimo_sale_multiple_supply_methods/models/product_template.py @@ -0,0 +1,31 @@ +from odoo import models, fields, api + +class ProductTemplate(models.Model): + _inherit = 'product.template' + + is_manual_processing = fields.Boolean(string='人工线下加工') + is_customer_provided = fields.Boolean(string='客供料') + + def product_create(self, product_id, item, order_id, order_number, i): + product_id = super(ProductTemplate, self).product_create(product_id, item, order_id, order_number, i) + product_id.product_tmpl_id.is_customer_provided = item['is_incoming_material'] + return product_id + + + def copy_template(self, product_template_id): + if not isinstance(product_template_id, ProductTemplate): + raise ValueError('%s必须是ProductTemplate类型' % product_template_id) + + self.route_ids = product_template_id.route_ids + self.categ_id = product_template_id.categ_id + self.invoice_policy = product_template_id.invoice_policy + self.detailed_type = product_template_id.detailed_type + self.purchase_ok = product_template_id.purchase_ok + self.uom_id = product_template_id.uom_id + self.uom_po_id = product_template_id.uom_po_id + self.company_id = product_template_id.company_id + self.single_manufacturing = product_template_id.single_manufacturing + self.tracking = product_template_id.tracking + self.is_bfm = product_template_id.is_bfm + self.is_manual_processing = product_template_id.is_manual_processing + self.seller_ids = product_template_id.seller_ids diff --git a/jikimo_sale_multiple_supply_methods/models/sale_order.py b/jikimo_sale_multiple_supply_methods/models/sale_order.py new file mode 100644 index 00000000..1db9541c --- /dev/null +++ b/jikimo_sale_multiple_supply_methods/models/sale_order.py @@ -0,0 +1,156 @@ +import logging +import json +from odoo import models, fields, api +from odoo.exceptions import UserError + +_logger = logging.getLogger(__name__) + +class SaleOrder(models.Model): + _inherit = 'sale.order' + + state = fields.Selection([ + ('draft', "报价"), + ('sent', "报价已发送"), + ('supply method', "供货方式待确认"), + ('sale', "销售订单"), + ('done', "已锁定"), + ('cancel', "已取消"), + ]) + + def confirm_to_supply_method(self): + self.state = 'supply method' + + def action_confirm(self): + for line in self.order_line: + if not line.supply_method: + raise UserError('请先选择供货方式') + bom_type = '' + # 根据供货方式修改成品模板 + if line.supply_method == 'automation': + bom_type = 'normal' + product_template_id = self.env.ref('sf_dlm.product_template_sf').sudo().product_tmpl_id + elif line.supply_method == 'outsourcing': + bom_type = 'subcontract' + product_template_id = self.env.ref('jikimo_sale_multiple_supply_methods.product_template_outsourcing').sudo() + elif line.supply_method == 'purchase': + product_template_id = self.env.ref('jikimo_sale_multiple_supply_methods.product_template_purchase').sudo() + elif line.supply_method == 'manual': + bom_type = 'normal' + product_template_id = self.env.ref('jikimo_sale_multiple_supply_methods.product_template_manual_processing').sudo() + + # 复制成品模板上的属性 + line.product_id.product_tmpl_id.copy_template(product_template_id) + + order_id = self + product = line.product_id + # 拼接方法需要的item结构 + item = { + 'texture_code': product.materials_id.materials_no, + 'texture_type_code': product.materials_type_id.materials_no, + 'model_long': product.length, + 'model_width': product.width, + 'model_height': product.height, + 'price': product.list_price, + } + # 成品供货方式为采购则不生成bom + if line.supply_method != 'purchase': + bom_data = self.env['mrp.bom'].with_user(self.env.ref("base.user_admin")).get_bom(product) + _logger.info('bom_data:%s' % bom_data) + if bom_data: + bom = self.env['mrp.bom'].with_user(self.env.ref("base.user_admin")).bom_create(product, 'normal', False) + bom.with_user(self.env.ref("base.user_admin")).bom_create_line_has(bom_data) + else: + # 当成品上带有客供料选项时，生成坯料时选择“客供料”路线 + if line.is_incoming_material: + # 将成品模板的内容复制到成品上 + embryo_template_id = self.env.ref('jikimo_sale_multiple_supply_methods.product_template_raw_material_customer_provided').sudo() + embryo_id = self.env['product.product'].search( + [('product_tmpl_id', '=', embryo_template_id.id), ('active', '=', False)], + limit=1, + order='id asc' + ) + # 创建坯料，客供料的批量不需要创建bom + material_customer_provided_embryo = self.env['product.template'].sudo().no_bom_product_create( + embryo_id, + item, + order_id, 'material_customer_provided', 0, product) + # 成品配置bom + product_bom_material_customer_provided = self.env['mrp.bom'].with_user( + self.env.ref("base.user_admin")).bom_create( + product, bom_type, True) + product_bom_material_customer_provided.with_user(self.env.ref("base.user_admin")).bom_create_line_has( + material_customer_provided_embryo) + elif line.product_id.materials_type_id.gain_way == '自加工': + self_machining_id = self.env.ref('sf_dlm.product_embryo_sf_self_machining').sudo() + # 创建坯料 + self_machining_embryo = self.env['product.template'].sudo().no_bom_product_create( + self_machining_id, + item, + order_id, 'self_machining', 0, product) + # 创建坯料的bom + self_machining_bom = self.env['mrp.bom'].with_user( + self.env.ref("base.user_admin")).bom_create( + self_machining_embryo, 'normal', False) + # 创建坯料里bom的组件 + self_machining_bom_line = self_machining_bom.with_user( + self.env.ref("base.user_admin")).bom_create_line( + self_machining_embryo) + if not self_machining_bom_line: + raise UserError('该订单模型的材料型号暂未有原材料,请先配置再进行分配') + # 产品配置bom + product_bom_self_machining = self.env['mrp.bom'].with_user( + self.env.ref("base.user_admin")).bom_create( + product, bom_type, True) + product_bom_self_machining.with_user(self.env.ref("base.user_admin")).bom_create_line_has( + self_machining_embryo) + elif line.product_id.materials_type_id.gain_way == '外协': + outsource_id = self.env.ref('sf_dlm.product_embryo_sf_outsource').sudo() + # 创建坯料 + outsource_embryo = self.env['product.template'].sudo().no_bom_product_create(outsource_id, + item, + order_id, + 'subcontract', + 0, product) + if outsource_embryo == -3: + raise UserError('该订单模型的材料型号暂未设置获取方式和供应商,请先配置再进行分配') + # 创建坯料的bom + outsource_bom = self.env['mrp.bom'].with_user(self.env.ref("base.user_admin")).bom_create( + outsource_embryo, + 'subcontract', True) + # 创建坯料的bom的组件 + outsource_bom_line = outsource_bom.with_user( + self.env.ref("base.user_admin")).bom_create_line(outsource_embryo) + if not outsource_bom_line: + raise UserError('该订单模型的材料型号暂未有原材料,请先配置再进行分配') + # 产品配置bom + product_bom_outsource = self.env['mrp.bom'].with_user( + self.env.ref("base.user_admin")).bom_create(product, bom_type, True) + product_bom_outsource.with_user(self.env.ref("base.user_admin")).bom_create_line_has( + outsource_embryo) + elif line.product_id.materials_type_id.gain_way == '采购': + purchase_id = self.env.ref('sf_dlm.product_embryo_sf_purchase').sudo() + purchase_embryo = self.env['product.template'].sudo().no_bom_product_create(purchase_id, + item, + order_id, + 'purchase', i, + product) + if purchase_embryo == -3: + raise UserError('该订单模型的材料型号暂未设置获取方式和供应商,请先配置再进行分配') + else: + # 产品配置bom + product_bom_purchase = self.env['mrp.bom'].with_user( + self.env.ref("base.user_admin")).bom_create(product, bom_type, True) + product_bom_purchase.with_user(self.env.ref("base.user_admin")).bom_create_line_has( + purchase_embryo) + return super(SaleOrder, self).action_confirm() + +class SaleOrderLine(models.Model): + _inherit = 'sale.order.line' + + # 供货方式 + supply_method = fields.Selection([ + ('automation', "自动化产线加工"), + ('manual', "人工线下加工"), + ('purchase', "外购"), + ('outsourcing', "委外加工"), + ], string='供货方式') diff --git a/jikimo_sale_multiple_supply_methods/security/ir.model.access.csv b/jikimo_sale_multiple_supply_methods/security/ir.model.access.csv new file mode 100644 index 00000000..3b276af9 --- /dev/null +++ b/jikimo_sale_multiple_supply_methods/security/ir.model.access.csv @@ -0,0 +1,8 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_sale_order_group_production_engineer,sale.order_group_production_engineer,sale.model_sale_order,sf_base.group_production_engineer,1,1,0,0 +access_sale_order_line_group_production_engineer,sale_order_line_group_production_engineer,sale.model_sale_order_line,sf_base.group_production_engineer,1,1,0,0 +access_product_product_group_production_engineer,product_product_group_production_engineer,product.model_product_product,sf_base.group_production_engineer,1,0,0,0 +access_product_template_group_production_engineer,product_template_group_production_engineer,product.model_product_template,sf_base.group_production_engineer,1,0,0,0 +access_stock_picking_group_production_engineer,stock_picking_group_production_engineer,stock.model_stock_picking,sf_base.group_production_engineer,1,0,0,0 +access_stock_move_group_production_engineer,stock_move_group_production_engineer,stock.model_stock_move,sf_base.group_production_engineer,1,0,0,0 +access_mrp_bom_group_production_engineer,mrp_bom_group_production_engineer,mrp.model_mrp_bom,sf_base.group_production_engineer,1,0,0,0 \ No newline at end of file diff --git a/jikimo_sale_multiple_supply_methods/views/product_product_views.xml b/jikimo_sale_multiple_supply_methods/views/product_product_views.xml new file mode 100644 index 00000000..e3f896b5 --- /dev/null +++ b/jikimo_sale_multiple_supply_methods/views/product_product_views.xml @@ -0,0 +1,15 @@ + + + + view.product.template.form.inherit.sf + product.template + + + + + + + + + + \ No newline at end of file diff --git a/jikimo_sale_multiple_supply_methods/views/sale_order_views.xml b/jikimo_sale_multiple_supply_methods/views/sale_order_views.xml new file mode 100644 index 00000000..3021f301 --- /dev/null +++ b/jikimo_sale_multiple_supply_methods/views/sale_order_views.xml @@ -0,0 +1,104 @@ + + + + view.sale.order.form.inherit.sf + + sale.order + + + + + + + + + + view.sale.order.form.inherit.supply.method + + sale.order + + + {'invisible': [('state', '!=', 'draft')]} + confirm_to_supply_method + + +