From 3253b26818b6dcae289081873c1336b94e14bdc1 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Fri, 13 Dec 2024 13:38:22 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1=E3=80=81=E6=8A=A5=E4=BB=B7=E3=80=81?= =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E6=B7=BB=E5=8A=A0=E5=B9=B3=E5=8F=B0=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5=E3=80=822=E3=80=81=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E7=9A=84=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E9=93=BE=E6=8E=A5=E6=8C=89=E9=87=87=E8=B4=AD=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=8B=86=E5=88=86=E4=B8=BA=E5=A7=94=E5=A4=96=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E5=92=8C=E9=87=87=E8=B4=AD=E7=9A=84=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/controllers/main.py | 2 +- sf_sale/models/sale_order.py | 69 +++++++++++++++++++++++++++- sf_sale/views/sale_order_view.xml | 25 ++++++++-- 3 files changed, 89 insertions(+), 7 deletions(-) diff --git a/sf_manufacturing/controllers/main.py b/sf_manufacturing/controllers/main.py index e45265d3..839b87fe 100644 --- a/sf_manufacturing/controllers/main.py +++ b/sf_manufacturing/controllers/main.py @@ -27,7 +27,7 @@ class JikimoSaleRoutePicking(Sf_Bf_Connect): 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') + kw['delivery_end_date'], kw['payments_way'], kw['pay_way'], kw['order_number'], state='draft') i = 1 # 给sale_order的default_code字段赋值 # aa = request.env['sale.order'].sudo().search([('name', '=', order_id.name)]) diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py index ca851fc6..c9cf8af8 100644 --- a/sf_sale/models/sale_order.py +++ b/sf_sale/models/sale_order.py @@ -58,9 +58,11 @@ class ReSaleOrder(models.Model): delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效', tracking=True) + order_code = fields.Char('平台订单号', readonly=True) + # 业务平台分配工厂后在智能工厂先创建销售订单 def sale_order_create(self, company_id, delivery_name, delivery_telephone, delivery_address, - deadline_of_delivery, payments_way, pay_way, state='sale'): + deadline_of_delivery, payments_way, pay_way, order_number, state='sale'): now_time = datetime.datetime.now() partner = self.get_customer() data = { @@ -76,6 +78,7 @@ class ReSaleOrder(models.Model): 'address_of_delivery': delivery_address, 'payments_way': payments_way, 'pay_way': pay_way, + 'order_code': order_number, } if deadline_of_delivery: # deadline_of_delivery字段存在为false字符串情况 @@ -158,6 +161,68 @@ class ReSaleOrder(models.Model): if not line.tax_id: raise UserError('请对【订单行】中的【税】进行选择') + consignment_purchase_order_count = fields.Integer( + "Number of consignment Purchase Order Generated", + compute='_compute_purchase_order_count') + + @api.depends('order_line.purchase_line_ids.order_id') + def _compute_purchase_order_count(self): + for order in self: + order.purchase_order_count = len(order._get_purchase_orders().filtered( + lambda po: po.purchase_type not in ['consignment'])) + order.consignment_purchase_order_count = len(order._get_purchase_orders().filtered( + lambda po: po.purchase_type in ['consignment'])) + + def action_view_purchase_orders(self): + """ + 采购 + """ + self.ensure_one() + purchase_order_ids = self._get_purchase_orders().filtered( + lambda po: po.purchase_type not in ['consignment']).ids + action = { + 'res_model': 'purchase.order', + 'type': 'ir.actions.act_window', + } + if len(purchase_order_ids) == 1: + action.update({ + 'view_mode': 'form', + 'res_id': purchase_order_ids[0], + }) + else: + action.update({ + 'name': _("从 %s生成采购订单", self.name), + 'domain': [('id', 'in', purchase_order_ids)], + 'view_mode': 'tree,form', + }) + return action + + def action_view_consignment_purchase_orders(self): + """ + 委外加工 + """ + self.ensure_one() + consignment_purchase_order_ids = self._get_purchase_orders().filtered( + lambda po: po.purchase_type in ['consignment']).ids + action = { + 'res_model': 'purchase.order', + 'type': 'ir.actions.act_window', + } + if len(consignment_purchase_order_ids) == 1: + action.update({ + 'view_mode': 'form', + 'res_id': consignment_purchase_order_ids[0], + }) + else: + action.update({ + 'name': _("从 %s生成委外加工订单", self.name), + 'domain': [('id', 'in', consignment_purchase_order_ids)], + 'view_mode': 'tree,form', + }) + return action + + + class ResaleOrderLine(models.Model): _inherit = 'sale.order.line' @@ -255,7 +320,7 @@ class RePurchaseOrder(models.Model): else: server_template = self.env['product.template'].search( [('server_product_process_parameters_id', '=', pp.surface_technics_parameters_id.id), - ('detailed_type', '=', 'service')]) + ('detailed_type', '=', 'service')]) server_product_process.append((0, 0, { 'product_id': server_template.product_variant_id.id, 'product_qty': 1, diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml index 673d7fa3..641e4278 100644 --- a/sf_sale/views/sale_order_view.xml +++ b/sf_sale/views/sale_order_view.xml @@ -170,19 +170,34 @@ - 下单时间 + 下单日期 + + sale.order.inherited.form.purchase + sale.order + + + + + + + + sale.management.order.form.quote.inherit.sf sale.order - - 下单日期 - @@ -224,6 +239,7 @@ hide + + + + @@ -174,6 +181,19 @@ sf_base.group_purchase,sf_base.group_purchase_director + + 采购员 + + + hide + + + 报价截止日期 + '' + + + + @@ -201,6 +221,20 @@ date_approve asc + + hide + + + + + 采购员 + + + + + + + @@ -212,8 +246,29 @@ + + + + + + + + + purchase.order.list.select.sf + purchase.order + + + + + + + + + + + {"search_default_categ_id":1,"search_default_filter_to_purchase":1, "purchase_product_template": 1} From 202fafac841e7e1e8c0c4fe3e10c71f89a1839fa Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Mon, 16 Dec 2024 17:22:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96=E3=80=81=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=96=B0=E5=A2=9E=E3=80=90=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E5=A4=96=E5=8D=8F=E3=80=91=E3=80=81=E3=80=90=E5=A4=96=E8=B4=AD?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E3=80=91=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_sale/__manifest__.py | 1 + sf_sale/models/sale_order.py | 10 ++++++---- sf_sale/static/src/css/purchase_list.css | 3 +++ sf_sale/views/purchase_order_view.xml | 3 +++ sf_sale/views/sale_order_view.xml | 7 +++++++ 5 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 sf_sale/static/src/css/purchase_list.css diff --git a/sf_sale/__manifest__.py b/sf_sale/__manifest__.py index 45c95030..0ca6457c 100644 --- a/sf_sale/__manifest__.py +++ b/sf_sale/__manifest__.py @@ -26,6 +26,7 @@ 'assets': { 'web.assets_backend': [ 'sf_sale/static/js/setTableWidth.js', + 'sf_sale/static/src/css/purchase_list.css', ] }, 'demo': [ diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py index 11fa0096..a0e321a0 100644 --- a/sf_sale/models/sale_order.py +++ b/sf_sale/models/sale_order.py @@ -55,8 +55,9 @@ class ReSaleOrder(models.Model): store=True, readonly=False, copy=False, precompute=True, states=READONLY_FIELD_STATES, default=fields.Datetime.now) - delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效', - tracking=True) + delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], + default='normal', + string='时效', tracking=True) order_code = fields.Char('平台订单号', readonly=True) @@ -278,8 +279,9 @@ class RePurchaseOrder(models.Model): compute='_compute_user_id', store=True) - purchase_type = fields.Selection([('standard', '标准采购'), ('consignment', '委外加工')], string='采购类型', - default='standard') + purchase_type = fields.Selection( + [('standard', '标准采购'), ('consignment', '委外加工'), ('outsourcing', '工序外协'), ('outside', '外购订单')], + string='采购类型', default='standard') origin_sale_id = fields.Many2one('sale.order', string='销售订单号', compute='_compute_origin_sale_id') diff --git a/sf_sale/static/src/css/purchase_list.css b/sf_sale/static/src/css/purchase_list.css new file mode 100644 index 00000000..2deacb9c --- /dev/null +++ b/sf_sale/static/src/css/purchase_list.css @@ -0,0 +1,3 @@ +.purchase_order_list_name { + min-width: 62px !important; +} \ No newline at end of file diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml index 28890cbd..f70dbb6d 100644 --- a/sf_sale/views/purchase_order_view.xml +++ b/sf_sale/views/purchase_order_view.xml @@ -235,6 +235,9 @@ + + purchase_order_list_name + diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml index 641e4278..4373689d 100644 --- a/sf_sale/views/sale_order_view.xml +++ b/sf_sale/views/sale_order_view.xml @@ -261,6 +261,10 @@ + + + + @@ -293,6 +297,9 @@ + + + From 15eb36a5bc7b9107e551b4a0754552537a251329 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Wed, 18 Dec 2024 16:39:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5=E3=80=81?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=EF=BC=9B2=E3=80=81=E4=BC=98=E5=8C=96=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5?= =?UTF-8?q?=E3=80=81=E8=AF=A6=E6=83=85=E9=A1=B5=E5=AD=97=E6=AE=B5=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_sale/models/sale_order.py | 7 +++++++ sf_sale/views/purchase_order_view.xml | 12 ++++++++++++ sf_sale/views/sale_order_view.xml | 6 +++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py index a0e321a0..2e99de70 100644 --- a/sf_sale/models/sale_order.py +++ b/sf_sale/models/sale_order.py @@ -263,6 +263,7 @@ class ProductTemplate(models.Model): _inherit = 'product.template' manual_quotation = fields.Boolean('人工编程', default=False) + part_name = fields.Char(string='零件名称', readonly=True) class RePurchaseOrder(models.Model): @@ -378,6 +379,12 @@ class RePurchaseOrder(models.Model): return result +class PurchaseOrderLine(models.Model): + _inherit = 'purchase.order.line' + + part_name = fields.Char('零件名称', related='product_id.part_name', readonly=True) + + class ResPartnerToSale(models.Model): _inherit = 'res.partner' diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml index f70dbb6d..ccdee1d0 100644 --- a/sf_sale/views/purchase_order_view.xml +++ b/sf_sale/views/purchase_order_view.xml @@ -130,6 +130,12 @@ {'no_create': True} + + hide + + + + 报价截止日期 @@ -191,9 +197,15 @@ 报价截止日期 '' + + + + + purchase_order_list_name + diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml index 4373689d..d6247823 100644 --- a/sf_sale/views/sale_order_view.xml +++ b/sf_sale/views/sale_order_view.xml @@ -169,9 +169,10 @@ - + 下单日期 + @@ -287,6 +288,9 @@ + + 下单日期 + From 97facdaf9c4cf3632da47ed8a774467a99d91f3a Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Thu, 19 Dec 2024 13:45:10 +0800 Subject: [PATCH 5/5] =?UTF-8?q?1=E3=80=81=E9=94=80=E5=94=AE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E6=B7=BB=E5=8A=A0=E3=80=90=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E4=B8=AD=E3=80=91=E3=80=81=E3=80=90=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E4=B8=AD=E3=80=91=E3=80=81=E3=80=90=E5=B7=B2=E4=BA=A4=E4=BB=98?= =?UTF-8?q?=E3=80=91=E4=B8=89=E7=A7=8D=E7=8A=B6=E6=80=81=EF=BC=9B2?= =?UTF-8?q?=E3=80=81=E4=BC=98=E5=8C=96=20=E8=8E=B7=E5=8F=96mrs=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=E7=9A=84=E7=BC=96=E7=A8=8B=E5=8D=95=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=AF=B9=E8=BF=94=E5=B7=A5?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=BC=96=E7=A8=8B=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/sale_order.py | 3 +++ sf_manufacturing/views/sale_order_views.xml | 2 +- sf_mrs_connect/controllers/controllers.py | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sf_manufacturing/models/sale_order.py b/sf_manufacturing/models/sale_order.py index a56721a2..5d318141 100644 --- a/sf_manufacturing/models/sale_order.py +++ b/sf_manufacturing/models/sale_order.py @@ -13,6 +13,9 @@ class SaleOrder(models.Model): ('sent', "报价已发送"), ('supply method', "供货方式待确认"), ('sale', "销售订单"), + ('processing', "加工中"), + ('physical_distribution', "物流中"), + ('delivered', "已交付"), ('done', "已锁定"), ('cancel', "已取消"), ]) diff --git a/sf_manufacturing/views/sale_order_views.xml b/sf_manufacturing/views/sale_order_views.xml index 1e5c4587..49cc752f 100644 --- a/sf_manufacturing/views/sale_order_views.xml +++ b/sf_manufacturing/views/sale_order_views.xml @@ -13,7 +13,7 @@