From 5fa9d1e16e820c64c9abe8644804abb68417d5bf Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Thu, 14 Sep 2023 18:04:04 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E7=94=9F=E6=88=90=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E5=92=8C=E4=BA=A7=E5=93=81=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=9Abfm=E5=88=86=E9=85=8D=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E6=97=B6=E5=B0=86=E2=80=9C=E7=BB=93=E7=AE=97=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E2=80=9D=E5=92=8C=E2=80=9C=E6=94=AF=E4=BB=98=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E2=80=9D=E4=BC=A0=E5=88=B0=E8=AF=A5=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=86=85=E7=9A=84=E7=94=9F=E6=88=90=E6=8A=A5=E4=BB=B7=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=96=B9=E6=B3=95=E9=87=8C=202.=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=92=8C=E6=8A=A5=E4=BB=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8F=8A=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=9A=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E2=80=9C=E7=BB=93=E7=AE=97=E6=96=B9=E5=BC=8F=E2=80=9D?= =?UTF-8?q?=E5=92=8C=E2=80=9C=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E2=80=9D?= =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=AE=B5;=E9=94=80=E5=94=AE?= =?UTF-8?q?=E7=9A=84tree=E5=88=97=E8=A1=A8=E7=9A=84=E2=80=9C=E5=8F=B7?= =?UTF-8?q?=E7=A0=81=E2=80=9D=E6=98=BE=E7=A4=BA=E6=94=B9=E4=B8=BA=E2=80=9C?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E2=80=9D=EF=BC=9B=E6=8A=A5=E4=BB=B7?= =?UTF-8?q?=E7=9A=84tree=E5=88=97=E8=A1=A8=E7=9A=84=E2=80=9C=E5=8F=B7?= =?UTF-8?q?=E7=A0=81=E2=80=9D=E6=98=BE=E7=A4=BA=E6=94=B9=E4=B8=BA=E2=80=9C?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E2=80=9D=EF=BC=8C=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=94=B9=E4=B8=BA=E2=80=9C=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E2=80=9D=203.=E4=BC=98=E5=8C=96=E5=BF=AB?= =?UTF-8?q?=E9=80=9F=E8=AE=A2=E5=8D=95=EF=BC=9Atree=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E2=80=9C=E8=A1=A8=E9=9D=A2=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E2=80=9D=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E2=80=9C=E5=88=9B=E5=BB=BA=E4=BA=BA=E2=80=9D=E5=92=8C?= =?UTF-8?q?=E2=80=9C=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E2=80=9D2?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5=EF=BC=9B=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=96=B0=E5=A2=9E=E2=80=9C=E5=8A=A0=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=E9=95=BF=E2=80=9D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_bf_connect/controllers/controllers.py | 2 +- sf_dlm/__manifest__.py | 2 +- sf_dlm/views/product_template_view.xml | 11 ++--- sf_maintenance/models/sf_maintenance.py | 18 ++++---- sf_maintenance/views/maintenance_views.xml | 16 ++++---- sf_manufacturing/models/product_template.py | 22 ++++++---- sf_sale/__manifest__.py | 2 +- sf_sale/models/quick_easy_order.py | 2 + sf_sale/models/sale_order.py | 13 +++--- sf_sale/views/quick_easy_order_view.xml | 5 ++- sf_sale/views/sale_order_view.xml | 41 ++++++++++--------- .../static/src/js/3d_viewer.xml | 2 +- 12 files changed, 75 insertions(+), 61 deletions(-) diff --git a/sf_bf_connect/controllers/controllers.py b/sf_bf_connect/controllers/controllers.py index 4442567e..69fb8f30 100644 --- a/sf_bf_connect/controllers/controllers.py +++ b/sf_bf_connect/controllers/controllers.py @@ -27,7 +27,7 @@ class Sf_Bf_Connect(http.Controller): 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['delivery_end_date'], kw['payments_way'], kw['pay_way']) i = 1 # 给sale_order的default_code字段赋值 aa = request.env['sale.order'].sudo().search([('name', '=', order_id.name)]) diff --git a/sf_dlm/__manifest__.py b/sf_dlm/__manifest__.py index 20211cde..ed717647 100644 --- a/sf_dlm/__manifest__.py +++ b/sf_dlm/__manifest__.py @@ -11,7 +11,7 @@ 'category': 'sf', 'website': 'https://www.sf.jikimo.com', 'depends': ['mrp', 'base', 'sale', 'sf_manufacturing', 'web_widget_model_viewer', 'mrp_subcontracting', 'purchase_stock', - 'uom'], + 'uom','jikimo_frontend'], 'data': [ 'data/product_data.xml', 'data/uom_data.xml', diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml index 19327a82..dd86fc86 100644 --- a/sf_dlm/views/product_template_view.xml +++ b/sf_dlm/views/product_template_view.xml @@ -336,23 +336,24 @@ - + + widget="custom_many2many_checkboxes"/> - + - + - + diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py index d66de31e..e71f1bf8 100644 --- a/sf_maintenance/models/sf_maintenance.py +++ b/sf_maintenance/models/sf_maintenance.py @@ -44,11 +44,9 @@ class SfMaintenanceEquipment(models.Model): overhaul_period = fields.Integer(string='预防检修频次') overhaul_duration = fields.Float(string='检修时长') - overhaul_id = fields.Many2one('equipment.maintenance.standards', string='设备检修标准', domain="[('maintenance_type','=','检修')]") - @api.onchange('eq_maintenance_id', 'overhaul_id') def _compute_equipment_maintenance_standards_ids(self): for record in self: @@ -145,7 +143,6 @@ class SfMaintenanceEquipment(models.Model): machine_tool_id = fields.Many2one('sf.machine_tool', '机床') sf_maintenance_logs_ids = fields.One2many('sf.maintenance.logs', 'maintenance_equipment_id', '设备故障日志') - def name_get(self): result = [] for parameter in self: @@ -156,7 +153,6 @@ class SfMaintenanceEquipment(models.Model): result.append((parameter.id, name)) return result - @api.constrains('rotate_speed') def _check_rotate_speed(self): if self.rotate_speed <= 0: @@ -478,14 +474,17 @@ class SfMaintenanceEquipment(models.Model): image_id = fields.Many2many('maintenance.equipment.image', 'equipment_id', string='设备图文') + class MaintenanceStandardImage(models.Model): _name = 'maintenance.equipment.image' - _description = '设备图文展示' - + _description = '能力特征库' active = fields.Boolean('有效', default=True) - name = fields.Char('加工能力') - image = fields.Binary(string='设备图文') + name = fields.Char('名称') + image = fields.Binary(string='图文') + type = fields.Selection( + [('加工能力', '加工能力'), ('刀尖特征', '刀尖特征'), ('柄部类型', '柄部类型'), ('走刀方向', '走刀方向'), ('冷却液', '冷却液')], + string='特征') equipment_id = fields.Many2many('maintenance.equipment', 'image_id', string='设备') @api.model @@ -518,6 +517,3 @@ class MaintenanceStandardImage(models.Model): new_res.append([id, name, data_uri]) # 返回新的结果列表 return new_res - - - diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml index 5c699af0..e2903d54 100644 --- a/sf_maintenance/views/maintenance_views.xml +++ b/sf_maintenance/views/maintenance_views.xml @@ -381,8 +381,9 @@ maintenance.equipment.image.tree maintenance.equipment.image - + + @@ -394,11 +395,12 @@ maintenance.equipment.image.form maintenance.equipment.image -
+ - - + + + @@ -408,14 +410,14 @@ - 设备图文图文 + 能力特征库 maintenance.equipment.image tree,form [] - - + + + @@ -74,6 +76,7 @@ options="{'format': false}"/> + diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml index 3255a58d..93545342 100644 --- a/sf_sale/views/sale_order_view.xml +++ b/sf_sale/views/sale_order_view.xml @@ -1,17 +1,6 @@ - - sale.order.tree - sale.order - - - - - - - - sale.order.form.inherit.sf @@ -20,6 +9,8 @@ + + sale.order + + 下单日期 + @@ -52,19 +46,28 @@ + + sale.order.quotation.tree.inherit.sf + sale.order + + + + 订单号 + + + 下单时间 + + + - + sale.order.tree sale.order - - primary + - + 订单号 - - - 下单时间 - + diff --git a/web_widget_model_viewer/static/src/js/3d_viewer.xml b/web_widget_model_viewer/static/src/js/3d_viewer.xml index 587c1ac4..73f142c9 100644 --- a/web_widget_model_viewer/static/src/js/3d_viewer.xml +++ b/web_widget_model_viewer/static/src/js/3d_viewer.xml @@ -25,7 +25,7 @@ -
当前制造订单暂无模型
+
暂无模型