Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化刀具基本参数同步

# Conflicts:
#	sf_dlm_management/views/product_template_management_view.xml

sf_manufacturing/models/mrp_production.py

@@ -1,6 +1,11 @@
 # -*- coding: utf-8 -*-
+import base64
+import logging
 import re
+import requests
 from odoo import api, fields, models, _
+from odoo.exceptions import UserError
+from odoo.addons.sf_base.commons.common import Common
 
 
 class MrpProduction(models.Model):
@@ -17,6 +22,10 @@ class MrpProduction(models.Model):
 
     check_status = fields.Boolean(string='启用状态', default=False, readonly=True)
     active = fields.Boolean(string='已归档', default=True)
+    programming_no = fields.Char('编程单号')
+    work_state = fields.Char('业务状态')
+    programming_state = fields.Char('编程状态')
+    glb_file = fields.Binary("glb模型文件")
 
     def action_check(self):
         """
@@ -47,6 +56,48 @@ class MrpProduction(models.Model):
         for production in self:
             production.maintenance_count = len(production.request_ids)
 
+    # cnc程序获取
+    def fetchCNC(self):
+        cnc = self.env['mrp.production'].search([('id', '=', self.id)])
+        try:
+            res = {'model_code': '' if not cnc.product_id.model_code else cnc.product_id.model_code,
+                   'production_no': cnc.name,
+                   'machine_tool_code': "",
+                   'material_code': self.env['sf.production.materials'].search(
+                       [('id', '=', cnc.product_id.materials_id.id)]).materials_no,
+                   'material_type_code': self.env['sf.materials.model'].search(
+                       [('id', '=', cnc.product_id.materials_type_id.id)]).materials_no,
+                   'machining_processing_panel': cnc.product_id.model_processing_panel,
+                   'machining_precision': cnc.product_id.model_machining_precision,
+                   'embryo_long': cnc.product_id.bom_ids.bom_line_ids.product_id.length,
+                   'embryo_height': cnc.product_id.bom_ids.bom_line_ids.product_id.height,
+                   'embryo_width': cnc.product_id.bom_ids.bom_line_ids.product_id.width,
+                   'order_no': cnc.origin,
+                   'model_order_no': cnc.product_id.default_code.rsplit('  -', 1)[0],
+                   'user': cnc.env.user.name,
+                   'model_file': '' if not cnc.product_id.model_file else base64.b64encode(
+                       cnc.product_id.model_file).decode('utf-8')
+                   }
+            logging.info('res:%s' % res)
+            configsettings = self.env['res.config.settings'].get_values()
+            config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
+            url = '/api/intelligent_programming/create'
+            config_url = configsettings['sf_url'] + url
+            res['token'] = configsettings['token']
+            # res_str = json.dumps(res)
+            ret = requests.post(config_url, json={}, data=res, headers=config_header)
+            ret = ret.json()
+            logging.info('fetchCNC-ret:%s' % ret)
+            if ret['status'] == 1:
+                self.write(
+                    {'programming_no': ret['programming_no'], 'programming_state': '编程中', 'work_state': '编程中'})
+            else:
+                raise UserError(ret['message'])
+        except Exception as e:
+            logging.info('fetchCNC error:%s' % e)
+            raise UserError("cnc程序获取编程单失败,请联系管理员")
+
+
     # 维修模块按钮
     def button_maintenance_req(self):
         self.ensure_one()
@@ -134,6 +185,7 @@ class MrpProduction(models.Model):
                         'state': 'pending',
                     }]
             if production.product_id.categ_id.type == '成品':
+                production.fetchCNC()
                 # 根据加工面板的面数及对应的工序模板生成工单
                 i = 0
                 processing_panel_len = len(production.product_id.model_processing_panel.split(','))
@@ -366,7 +418,8 @@ class MrpProduction(models.Model):
                 current_sequence += 1
                 if work.name == '获取CNC加工程序':
                     work.button_start()
-                    work.fetchCNC()
+                    #work.fetchCNC()
+                    work.button_finish()
 
     # 创建工单并进行排序
     def _create_workorder(self):

sf_manufacturing/models/mrp_workcenter.py

@@ -22,7 +22,7 @@ class ResWorkcenter(models.Model):
 
 
     equipment_status = fields.Selection(
-        [("正常", "正常"), ("故障", "故障"), ("不可用", "不可用")],
+        [("正常", "正常"), ("故障停机", "故障停机"), ("计划维保", "计划维保"),("空闲", "空闲"),("封存(报废)", "封存(报废)")],
         string="设备状态", related='equipment_id.state')
 
     # @api.depends('equipment_id')

sf_manufacturing/models/mrp_workorder.py

@@ -137,7 +137,10 @@ class ResMrpWorkOrder(models.Model):
         """
         检测is_ok(是否合格)被修改的话，就将当前用户赋值给inspection_user_id
         """
-        self.inspection_user_id = self.env.user.id
+        if not self.inspection_user_id:
+            self.inspection_user_id = self.env.user.id
+        else:
+            self.inspection_user_id = False
 
     @api.onchange('functional_fixture_id')
     def _onchange_functional_fixture_id(self):
@@ -447,7 +450,7 @@ class ResMrpWorkOrder(models.Model):
                    'embryo_height': cnc.product_id.bom_ids.bom_line_ids.product_id.height,
                    'embryo_width': cnc.product_id.bom_ids.bom_line_ids.product_id.width,
                    'order_no': cnc.production_id.origin,
-                   'model_order_no': cnc.product_id.default_code.rsplit('-', 1)[0],
+                   'model_order_no': cnc.product_id.default_code.rsplit('  -', 1)[0],
                    'user': self.env.user.name,
                    'model_file': '' if not cnc.product_id.model_file else base64.b64encode(
                        cnc.product_id.model_file).decode('utf-8')
@@ -571,6 +574,18 @@ class ResMrpWorkOrder(models.Model):
                     'order_line': order_line_ids,
                 })
         super().button_finish()
+        is_production_id = True
+        for workorder in self.production_id.workorder_ids:
+            if workorder.state != 'done':
+                is_production_id = False
+        if is_production_id == True and self.name == '解除装夹':
+            for move_raw_id in self.production_id.move_raw_ids:
+                move_raw_id.quantity_done = move_raw_id.product_uom_qty
+                self.production_id.state = 'done'
+
+
+
+
 
 
 class CNCprocessing(models.Model):
@@ -592,6 +607,7 @@ class CNCprocessing(models.Model):
     estimated_processing_time = fields.Char('预计加工时间')
     remark = fields.Text('备注')
     workorder_id = fields.Many2one('mrp.workorder', string="工单")
+    workorder_id = fields.Many2one('mrp.production', string="制造定单")
     button_state = fields.Boolean(string='是否已经下发')
 
     # mrs下发编程单创建CNC加工
@@ -617,11 +633,11 @@ class CNCprocessing(models.Model):
                 'remark': obj['remark']
             })
             self.get_cnc_processing_file(ret['folder_name'], cnc_processing, workorder.processing_panel)
-        cnc_workorder.state = 'done'
+        # cnc_workorder.state = 'done'
         cnc_workorder.work_state = '已编程'
         cnc_workorder.programming_state = '已编程'
-        cnc_workorder.time_ids.date_end = datetime.now()
-        cnc_workorder.button_finish()
+        # cnc_workorder.time_ids.date_end = datetime.now()
+        # cnc_workorder.button_finish()
 
     # 根据程序名和加工面匹配到ftp里对应的Nc程序名
     def get_cnc_processing_file(self, folder_name, cnc_processing, processing_panel):

sf_manufacturing/models/product_template.py

@@ -486,28 +486,6 @@ class ResProductMo(models.Model):
         string='适用刀柄型号'
     )
 
-    # 夹具参数
-    fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料")
-    fixture_model_id = fields.Many2one('sf.fixture.model', string="夹具型号")
-    fixture_material_type = fields.Char(string="夹具物料类型", related='fixture_material_id.name')
-    fixture_multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型")
-    fixture_clamping_way = fields.Char(string="装夹方式")
-    fixture_port_type = fields.Char(string="接口类型")
-    fixture_model_file = fields.Binary(string="3D模型图")
-
-    fixture_clamp_workpiece_length_max = fields.Integer(string="夹持工件长度max(mm)")
-    fixture_clamp_workpiece_width_max = fields.Integer(string="夹持工件宽度max(mm)")
-    fixture_clamp_workpiece_height_max = fields.Integer(string="夹持工件高度max(mm)")
-    fixture_clamp_workpiece_diameter_max = fields.Float(string="夹持工件直径max(mm)", digits=(16, 6))
-
-    fixture_maximum_carrying_weight = fields.Float(string="最大承载重量(kg)", digits=(16, 4))
-    fixture_maximum_clamping_force = fields.Integer(string="最大夹持力(n)")
-    fixture_driving_way = fields.Char(string="驱动方式")
-    fixture_apply_machine_tool_type_ids = fields.Many2many('sf.machine_tool.type', 'rel_product_machine_tool_type',
-                                                           string="适用机床型号")
-    fixture_through_hole_size = fields.Integer(string="过孔大小(mm)")
-    fixture_screw_size = fields.Integer(string="螺牙大小(mm)")
-
     # 注册状态
     register_state = fields.Selection([('未注册', '未注册'), ('已注册', '已注册'), ('注册失败', '注册失败')],
                                       string='注册状态', default='未注册')
@@ -826,6 +804,124 @@ class ResProductMo(models.Model):
         return base64_data
 
 
+class ResProductFixture(models.Model):
+    _inherit = 'product.template'
+    _description = '夹具产品信息'
+
+    fixture_model_id = fields.Many2one('sf.fixture.model', '夹具型号')
+    specification_fixture_id = fields.Many2one('sf.fixture.materials.basic.parameters', '夹具规格')
+
+    fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料", required=True)
+    fixture_material_type = fields.Char(string="夹具物料类型", related='fixture_material_id.name')
+    multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型", required=True)
+    model_file = fields.Binary(string="3D模型图")
+
+    # 夹具物料基本参数
+    # length = fields.Float('长度(mm)', digits=(16, 2))
+    # width = fields.Float('宽度(mm)', digits=(16, 2))
+    # height = fields.Float('高度(mm)', digits=(16, 2))
+    diameter = fields.Float('直径(mm)', digits=(16, 2))
+
+    # '零点卡盘' 字段
+    weight = fields.Float('重量(mm)', digits=(16, 2))
+    orientation_dish_diameter = fields.Float('定位盘直径(mm)', digits=(16, 2))
+    clamping_diameter = fields.Float('装夹直径(mm)', digits=(16, 2))
+    clamping_num = fields.Selection([('1', '1'), ('2', '2'), ('4', '4'), ('6', '6'), ('8', '8')], string='装夹单元数')
+    chucking_power_max = fields.Float('最大夹持力(KN)', digits=(16, 2))
+    repeated_positioning_accuracy = fields.Char('重复定位精度(mm)', size=20)
+    boolean_transposing_hole = fields.Boolean('是否有转位孔')
+    unlocking_method = fields.Selection(
+        [('手动', '手动'), ('气动', '气动'), ('液压', '液压'), ('电动', '电动'), ('其他', '其他')], string='解锁方式')
+    boolean_chip_blowing_function = fields.Boolean('是否有吹屑功能')
+    carrying_capacity_max = fields.Float('最大承载重量(kg)', digits=(16, 2))
+    rigidity = fields.Integer('硬度HRC')
+    materials_model_id = fields.Many2one('sf.materials.model', '夹具材质')
+    machine_tool_type_id = fields.Many2one('sf.machine_tool.type', '适用机床型号')
+
+    # ’零点托盘‘ 字段
+    connector_diameter = fields.Selection([('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('8', '8')],
+                                          string='连接头直径(mm)')
+    way_to_install = fields.Selection(
+        [('接口式', '接口式'), ('螺栓固定', '螺栓固定'), ('磁吸式', '磁吸式'), ('其他', '其他')], string='安装方式')
+    type_of_drive = fields.Selection(
+        [('气动式', '气动式'), ('液压式', '液压式'), ('机械式', '机械式'), ('电动式', '电动式'), ('其他', '其他')],
+        string='驱动方式')
+
+    # ’气动夹具‘ 字段
+    gripper_length_min = fields.Float('夹持工件最小长度(mm)', digits=(16, 2))
+    gripper_width_min = fields.Float('夹持工件最小宽度(mm)', digits=(16, 2))
+    gripper_height_min = fields.Float('夹持工件最小高度(mm)', digits=(16, 2))
+    gripper_diameter_min = fields.Float('夹持工件最小直径(mm)', digits=(16, 2))
+    gripper_length_max = fields.Float('夹持工件最大长度(mm)', digits=(16, 2))
+    gripper_width_max = fields.Float('夹持工件最大宽度(mm)', digits=(16, 2))
+    gripper_height_max = fields.Float('夹持工件最大高度(mm)', digits=(16, 2))
+    gripper_diameter_max = fields.Float('夹持工件最大直径(mm)', digits=(16, 2))
+    rated_air_pressure = fields.Float('额定气压(Mpa)', digits=(16, 2))
+    interface_materials_model_id = fields.Many2one('sf.materials.model', '接口类型')
+
+    # ‘虎钳夹具' 字段
+    transverse_groove = fields.Float('横向配合槽n(mm)', digits=(16, 2))
+    longitudinal_fitting_groove = fields.Float('纵向配合槽l(mm)', digits=(16, 2))
+
+    # '磁吸夹具' 字段
+    height_tolerance_value = fields.Char('高度公差(mm)')
+    rated_adsorption_force = fields.Float('额定吸附力(N/cm²)', digits=(16, 2))
+    magnetic_field_height = fields.Float('磁场高度(mm)', digits=(16, 2))
+    magnetic_pole_plate_grinding_allowance = fields.Float('磁极板磨削余量(mm)', digits=(16, 2))
+
+    # '转接板(锁板)夹具' 字段
+    screw_size = fields.Float('螺牙大小(mm)', digits=(16, 2))
+    via_hole_diameter = fields.Float('过孔直径(mm)', digits=(16, 2))
+
+    # '三爪卡盘' 字段
+    mounting_hole_depth = fields.Float('安装孔深度(mm)', digits=(16, 2))
+    centering_diameter = fields.Float('定心直径(mm)', digits=(16, 2))
+
+    @api.onchange('specification_fixture_id')
+    def _onchange_specification_fixture_id(self):
+        if self.specification_fixture_id:
+            self.length = self.specification_fixture_id.length
+            self.width = self.specification_fixture_id.width
+            self.height = self.specification_fixture_id.height
+            self.weight = self.specification_fixture_id.weight
+            self.diameter = self.specification_fixture_id.diameter
+            self.orientation_dish_diameter = self.specification_fixture_id.orientation_dish_diameter
+            self.clamping_diameter = self.specification_fixture_id.clamping_diameter
+            self.clamping_num = self.specification_fixture_id.clamping_num
+            self.chucking_power_max = self.specification_fixture_id.chucking_power_max
+            self.repeated_positioning_accuracy = self.specification_fixture_id.repeated_positioning_accuracy
+            self.boolean_transposing_hole = self.specification_fixture_id.boolean_transposing_hole
+            self.unlocking_method = self.specification_fixture_id.unlocking_method
+            self.boolean_chip_blowing_function = self.specification_fixture_id.boolean_chip_blowing_function
+            self.carrying_capacity_max = self.specification_fixture_id.carrying_capacity_max
+            self.rigidity = self.specification_fixture_id.rigidity
+            self.materials_model_id = self.specification_fixture_id.materials_model_id
+            self.machine_tool_type_id = self.specification_fixture_id.machine_tool_type_id
+            self.connector_diameter = self.specification_fixture_id.connector_diameter
+            self.way_to_install = self.specification_fixture_id.way_to_install
+            self.type_of_drive = self.specification_fixture_id.type_of_drive
+            self.gripper_length_min = self.specification_fixture_id.gripper_length_min
+            self.gripper_width_min = self.specification_fixture_id.gripper_width_min
+            self.gripper_height_min = self.specification_fixture_id.gripper_height_min
+            self.gripper_diameter_min = self.specification_fixture_id.gripper_diameter_min
+            self.gripper_length_max = self.specification_fixture_id.gripper_length_max
+            self.gripper_width_max = self.specification_fixture_id.gripper_width_max
+            self.gripper_height_max = self.specification_fixture_id.gripper_height_max
+            self.gripper_diameter_max = self.specification_fixture_id.gripper_diameter_max
+            self.rated_air_pressure = self.specification_fixture_id.rated_air_pressure
+            self.interface_materials_model_id = self.specification_fixture_id.interface_materials_model_id
+            self.transverse_groove = self.specification_fixture_id.transverse_groove
+            self.longitudinal_fitting_groove = self.specification_fixture_id.longitudinal_fitting_groove
+            self.height_tolerance_value = self.specification_fixture_id.height_tolerance_value
+            self.rated_adsorption_force = self.specification_fixture_id.rated_adsorption_force
+            self.magnetic_field_height = self.specification_fixture_id.magnetic_field_height
+            self.magnetic_pole_plate_grinding_allowance = self.specification_fixture_id.magnetic_pole_plate_grinding_allowance
+            self.screw_size = self.specification_fixture_id.screw_size
+            self.via_hole_diameter = self.specification_fixture_id.via_hole_diameter
+            self.mounting_hole_depth = self.specification_fixture_id.mounting_hole_depth
+            self.centering_diameter = self.specification_fixture_id.centering_diameter
+
+
 class SfMaintenanceEquipmentAndProductTemplate(models.Model):
     _inherit = 'maintenance.equipment'
     _description = '设备'

sf_manufacturing/models/stock.py

@@ -202,8 +202,7 @@ class StockRule(models.Model):
                 sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)])
                 if sale_order:
                     sale_order.write({'schedule_status': 'to schedule'})
-                    self.env['sf.production.plan'].sudo().with_company(company_id). \
-                        create({
+                    self.env['sf.production.plan'].sudo().with_company(company_id).create({
                         'name': production.name,
                         'order_deadline': sale_order.deadline_of_delivery,
                         'production_id': production.id,