From 5b1d347fd42e13916f98bf2bc0e056dd62bb886d Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Tue, 28 Nov 2023 17:23:49 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=9D=83=E9=99=90=E8=A7=92=E8=89=B2=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96coding=E4=BB=A3=E7=A0=81=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/base.py                       | 410 +++++++++----------
 sf_maintenance/security/group_security.xml   |  15 +-
 sf_maintenance/security/ir.model.access.csv  |  12 +-
 sf_manufacturing/security/group_security.xml |  17 -
 4 files changed, 225 insertions(+), 229 deletions(-)

diff --git a/sf_base/models/base.py b/sf_base/models/base.py
index 29e37630..f35b03e2 100644
--- a/sf_base/models/base.py
+++ b/sf_base/models/base.py
@@ -41,211 +41,211 @@ class MachineBrand(models.Model):
 
 
 # 机床
-class MachineTool(models.Model):
-    _name = 'sf.machine_tool'
-    _description = '机床'
-
-    def get_no(self):
-        partner = self.env['sf.machine_tool'].sudo().search(
-            [('MTcode', '!=', '')],
-            limit=1,
-            order="id desc")
-        if not partner:
-            num = "%04d" % 1
-
-        else:
-            m = int(partner.MTcode) + 1
-            num = "%04d" % m
-        return num
-
-    MTcode = fields.Char("编码", default=get_no)
-    code = fields.Char('行业编码')
-    name = fields.Char('名称')
-    knife_type = fields.Selection(
-        [("BT40", "BT40"), ("BT30", "BT30")],
-        default="", string="刀把类型")
-    number_of_knife_library = fields.Integer('刀库数量(把)')
-    rotate_speed = fields.Integer('转速')
-    number_of_axles = fields.Selection(
-        [("三轴", "三轴"), ("四轴", "四轴"), ("五轴", "五轴")],
-        default="", string="轴数")
-    # 加工进程
-    x_axis = fields.Integer('X轴')
-    y_axis = fields.Integer('Y轴')
-    z_axis = fields.Integer('Z轴')
-    b_axis = fields.Integer('B轴')
-    c_axis = fields.Integer('C轴')
-    remark = fields.Char('备注')
-    is_binding = fields.Boolean('是否绑定机床', default=False)
-    precision = fields.Float('加工精度')
-    control_system_id = fields.Many2one('sf.machine.control_system',
-                                        string="控制系统")
-    # 多个机床型号对应一个机床
-    type_id = fields.Many2one('sf.machine_tool.type', '型号')
-    brand_id = fields.Many2one('sf.machine.brand', string='品牌')
-    state = fields.Selection(
-        [("正常", "正常"), ("故障", "故障"), ("不可用", "不可用")],
-        default='正常', string="机床状态")
-    # 0606新增字段
-    machine_tool_picture = fields.Binary('图片')
-    heightened_way = fields.Selection([
-        ('sifudianji', '伺服电机驱动'),
-        ('youyagang', '油压缸驱动'),
-        ('chilunjia', '齿轮架驱动')
-    ], string="主轴加高方式", default='sifudianji')
-    workpiece_load = fields.Char('工件负载')
-    lead_screw = fields.Char('丝杆')
-    workbench_L = fields.Char('工作台长度(mm)')
-    workbench_W = fields.Char('工作台宽度(mm)')
-    guide_rail = fields.Char('导轨')
-    machine_tool_L = fields.Char('机床长度(mm)')
-    machine_tool_W = fields.Char('机床宽度(mm)')
-    machine_tool_H = fields.Char('机床高度(mm)')
-    feed_speed = fields.Char('进给速度(mm/min)')
-    tool_speed = fields.Char('刀具速度')
-    distance = fields.Char('主轴端面至工作台面距离(mm)')
-    taper = fields.Char('主轴锥度(°)')
-    torque = fields.Char('主轴点击扭矩(n/m)')
-    motor_power = fields.Char('主轴电机功率(kw)')
-    tool_quality_max = fields.Char('刀具最大质量')
-    tool_long_max = fields.Char('刀具最大长度')
-    tool_diameter_max = fields.Char('刀具最大刀径')
-    machine_tool_category = fields.Many2one('sf.machine_tool.category', string='机床类型')
-    # 一个机床对应一個加工工厂，一个加工工厂对应多个机床
-    factory_id = fields.Many2one('res.partner', string='所属工厂',
-                                 domain="[('is_factory', '=', True)]")
-    # 一个机床对应一个供应商，一个供应商对应多个机床
-    supplier_id = fields.Many2one('res.partner', string='制造商',
-                                  domain="[('is_vendor', '=', True)]")
-    registration_date = fields.Date('注册日期')
-    state_zc = fields.Selection([("已注册", "已注册"), ("未注册", "未注册")], string="注册状态", default='未注册')
-    active = fields.Boolean('有效', default=True)
-
-    @api.constrains('rotate_speed')
-    def _check_rotate_speed(self):
-        if self.rotate_speed <= 0:
-            raise ValidationError("转速不能为0")
-
-    @api.constrains('precision')
-    def _check_precision(self):
-        if self.precision <= 0.00:
-            raise ValidationError("加工精度不能为0")
-
-    @api.constrains('number_of_knife_library')
-    def _check_number_of_knife_library(self):
-        if self.number_of_knife_library <= 0:
-            raise ValidationError("刀库数量不能为0")
-
-    @api.constrains('x_axis')
-    def _check_x_axis(self):
-        if self.x_axis <= 0:
-            raise ValidationError("加工行程里x轴不能为0")
-
-    @api.constrains('y_axis')
-    def _check_y_axis(self):
-        if self.y_axis <= 0:
-            raise ValidationError("加工行程里y轴不能为0")
-
-    @api.constrains('z_axis')
-    def _check_z_axis(self):
-        if self.z_axis <= 0:
-            raise ValidationError("加工行程里z轴不能为0")
-
-    @api.constrains('b_axis')
-    def _check_b_axis(self):
-        if self.number_of_axles == '四轴':
-            print(self.number_of_axles)
-            if self.b_axis <= 0:
-                raise ValidationError("加工行程里b轴不能为0")
-
-    @api.constrains('c_axis')
-    def _check_c_axis(self):
-        if self.number_of_axles == '五轴':
-            if self.c_axis <= 0:
-                raise ValidationError("加工行程里c轴不能为0")
-
-    @api.onchange('type_id')
-    def get_type_info(self):
-        for item in self:
-            item.knife_type = item.type_id.knife_type
-            item.number_of_knife_library = item.type_id.number_of_knife_library
-            item.number_of_axles = item.type_id.number_of_axles
-            item.rotate_speed = item.type_id.rotate_speed
-            item.precision = item.type_id.precision
-            item.control_system_id = item.type_id.control_system_id
-            item.x_axis = item.type_id.x_axis
-            item.y_axis = item.type_id.y_axis
-            item.z_axis = item.type_id.z_axis
-            item.b_axis = item.type_id.b_axis
-            item.c_axis = item.type_id.c_axis
-            item.machine_tool_picture = item.type_id.machine_tool_picture
-            item.heightened_way = item.type_id.heightened_way
-            item.workpiece_load = item.type_id.workpiece_load
-            item.lead_screw = item.type_id.lead_screw
-            item.workbench_L = item.type_id.workbench_L
-            item.workbench_W = item.type_id.workbench_W
-            item.guide_rail = item.type_id.guide_rail
-            item.machine_tool_L = item.type_id.machine_tool_L
-            item.machine_tool_W = item.type_id.machine_tool_W
-            item.machine_tool_H = item.type_id.machine_tool_H
-            item.feed_speed = item.type_id.feed_speed
-            item.tool_speed = item.type_id.tool_speed
-            item.distance = item.type_id.distance
-            item.taper = item.type_id.taper
-            item.torque = item.type_id.torque
-            item.motor_power = item.type_id.motor_power
-            item.tool_quality_max = item.type_id.tool_quality_max
-            item.tool_long_max = item.type_id.tool_long_max
-            item.tool_diameter_max = item.type_id.tool_diameter_max
-            item.machine_tool_category = item.type_id.machine_tool_category.id
-
-    # 注册同步机床
-    def enroll_machine_tool(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strurl = sf_sync_config['sf_url'] + self.crea_url
-        objs_all = self.env['sf.machine_tool'].search([('MTcode', '=', self.MTcode)])
-        machine_tool_list = []
-        if objs_all:
-            for item in objs_all:
-                val = {
-                    'MTcode': item.MTcode,
-                    'factory_token': token,
-                    'id': item.id,
-                    'name': item.name,
-                    'code': item.code,
-                    'precision': item.precision,
-                    'knife_type': item.knife_type,
-                    'number_of_knife_library': item.number_of_knife_library,
-                    'rotate_speed': item.rotate_speed,
-                    'number_of_axles': item.number_of_axles,
-                    'control_system_id': self.env['sf.machine.control_system'].search(
-                        [('id', '=', item.control_system_id.id)]).code,
-                    'type_id': self.env['sf.machine_tool.type'].search([('id', '=', item.type_id.id)]).code,
-                    'brand_id': self.env['sf.machine.brand'].search([('id', '=', item.brand_id.id)]).code,
-                    'supplier_id': item.supplier_id.id,
-                    'x_axis': item.x_axis,
-                    'y_axis': item.y_axis,
-                    'z_axis': item.z_axis,
-                    'b_axis': item.b_axis,
-                    'c_axis': item.c_axis,
-                    'state': item.state,
-                    'active': item.active,
-
-                }
-                machine_tool_list.append(val)
-            # kw = machine_tool_list
-            kw = json.dumps(machine_tool_list, ensure_ascii=False)
-            r = requests.post(strurl, json={}, data={'kw': kw, 'token': token}, headers=headers)
-            ret = r.json()
-            self.code = ret['message']
-            self.state_zc = "已注册"
-            if r == 200:
-                return "机床注册成功"
-        else:
-            raise ValidationError("没有注册机床信息")
+# class MachineTool(models.Model):
+#     _name = 'sf.machine_tool'
+#     _description = '机床'
+#
+#     def get_no(self):
+#         partner = self.env['sf.machine_tool'].sudo().search(
+#             [('MTcode', '!=', '')],
+#             limit=1,
+#             order="id desc")
+#         if not partner:
+#             num = "%04d" % 1
+#
+#         else:
+#             m = int(partner.MTcode) + 1
+#             num = "%04d" % m
+#         return num
+#
+#     MTcode = fields.Char("编码", default=get_no)
+#     code = fields.Char('行业编码')
+#     name = fields.Char('名称')
+#     knife_type = fields.Selection(
+#         [("BT40", "BT40"), ("BT30", "BT30")],
+#         default="", string="刀把类型")
+#     number_of_knife_library = fields.Integer('刀库数量(把)')
+#     rotate_speed = fields.Integer('转速')
+#     number_of_axles = fields.Selection(
+#         [("三轴", "三轴"), ("四轴", "四轴"), ("五轴", "五轴")],
+#         default="", string="轴数")
+#     # 加工进程
+#     x_axis = fields.Integer('X轴')
+#     y_axis = fields.Integer('Y轴')
+#     z_axis = fields.Integer('Z轴')
+#     b_axis = fields.Integer('B轴')
+#     c_axis = fields.Integer('C轴')
+#     remark = fields.Char('备注')
+#     is_binding = fields.Boolean('是否绑定机床', default=False)
+#     precision = fields.Float('加工精度')
+#     control_system_id = fields.Many2one('sf.machine.control_system',
+#                                         string="控制系统")
+#     # 多个机床型号对应一个机床
+#     type_id = fields.Many2one('sf.machine_tool.type', '型号')
+#     brand_id = fields.Many2one('sf.machine.brand', string='品牌')
+#     state = fields.Selection(
+#         [("正常", "正常"), ("故障", "故障"), ("不可用", "不可用")],
+#         default='正常', string="机床状态")
+#     # 0606新增字段
+#     machine_tool_picture = fields.Binary('图片')
+#     heightened_way = fields.Selection([
+#         ('sifudianji', '伺服电机驱动'),
+#         ('youyagang', '油压缸驱动'),
+#         ('chilunjia', '齿轮架驱动')
+#     ], string="主轴加高方式", default='sifudianji')
+#     workpiece_load = fields.Char('工件负载')
+#     lead_screw = fields.Char('丝杆')
+#     workbench_L = fields.Char('工作台长度(mm)')
+#     workbench_W = fields.Char('工作台宽度(mm)')
+#     guide_rail = fields.Char('导轨')
+#     machine_tool_L = fields.Char('机床长度(mm)')
+#     machine_tool_W = fields.Char('机床宽度(mm)')
+#     machine_tool_H = fields.Char('机床高度(mm)')
+#     feed_speed = fields.Char('进给速度(mm/min)')
+#     tool_speed = fields.Char('刀具速度')
+#     distance = fields.Char('主轴端面至工作台面距离(mm)')
+#     taper = fields.Char('主轴锥度(°)')
+#     torque = fields.Char('主轴点击扭矩(n/m)')
+#     motor_power = fields.Char('主轴电机功率(kw)')
+#     tool_quality_max = fields.Char('刀具最大质量')
+#     tool_long_max = fields.Char('刀具最大长度')
+#     tool_diameter_max = fields.Char('刀具最大刀径')
+#     machine_tool_category = fields.Many2one('sf.machine_tool.category', string='机床类型')
+#     # 一个机床对应一個加工工厂，一个加工工厂对应多个机床
+#     factory_id = fields.Many2one('res.partner', string='所属工厂',
+#                                  domain="[('is_factory', '=', True)]")
+#     # 一个机床对应一个供应商，一个供应商对应多个机床
+#     supplier_id = fields.Many2one('res.partner', string='制造商',
+#                                   domain="[('is_vendor', '=', True)]")
+#     registration_date = fields.Date('注册日期')
+#     state_zc = fields.Selection([("已注册", "已注册"), ("未注册", "未注册")], string="注册状态", default='未注册')
+#     active = fields.Boolean('有效', default=True)
+#
+#     @api.constrains('rotate_speed')
+#     def _check_rotate_speed(self):
+#         if self.rotate_speed <= 0:
+#             raise ValidationError("转速不能为0")
+#
+#     @api.constrains('precision')
+#     def _check_precision(self):
+#         if self.precision <= 0.00:
+#             raise ValidationError("加工精度不能为0")
+#
+#     @api.constrains('number_of_knife_library')
+#     def _check_number_of_knife_library(self):
+#         if self.number_of_knife_library <= 0:
+#             raise ValidationError("刀库数量不能为0")
+#
+#     @api.constrains('x_axis')
+#     def _check_x_axis(self):
+#         if self.x_axis <= 0:
+#             raise ValidationError("加工行程里x轴不能为0")
+#
+#     @api.constrains('y_axis')
+#     def _check_y_axis(self):
+#         if self.y_axis <= 0:
+#             raise ValidationError("加工行程里y轴不能为0")
+#
+#     @api.constrains('z_axis')
+#     def _check_z_axis(self):
+#         if self.z_axis <= 0:
+#             raise ValidationError("加工行程里z轴不能为0")
+#
+#     @api.constrains('b_axis')
+#     def _check_b_axis(self):
+#         if self.number_of_axles == '四轴':
+#             print(self.number_of_axles)
+#             if self.b_axis <= 0:
+#                 raise ValidationError("加工行程里b轴不能为0")
+#
+#     @api.constrains('c_axis')
+#     def _check_c_axis(self):
+#         if self.number_of_axles == '五轴':
+#             if self.c_axis <= 0:
+#                 raise ValidationError("加工行程里c轴不能为0")
+#
+#     @api.onchange('type_id')
+#     def get_type_info(self):
+#         for item in self:
+#             item.knife_type = item.type_id.knife_type
+#             item.number_of_knife_library = item.type_id.number_of_knife_library
+#             item.number_of_axles = item.type_id.number_of_axles
+#             item.rotate_speed = item.type_id.rotate_speed
+#             item.precision = item.type_id.precision
+#             item.control_system_id = item.type_id.control_system_id
+#             item.x_axis = item.type_id.x_axis
+#             item.y_axis = item.type_id.y_axis
+#             item.z_axis = item.type_id.z_axis
+#             item.b_axis = item.type_id.b_axis
+#             item.c_axis = item.type_id.c_axis
+#             item.machine_tool_picture = item.type_id.machine_tool_picture
+#             item.heightened_way = item.type_id.heightened_way
+#             item.workpiece_load = item.type_id.workpiece_load
+#             item.lead_screw = item.type_id.lead_screw
+#             item.workbench_L = item.type_id.workbench_L
+#             item.workbench_W = item.type_id.workbench_W
+#             item.guide_rail = item.type_id.guide_rail
+#             item.machine_tool_L = item.type_id.machine_tool_L
+#             item.machine_tool_W = item.type_id.machine_tool_W
+#             item.machine_tool_H = item.type_id.machine_tool_H
+#             item.feed_speed = item.type_id.feed_speed
+#             item.tool_speed = item.type_id.tool_speed
+#             item.distance = item.type_id.distance
+#             item.taper = item.type_id.taper
+#             item.torque = item.type_id.torque
+#             item.motor_power = item.type_id.motor_power
+#             item.tool_quality_max = item.type_id.tool_quality_max
+#             item.tool_long_max = item.type_id.tool_long_max
+#             item.tool_diameter_max = item.type_id.tool_diameter_max
+#             item.machine_tool_category = item.type_id.machine_tool_category.id
+#
+#     # 注册同步机床
+#     def enroll_machine_tool(self):
+#         sf_sync_config = self.env['res.config.settings'].get_values()
+#         token = sf_sync_config['token']
+#         sf_secret_key = sf_sync_config['sf_secret_key']
+#         headers = Common.get_headers(self, token, sf_secret_key)
+#         strurl = sf_sync_config['sf_url'] + self.crea_url
+#         objs_all = self.env['sf.machine_tool'].search([('MTcode', '=', self.MTcode)])
+#         machine_tool_list = []
+#         if objs_all:
+#             for item in objs_all:
+#                 val = {
+#                     'MTcode': item.MTcode,
+#                     'factory_token': token,
+#                     'id': item.id,
+#                     'name': item.name,
+#                     'code': item.code,
+#                     'precision': item.precision,
+#                     'knife_type': item.knife_type,
+#                     'number_of_knife_library': item.number_of_knife_library,
+#                     'rotate_speed': item.rotate_speed,
+#                     'number_of_axles': item.number_of_axles,
+#                     'control_system_id': self.env['sf.machine.control_system'].search(
+#                         [('id', '=', item.control_system_id.id)]).code,
+#                     'type_id': self.env['sf.machine_tool.type'].search([('id', '=', item.type_id.id)]).code,
+#                     'brand_id': self.env['sf.machine.brand'].search([('id', '=', item.brand_id.id)]).code,
+#                     'supplier_id': item.supplier_id.id,
+#                     'x_axis': item.x_axis,
+#                     'y_axis': item.y_axis,
+#                     'z_axis': item.z_axis,
+#                     'b_axis': item.b_axis,
+#                     'c_axis': item.c_axis,
+#                     'state': item.state,
+#                     'active': item.active,
+#
+#                 }
+#                 machine_tool_list.append(val)
+#             # kw = machine_tool_list
+#             kw = json.dumps(machine_tool_list, ensure_ascii=False)
+#             r = requests.post(strurl, json={}, data={'kw': kw, 'token': token}, headers=headers)
+#             ret = r.json()
+#             self.code = ret['message']
+#             self.state_zc = "已注册"
+#             if r == 200:
+#                 return "机床注册成功"
+#         else:
+#             raise ValidationError("没有注册机床信息")
 
 
 class MachineToolType(models.Model):
diff --git a/sf_maintenance/security/group_security.xml b/sf_maintenance/security/group_security.xml
index b8668782..e5a90368 100644
--- a/sf_maintenance/security/group_security.xml
+++ b/sf_maintenance/security/group_security.xml
@@ -1,4 +1,17 @@
 <odoo>
-    <data>
+    <record id="sf_group_equipment_user" model="res.groups">
+        <field name="name">维保岗</field>
+        <field name="category_id" ref="base.module_category_manufacturing_maintenance"/>
+        <field name="implied_ids" eval="[(4, ref('maintenance.group_equipment_manager'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/>
+    </record>
+           <record id="sf_group_equipment_manager" model="res.groups">
+            <field name="name">设备总监</field>
+            <field name="implied_ids" eval="[(4, ref('sf_group_equipment_user'))]"/>
+            <field name="category_id" ref="base.module_category_manufacturing_maintenance"/>
+        </record>
+
+    <data noupdate="1">
+
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_maintenance/security/ir.model.access.csv b/sf_maintenance/security/ir.model.access.csv
index 5a022f14..e8f2ab32 100644
--- a/sf_maintenance/security/ir.model.access.csv
+++ b/sf_maintenance/security/ir.model.access.csv
@@ -1,10 +1,10 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_equipment_maintenance_standards,equipment_maintenance_standards,model_equipment_maintenance_standards,base.group_user,1,1,1,1
-access_sf_maintenance_logs,sf_maintenance_logs,model_sf_maintenance_logs,base.group_user,1,1,1,1
-access_maintenance_equipment,maintenance_equipment,model_maintenance_equipment,base.group_user,1,1,1,1
-access_maintenance_standards,maintenance_standards,model_maintenance_standards,base.group_user,1,1,1,1
-access_maintenance_standard_image,maintenance_standard_image,model_maintenance_standard_image,base.group_user,1,1,1,1
-access_sf_robot_axis_num,sf_robot_axis_num,model_sf_robot_axis_num,base.group_user,1,1,1,1
+access_equipment_maintenance_standards,equipment_maintenance_standards,model_equipment_maintenance_standards,sf_group_equipment_user,1,1,1,1
+access_sf_maintenance_logs,sf_maintenance_logs,model_sf_maintenance_logs,sf_group_equipment_user,1,1,1,1
+access_maintenance_equipment,maintenance_equipment,model_maintenance_equipment,sf_group_equipment_user,1,1,1,1
+access_maintenance_standards,maintenance_standards,model_maintenance_standards,sf_group_equipment_user,1,1,1,1
+access_maintenance_standard_image,maintenance_standard_image,model_maintenance_standard_image,sf_group_equipment_user,1,1,1,1
+access_sf_robot_axis_num,sf_robot_axis_num,model_sf_robot_axis_num,sf_group_equipment_user,1,1,1,1
 
 
 
diff --git a/sf_manufacturing/security/group_security.xml b/sf_manufacturing/security/group_security.xml
index c32538c7..236a0375 100644
--- a/sf_manufacturing/security/group_security.xml
+++ b/sf_manufacturing/security/group_security.xml
@@ -1,27 +1,10 @@
 <odoo>
     <data>
-        <record model="ir.module.category" id="module_category_employee">
-            <field name="name">员工</field>
-            <field name="sequence">1</field>
-        </record>
-
-        <record model="ir.module.category" id="module_category_manage">
-            <field name="name">管理</field>
-            <field name="sequence">2</field>
-        </record>
-
-
-
 <!--        &lt;!&ndash; 系统管理相关 &ndash;&gt;-->
 <!--        <record id="group_master_data_manager" model="res.groups">-->
 <!--            <field name="name">基础设置</field>-->
 <!--            <field name="category_id" ref="base.module_category_employee"/>-->
 <!--            <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>-->
 <!--        </record>-->
-
-
-
-
-
     </data>
 </odoo>
\ No newline at end of file

From 893aa2111caf9b75c6cf6a4e1516f5dfec06f6b6 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Wed, 29 Nov 2023 17:34:15 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=A4=84=E7=90=86coding=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mrp_workorder/views/mrp_workorder_views.xml |   6 +-
 sf_base/models/base.py                      | 412 ++++++++++----------
 sf_manufacturing/models/mrp_workorder.py    |   2 +-
 3 files changed, 210 insertions(+), 210 deletions(-)

diff --git a/mrp_workorder/views/mrp_workorder_views.xml b/mrp_workorder/views/mrp_workorder_views.xml
index 61491d4c..37702c00 100644
--- a/mrp_workorder/views/mrp_workorder_views.xml
+++ b/mrp_workorder/views/mrp_workorder_views.xml
@@ -38,9 +38,9 @@
             <xpath expr="//field[@name='state']" position="after">
                 <field name="production_state" invisible="1"/>
             </xpath>
-            <xpath expr="//button[@name='action_open_wizard']" position="after">
-                <button name="open_tablet_view" type="object" icon="fa-tablet" title="Open Tablet View" context="{'from_production_order': True}" attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'cancel', 'done')), ('state', '=', 'done')]}"/>
-            </xpath>
+<!--            <xpath expr="//button[@name='action_open_wizard']" position="after">-->
+<!--                <button name="open_tablet_view" type="object" icon="fa-tablet" title="Open Tablet View" context="{'from_production_order': True}" attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'cancel', 'done')), ('state', '=', 'done')]}"/>-->
+<!--            </xpath>-->
         </field>
     </record>
 
diff --git a/sf_base/models/base.py b/sf_base/models/base.py
index f35b03e2..d9dc1691 100644
--- a/sf_base/models/base.py
+++ b/sf_base/models/base.py
@@ -40,212 +40,212 @@ class MachineBrand(models.Model):
     active = fields.Boolean('有效', default=True)
 
 
-# 机床
-# class MachineTool(models.Model):
-#     _name = 'sf.machine_tool'
-#     _description = '机床'
-#
-#     def get_no(self):
-#         partner = self.env['sf.machine_tool'].sudo().search(
-#             [('MTcode', '!=', '')],
-#             limit=1,
-#             order="id desc")
-#         if not partner:
-#             num = "%04d" % 1
-#
-#         else:
-#             m = int(partner.MTcode) + 1
-#             num = "%04d" % m
-#         return num
-#
-#     MTcode = fields.Char("编码", default=get_no)
-#     code = fields.Char('行业编码')
-#     name = fields.Char('名称')
-#     knife_type = fields.Selection(
-#         [("BT40", "BT40"), ("BT30", "BT30")],
-#         default="", string="刀把类型")
-#     number_of_knife_library = fields.Integer('刀库数量(把)')
-#     rotate_speed = fields.Integer('转速')
-#     number_of_axles = fields.Selection(
-#         [("三轴", "三轴"), ("四轴", "四轴"), ("五轴", "五轴")],
-#         default="", string="轴数")
-#     # 加工进程
-#     x_axis = fields.Integer('X轴')
-#     y_axis = fields.Integer('Y轴')
-#     z_axis = fields.Integer('Z轴')
-#     b_axis = fields.Integer('B轴')
-#     c_axis = fields.Integer('C轴')
-#     remark = fields.Char('备注')
-#     is_binding = fields.Boolean('是否绑定机床', default=False)
-#     precision = fields.Float('加工精度')
-#     control_system_id = fields.Many2one('sf.machine.control_system',
-#                                         string="控制系统")
-#     # 多个机床型号对应一个机床
-#     type_id = fields.Many2one('sf.machine_tool.type', '型号')
-#     brand_id = fields.Many2one('sf.machine.brand', string='品牌')
-#     state = fields.Selection(
-#         [("正常", "正常"), ("故障", "故障"), ("不可用", "不可用")],
-#         default='正常', string="机床状态")
-#     # 0606新增字段
-#     machine_tool_picture = fields.Binary('图片')
-#     heightened_way = fields.Selection([
-#         ('sifudianji', '伺服电机驱动'),
-#         ('youyagang', '油压缸驱动'),
-#         ('chilunjia', '齿轮架驱动')
-#     ], string="主轴加高方式", default='sifudianji')
-#     workpiece_load = fields.Char('工件负载')
-#     lead_screw = fields.Char('丝杆')
-#     workbench_L = fields.Char('工作台长度(mm)')
-#     workbench_W = fields.Char('工作台宽度(mm)')
-#     guide_rail = fields.Char('导轨')
-#     machine_tool_L = fields.Char('机床长度(mm)')
-#     machine_tool_W = fields.Char('机床宽度(mm)')
-#     machine_tool_H = fields.Char('机床高度(mm)')
-#     feed_speed = fields.Char('进给速度(mm/min)')
-#     tool_speed = fields.Char('刀具速度')
-#     distance = fields.Char('主轴端面至工作台面距离(mm)')
-#     taper = fields.Char('主轴锥度(°)')
-#     torque = fields.Char('主轴点击扭矩(n/m)')
-#     motor_power = fields.Char('主轴电机功率(kw)')
-#     tool_quality_max = fields.Char('刀具最大质量')
-#     tool_long_max = fields.Char('刀具最大长度')
-#     tool_diameter_max = fields.Char('刀具最大刀径')
-#     machine_tool_category = fields.Many2one('sf.machine_tool.category', string='机床类型')
-#     # 一个机床对应一個加工工厂，一个加工工厂对应多个机床
-#     factory_id = fields.Many2one('res.partner', string='所属工厂',
-#                                  domain="[('is_factory', '=', True)]")
-#     # 一个机床对应一个供应商，一个供应商对应多个机床
-#     supplier_id = fields.Many2one('res.partner', string='制造商',
-#                                   domain="[('is_vendor', '=', True)]")
-#     registration_date = fields.Date('注册日期')
-#     state_zc = fields.Selection([("已注册", "已注册"), ("未注册", "未注册")], string="注册状态", default='未注册')
-#     active = fields.Boolean('有效', default=True)
-#
-#     @api.constrains('rotate_speed')
-#     def _check_rotate_speed(self):
-#         if self.rotate_speed <= 0:
-#             raise ValidationError("转速不能为0")
-#
-#     @api.constrains('precision')
-#     def _check_precision(self):
-#         if self.precision <= 0.00:
-#             raise ValidationError("加工精度不能为0")
-#
-#     @api.constrains('number_of_knife_library')
-#     def _check_number_of_knife_library(self):
-#         if self.number_of_knife_library <= 0:
-#             raise ValidationError("刀库数量不能为0")
-#
-#     @api.constrains('x_axis')
-#     def _check_x_axis(self):
-#         if self.x_axis <= 0:
-#             raise ValidationError("加工行程里x轴不能为0")
-#
-#     @api.constrains('y_axis')
-#     def _check_y_axis(self):
-#         if self.y_axis <= 0:
-#             raise ValidationError("加工行程里y轴不能为0")
-#
-#     @api.constrains('z_axis')
-#     def _check_z_axis(self):
-#         if self.z_axis <= 0:
-#             raise ValidationError("加工行程里z轴不能为0")
-#
-#     @api.constrains('b_axis')
-#     def _check_b_axis(self):
-#         if self.number_of_axles == '四轴':
-#             print(self.number_of_axles)
-#             if self.b_axis <= 0:
-#                 raise ValidationError("加工行程里b轴不能为0")
-#
-#     @api.constrains('c_axis')
-#     def _check_c_axis(self):
-#         if self.number_of_axles == '五轴':
-#             if self.c_axis <= 0:
-#                 raise ValidationError("加工行程里c轴不能为0")
-#
-#     @api.onchange('type_id')
-#     def get_type_info(self):
-#         for item in self:
-#             item.knife_type = item.type_id.knife_type
-#             item.number_of_knife_library = item.type_id.number_of_knife_library
-#             item.number_of_axles = item.type_id.number_of_axles
-#             item.rotate_speed = item.type_id.rotate_speed
-#             item.precision = item.type_id.precision
-#             item.control_system_id = item.type_id.control_system_id
-#             item.x_axis = item.type_id.x_axis
-#             item.y_axis = item.type_id.y_axis
-#             item.z_axis = item.type_id.z_axis
-#             item.b_axis = item.type_id.b_axis
-#             item.c_axis = item.type_id.c_axis
-#             item.machine_tool_picture = item.type_id.machine_tool_picture
-#             item.heightened_way = item.type_id.heightened_way
-#             item.workpiece_load = item.type_id.workpiece_load
-#             item.lead_screw = item.type_id.lead_screw
-#             item.workbench_L = item.type_id.workbench_L
-#             item.workbench_W = item.type_id.workbench_W
-#             item.guide_rail = item.type_id.guide_rail
-#             item.machine_tool_L = item.type_id.machine_tool_L
-#             item.machine_tool_W = item.type_id.machine_tool_W
-#             item.machine_tool_H = item.type_id.machine_tool_H
-#             item.feed_speed = item.type_id.feed_speed
-#             item.tool_speed = item.type_id.tool_speed
-#             item.distance = item.type_id.distance
-#             item.taper = item.type_id.taper
-#             item.torque = item.type_id.torque
-#             item.motor_power = item.type_id.motor_power
-#             item.tool_quality_max = item.type_id.tool_quality_max
-#             item.tool_long_max = item.type_id.tool_long_max
-#             item.tool_diameter_max = item.type_id.tool_diameter_max
-#             item.machine_tool_category = item.type_id.machine_tool_category.id
-#
-#     # 注册同步机床
-#     def enroll_machine_tool(self):
-#         sf_sync_config = self.env['res.config.settings'].get_values()
-#         token = sf_sync_config['token']
-#         sf_secret_key = sf_sync_config['sf_secret_key']
-#         headers = Common.get_headers(self, token, sf_secret_key)
-#         strurl = sf_sync_config['sf_url'] + self.crea_url
-#         objs_all = self.env['sf.machine_tool'].search([('MTcode', '=', self.MTcode)])
-#         machine_tool_list = []
-#         if objs_all:
-#             for item in objs_all:
-#                 val = {
-#                     'MTcode': item.MTcode,
-#                     'factory_token': token,
-#                     'id': item.id,
-#                     'name': item.name,
-#                     'code': item.code,
-#                     'precision': item.precision,
-#                     'knife_type': item.knife_type,
-#                     'number_of_knife_library': item.number_of_knife_library,
-#                     'rotate_speed': item.rotate_speed,
-#                     'number_of_axles': item.number_of_axles,
-#                     'control_system_id': self.env['sf.machine.control_system'].search(
-#                         [('id', '=', item.control_system_id.id)]).code,
-#                     'type_id': self.env['sf.machine_tool.type'].search([('id', '=', item.type_id.id)]).code,
-#                     'brand_id': self.env['sf.machine.brand'].search([('id', '=', item.brand_id.id)]).code,
-#                     'supplier_id': item.supplier_id.id,
-#                     'x_axis': item.x_axis,
-#                     'y_axis': item.y_axis,
-#                     'z_axis': item.z_axis,
-#                     'b_axis': item.b_axis,
-#                     'c_axis': item.c_axis,
-#                     'state': item.state,
-#                     'active': item.active,
-#
-#                 }
-#                 machine_tool_list.append(val)
-#             # kw = machine_tool_list
-#             kw = json.dumps(machine_tool_list, ensure_ascii=False)
-#             r = requests.post(strurl, json={}, data={'kw': kw, 'token': token}, headers=headers)
-#             ret = r.json()
-#             self.code = ret['message']
-#             self.state_zc = "已注册"
-#             if r == 200:
-#                 return "机床注册成功"
-#         else:
-#             raise ValidationError("没有注册机床信息")
+#机床
+class MachineTool(models.Model):
+    _name = 'sf.machine_tool'
+    _description = '机床'
+
+    def get_no(self):
+        partner = self.env['sf.machine_tool'].sudo().search(
+            [('MTcode', '!=', '')],
+            limit=1,
+            order="id desc")
+        if not partner:
+            num = "%04d" % 1
+
+        else:
+            m = int(partner.MTcode) + 1
+            num = "%04d" % m
+        return num
+
+    MTcode = fields.Char("编码", default=get_no)
+    code = fields.Char('行业编码')
+    name = fields.Char('名称')
+    knife_type = fields.Selection(
+        [("BT40", "BT40"), ("BT30", "BT30")],
+        default="", string="刀把类型")
+    number_of_knife_library = fields.Integer('刀库数量(把)')
+    rotate_speed = fields.Integer('转速')
+    number_of_axles = fields.Selection(
+        [("三轴", "三轴"), ("四轴", "四轴"), ("五轴", "五轴")],
+        default="", string="轴数")
+    # 加工进程
+    x_axis = fields.Integer('X轴')
+    y_axis = fields.Integer('Y轴')
+    z_axis = fields.Integer('Z轴')
+    b_axis = fields.Integer('B轴')
+    c_axis = fields.Integer('C轴')
+    remark = fields.Char('备注')
+    is_binding = fields.Boolean('是否绑定机床', default=False)
+    precision = fields.Float('加工精度')
+    control_system_id = fields.Many2one('sf.machine.control_system',
+                                        string="控制系统")
+    # 多个机床型号对应一个机床
+    type_id = fields.Many2one('sf.machine_tool.type', '型号')
+    brand_id = fields.Many2one('sf.machine.brand', string='品牌')
+    state = fields.Selection(
+        [("正常", "正常"), ("故障", "故障"), ("不可用", "不可用")],
+        default='正常', string="机床状态")
+    # 0606新增字段
+    machine_tool_picture = fields.Binary('图片')
+    heightened_way = fields.Selection([
+        ('sifudianji', '伺服电机驱动'),
+        ('youyagang', '油压缸驱动'),
+        ('chilunjia', '齿轮架驱动')
+    ], string="主轴加高方式", default='sifudianji')
+    workpiece_load = fields.Char('工件负载')
+    lead_screw = fields.Char('丝杆')
+    workbench_L = fields.Char('工作台长度(mm)')
+    workbench_W = fields.Char('工作台宽度(mm)')
+    guide_rail = fields.Char('导轨')
+    machine_tool_L = fields.Char('机床长度(mm)')
+    machine_tool_W = fields.Char('机床宽度(mm)')
+    machine_tool_H = fields.Char('机床高度(mm)')
+    feed_speed = fields.Char('进给速度(mm/min)')
+    tool_speed = fields.Char('刀具速度')
+    distance = fields.Char('主轴端面至工作台面距离(mm)')
+    taper = fields.Char('主轴锥度(°)')
+    torque = fields.Char('主轴点击扭矩(n/m)')
+    motor_power = fields.Char('主轴电机功率(kw)')
+    tool_quality_max = fields.Char('刀具最大质量')
+    tool_long_max = fields.Char('刀具最大长度')
+    tool_diameter_max = fields.Char('刀具最大刀径')
+    machine_tool_category = fields.Many2one('sf.machine_tool.category', string='机床类型')
+    # 一个机床对应一個加工工厂，一个加工工厂对应多个机床
+    factory_id = fields.Many2one('res.partner', string='所属工厂',
+                                 domain="[('is_factory', '=', True)]")
+    # 一个机床对应一个供应商，一个供应商对应多个机床
+    supplier_id = fields.Many2one('res.partner', string='制造商',
+                                  domain="[('is_vendor', '=', True)]")
+    registration_date = fields.Date('注册日期')
+    state_zc = fields.Selection([("已注册", "已注册"), ("未注册", "未注册")], string="注册状态", default='未注册')
+    active = fields.Boolean('有效', default=True)
+
+    @api.constrains('rotate_speed')
+    def _check_rotate_speed(self):
+        if self.rotate_speed <= 0:
+            raise ValidationError("转速不能为0")
+
+    @api.constrains('precision')
+    def _check_precision(self):
+        if self.precision <= 0.00:
+            raise ValidationError("加工精度不能为0")
+
+    @api.constrains('number_of_knife_library')
+    def _check_number_of_knife_library(self):
+        if self.number_of_knife_library <= 0:
+            raise ValidationError("刀库数量不能为0")
+
+    @api.constrains('x_axis')
+    def _check_x_axis(self):
+        if self.x_axis <= 0:
+            raise ValidationError("加工行程里x轴不能为0")
+
+    @api.constrains('y_axis')
+    def _check_y_axis(self):
+        if self.y_axis <= 0:
+            raise ValidationError("加工行程里y轴不能为0")
+
+    @api.constrains('z_axis')
+    def _check_z_axis(self):
+        if self.z_axis <= 0:
+            raise ValidationError("加工行程里z轴不能为0")
+
+    @api.constrains('b_axis')
+    def _check_b_axis(self):
+        if self.number_of_axles == '四轴':
+            print(self.number_of_axles)
+            if self.b_axis <= 0:
+                raise ValidationError("加工行程里b轴不能为0")
+
+    @api.constrains('c_axis')
+    def _check_c_axis(self):
+        if self.number_of_axles == '五轴':
+            if self.c_axis <= 0:
+                raise ValidationError("加工行程里c轴不能为0")
+
+    @api.onchange('type_id')
+    def get_type_info(self):
+        for item in self:
+            item.knife_type = item.type_id.knife_type
+            item.number_of_knife_library = item.type_id.number_of_knife_library
+            item.number_of_axles = item.type_id.number_of_axles
+            item.rotate_speed = item.type_id.rotate_speed
+            item.precision = item.type_id.precision
+            item.control_system_id = item.type_id.control_system_id
+            item.x_axis = item.type_id.x_axis
+            item.y_axis = item.type_id.y_axis
+            item.z_axis = item.type_id.z_axis
+            item.b_axis = item.type_id.b_axis
+            item.c_axis = item.type_id.c_axis
+            item.machine_tool_picture = item.type_id.machine_tool_picture
+            item.heightened_way = item.type_id.heightened_way
+            item.workpiece_load = item.type_id.workpiece_load
+            item.lead_screw = item.type_id.lead_screw
+            item.workbench_L = item.type_id.workbench_L
+            item.workbench_W = item.type_id.workbench_W
+            item.guide_rail = item.type_id.guide_rail
+            item.machine_tool_L = item.type_id.machine_tool_L
+            item.machine_tool_W = item.type_id.machine_tool_W
+            item.machine_tool_H = item.type_id.machine_tool_H
+            item.feed_speed = item.type_id.feed_speed
+            item.tool_speed = item.type_id.tool_speed
+            item.distance = item.type_id.distance
+            item.taper = item.type_id.taper
+            item.torque = item.type_id.torque
+            item.motor_power = item.type_id.motor_power
+            item.tool_quality_max = item.type_id.tool_quality_max
+            item.tool_long_max = item.type_id.tool_long_max
+            item.tool_diameter_max = item.type_id.tool_diameter_max
+            item.machine_tool_category = item.type_id.machine_tool_category.id
+
+    # 注册同步机床
+    def enroll_machine_tool(self):
+        sf_sync_config = self.env['res.config.settings'].get_values()
+        token = sf_sync_config['token']
+        sf_secret_key = sf_sync_config['sf_secret_key']
+        headers = Common.get_headers(self, token, sf_secret_key)
+        strurl = sf_sync_config['sf_url'] + self.crea_url
+        objs_all = self.env['sf.machine_tool'].search([('MTcode', '=', self.MTcode)])
+        machine_tool_list = []
+        if objs_all:
+            for item in objs_all:
+                val = {
+                    'MTcode': item.MTcode,
+                    'factory_token': token,
+                    'id': item.id,
+                    'name': item.name,
+                    'code': item.code,
+                    'precision': item.precision,
+                    'knife_type': item.knife_type,
+                    'number_of_knife_library': item.number_of_knife_library,
+                    'rotate_speed': item.rotate_speed,
+                    'number_of_axles': item.number_of_axles,
+                    'control_system_id': self.env['sf.machine.control_system'].search(
+                        [('id', '=', item.control_system_id.id)]).code,
+                    'type_id': self.env['sf.machine_tool.type'].search([('id', '=', item.type_id.id)]).code,
+                    'brand_id': self.env['sf.machine.brand'].search([('id', '=', item.brand_id.id)]).code,
+                    'supplier_id': item.supplier_id.id,
+                    'x_axis': item.x_axis,
+                    'y_axis': item.y_axis,
+                    'z_axis': item.z_axis,
+                    'b_axis': item.b_axis,
+                    'c_axis': item.c_axis,
+                    'state': item.state,
+                    'active': item.active,
+
+                }
+                machine_tool_list.append(val)
+            # kw = machine_tool_list
+            kw = json.dumps(machine_tool_list, ensure_ascii=False)
+            r = requests.post(strurl, json={}, data={'kw': kw, 'token': token}, headers=headers)
+            ret = r.json()
+            self.code = ret['message']
+            self.state_zc = "已注册"
+            if r == 200:
+                return "机床注册成功"
+        else:
+            raise ValidationError("没有注册机床信息")
 
 
 class MachineToolType(models.Model):
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 8d3bf6c2..d1fae8e6 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -480,7 +480,7 @@ class ResMrpWorkOrder(models.Model):
 
     # 重写工单开始按钮方法
     def button_start(self):
-        if self.routing_type == '装夹':
+        if self.routing_type == '装夹' and self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
             self.pro_code = self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name
         # 外协出库单，从“正在等待”变为“就绪”状态
         if self.is_subcontract is True:

From 2cf4958f46e52acbe647675590fc0e1b4c2b5ec1 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 29 Nov 2023 20:58:12 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=EF=BC=8C=E4=BC=98=E5=8C=96=E8=AD=A6=E5=91=8A?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/models/ftp_client.py     |  2 +-
 sf_plan_management/models/base.py           | 15 +++++
 sf_plan_management/models/calendar_base.py  | 63 +++++++++++++++++----
 sf_plan_management/views/plan_base_view.xml | 22 +++++++
 4 files changed, 89 insertions(+), 13 deletions(-)

diff --git a/sf_machine_connect/models/ftp_client.py b/sf_machine_connect/models/ftp_client.py
index b33dbeee..2cc1ee5d 100644
--- a/sf_machine_connect/models/ftp_client.py
+++ b/sf_machine_connect/models/ftp_client.py
@@ -543,7 +543,7 @@ class WorkCenterBarcode(models.Model):
 
         # 如果没有附件，直接返回
         if not self.cnc_ids:
-            return
+            return None
 
         # 处理第一个附件的文件名
         first_attachment = self.cnc_ids[0].cnc_id
diff --git a/sf_plan_management/models/base.py b/sf_plan_management/models/base.py
index d1eff04a..1bf1e599 100644
--- a/sf_plan_management/models/base.py
+++ b/sf_plan_management/models/base.py
@@ -23,6 +23,21 @@ class ProcedureEquipmentResourceSetting(models.Model):
     create_time = fields.Datetime(string='新增时间', default=lambda self: fields.Datetime.now(), readonly=True)
     participate_in_scheduling = fields.Boolean(string='参与排程', default=True)
 
+    # check_status = fields.Selection([('unchecked', '未审核'), ('checked', '已审核')], '审核状态', default='unchecked')
+    check_status = fields.Boolean(string='启用状态', default=False, readonly=True)
+
+    def action_check(self):
+        """
+        审核启用
+        """
+        self.check_status = True
+
+    def action_uncheck(self):
+        """
+        审核禁用
+        """
+        self.check_status = False
+
     @api.depends('work_center_name_id')
     def _compute_equipment_name_id(self):
         for record in self:
diff --git a/sf_plan_management/models/calendar_base.py b/sf_plan_management/models/calendar_base.py
index b493053d..cc1d395e 100644
--- a/sf_plan_management/models/calendar_base.py
+++ b/sf_plan_management/models/calendar_base.py
@@ -38,6 +38,19 @@ class WorkLogSetting(models.Model):
     update_time = fields.Datetime(string='更新时间', default=lambda self: fields.Datetime.now())
 
     setting_to_calendar_ids = fields.One2many('sf.work.schedule.calendar', 'name_id', '工作日历')
+    check_status = fields.Boolean(string='启用状态', default=False, readonly=True)
+
+    def action_check(self):
+        """
+        审核启用
+        """
+        self.check_status = True
+
+    def action_uncheck(self):
+        """
+        审核禁用
+        """
+        self.check_status = False
 
     @api.depends('working_shift_ids')
     def _compute_working_shift_ids(self):
@@ -157,13 +170,13 @@ class WorkLogSetting(models.Model):
         :return:
         """
         weekdays = {
-            '星期一': 'Monday',    'Monday': 'Monday',
-            '星期二': 'Tuesday',   'Tuesday': 'Tuesday',
+            '星期一': 'Monday', 'Monday': 'Monday',
+            '星期二': 'Tuesday', 'Tuesday': 'Tuesday',
             '星期三': 'Wednesday', 'Wednesday': 'Wednesday',
-            '星期四': 'Thursday',  'Thursday': 'Thursday',
-            '星期五': 'Friday',    'Friday': 'Friday',
-            '星期六': 'Saturday',  'Saturday': 'Saturday',
-            '星期日': 'Sunday',    'Sunday': 'Sunday',
+            '星期四': 'Thursday', 'Thursday': 'Thursday',
+            '星期五': 'Friday', 'Friday': 'Friday',
+            '星期六': 'Saturday', 'Saturday': 'Saturday',
+            '星期日': 'Sunday', 'Sunday': 'Sunday',
         }
         english_weekdays = []
         for chinese_weekday in chinese_weekdays:
@@ -179,13 +192,13 @@ class WorkLogSetting(models.Model):
         :return:
         """
         weekdays = {
-            '星期一': 'Monday',    'Monday': 'Monday',
-            '星期二': 'Tuesday',   'Tuesday': 'Tuesday',
+            '星期一': 'Monday', 'Monday': 'Monday',
+            '星期二': 'Tuesday', 'Tuesday': 'Tuesday',
             '星期三': 'Wednesday', 'Wednesday': 'Wednesday',
-            '星期四': 'Thursday',  'Thursday': 'Thursday',
-            '星期五': 'Friday',    'Friday': 'Friday',
-            '星期六': 'Saturday',  'Saturday': 'Saturday',
-            '星期日': 'Sunday',    'Sunday': 'Sunday',
+            '星期四': 'Thursday', 'Thursday': 'Thursday',
+            '星期五': 'Friday', 'Friday': 'Friday',
+            '星期六': 'Saturday', 'Saturday': 'Saturday',
+            '星期日': 'Sunday', 'Sunday': 'Sunday',
         }
         weekday = weekdays.get(chinese_weekday)
         if weekday:
@@ -233,6 +246,19 @@ class WorkingShift(models.Model):
     start_time = fields.Datetime('班次开始时间')
     end_time = fields.Datetime('班次结束时间')
     remark = fields.Char('备注')
+    check_status = fields.Boolean(string='启用状态', default=False, readonly=True)
+
+    def action_check(self):
+        """
+        审核启用
+        """
+        self.check_status = True
+
+    def action_uncheck(self):
+        """
+        审核禁用
+        """
+        self.check_status = False
 
 
 class DayOff(models.Model):
@@ -247,6 +273,19 @@ class DayOff(models.Model):
         ('Friday ', '星期五'),
         ('Saturday ', '星期六'),
         ('Sunday ', '星期日')], '休息日名称')
+    check_status = fields.Boolean(string='启用状态', default=False, readonly=True)
+
+    def action_check(self):
+        """
+        审核启用
+        """
+        self.check_status = True
+
+    def action_uncheck(self):
+        """
+        审核禁用
+        """
+        self.check_status = False
 
 
 class WorkScheduleCalendar(models.Model):
diff --git a/sf_plan_management/views/plan_base_view.xml b/sf_plan_management/views/plan_base_view.xml
index 06464b98..f9606303 100644
--- a/sf_plan_management/views/plan_base_view.xml
+++ b/sf_plan_management/views/plan_base_view.xml
@@ -16,6 +16,10 @@
                 <field name="status"/>
                 <field name="update_person"/>
                 <field name="update_time"/>
+
+                <field name="check_status" widget="boolean_toggle"/>
+                <button name="action_check" string="启用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/>
+                <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/>
                 <button string="查看日历"
                         type="object"
                         name="open_work_schedule_calendar"
@@ -46,6 +50,8 @@
                     </div>
                     <group>
                         <group>
+
+                            <field name="check_status" widget="boolean_toggle"/>
                             <field name="code"/>
                             <field name="day_off_ids" widget="many2many_tags" placeholder="请选择"
                                    options="{'no_create': True, 'no_quick_create': True}"/>
@@ -82,6 +88,9 @@
         <field name="arch" type="xml">
             <tree string="休息日" editable="bottom" delete="0">
                 <field name="name"/>
+                <field name="check_status" widget="boolean_toggle"/>
+                <button name="action_check" string="启用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/>
+                <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/>
             </tree>
         </field>
     </record>
@@ -104,6 +113,9 @@
                 <field name="start_time" placeholder="请选择"/>
                 <field name="end_time" placeholder="请选择"/>
                 <field name="remark"/>
+                <field name="check_status" widget="boolean_toggle"/>
+                <button name="action_check" string="启用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/>
+                <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/>
             </tree>
         </field>
     </record>
@@ -221,6 +233,10 @@
                 <field name="status"/>
                 <field name="participate_in_scheduling"/>
                 <field name="name" invisible="True"/>
+
+                <field name="check_status" widget="boolean_toggle"/>
+                <button name="action_check" string="启用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/>
+                <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/>
             </tree>
         </field>
     </record>
@@ -230,6 +246,10 @@
         <field name="model">sf.procedure.equipment.resource.setting</field>
         <field name="arch" type="xml">
             <form string="产线设备资源设置">
+                <header>
+                    <button name="action_check" string="启用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/>
+                    <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/>
+                </header>
                 <sheet>
                     <div>
                         <h1>
@@ -238,6 +258,8 @@
                     </div>
                     <group>
                         <group>
+
+                            <field name="check_status" widget="boolean_toggle"/>
                             <field name="work_center_name_id" placeholder="请选择"/>
                             <field name="production_capacity"/>
                             <field name="working_calendar_id" placeholder="请选择"/>

From 94c0b00c2dba81edc427d1908a452aa344e69333 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Mon, 4 Dec 2023 17:28:54 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E6=9C=BA=E5=BA=8A=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B9=E6=8D=AE=E6=9D=83=E9=99=90=E7=BB=84?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_maintenance/security/group_security.xml  | 43 ++++++++++++-
 sf_maintenance/views/maintenance_views.xml  |  4 +-
 sf_manufacturing/models/product_template.py |  4 +-
 sf_sale/models/auto_quatotion_common.py     |  2 +-
 sf_sale/models/quick_easy_order.py          |  4 +-
 sf_sale/security/group_security.xml         | 70 ++++++++++-----------
 6 files changed, 84 insertions(+), 43 deletions(-)

diff --git a/sf_maintenance/security/group_security.xml b/sf_maintenance/security/group_security.xml
index e5a90368..4966ef8a 100644
--- a/sf_maintenance/security/group_security.xml
+++ b/sf_maintenance/security/group_security.xml
@@ -1,5 +1,7 @@
 <odoo>
-    <record id="sf_group_equipment_user" model="res.groups">
+
+    <data noupdate="1">
+            <record id="sf_group_equipment_user" model="res.groups">
         <field name="name">维保岗</field>
         <field name="category_id" ref="base.module_category_manufacturing_maintenance"/>
         <field name="implied_ids" eval="[(4, ref('maintenance.group_equipment_manager'))]"/>
@@ -11,7 +13,44 @@
             <field name="category_id" ref="base.module_category_manufacturing_maintenance"/>
         </record>
 
-    <data noupdate="1">
+        <!--        <record model="ir.rule" id="crm_team_rule_salemanager">-->
+<!--            <field name="name">销售经理只可以查看本人所在的团队</field>-->
+<!--            <field name="model_id" ref="model_crm_team"/>-->
+<!--            <field name="domain_force">[('crm_team_member_ids.user_id','=',user.id)]</field>-->
+<!--            <field name="groups" eval="[(4, ref('sf_base.group_sale_salemanager'))]"/>-->
+<!--            <field name="perm_read" eval="1"/>-->
+<!--            <field name="perm_write" eval="0"/>-->
+<!--            <field name="perm_create" eval="0"/>-->
+<!--        </record>-->
+
+<!--        <record model="ir.rule" id="crm_team_rule_director">-->
+<!--            <field name="name">销售总监</field>-->
+<!--            <field name="model_id" ref="model_crm_team"/>-->
+<!--            <field name="domain_force">[(1,'=',1)]</field>-->
+<!--            <field name="groups" eval="[(4, ref('sf_base.group_sale_director'))]"/>-->
+<!--            <field name="perm_read" eval="1"/>-->
+<!--            <field name="perm_write" eval="1"/>-->
+<!--            <field name="perm_create" eval="1"/>-->
+<!--        </record>-->
+
+<!--        <record model="ir.rule" id="sale_order_rule_director">-->
+<!--            <field name="name">销售总监查看所有的订单</field>-->
+<!--            <field name="model_id" ref="model_sale_order"/>-->
+<!--            <field name="domain_force">[(1,'=',1)]</field>-->
+<!--            <field name="groups" eval="[(4, ref('sf_base.group_sale_director'))]"/>-->
+<!--            <field name="perm_read" eval="1"/>-->
+<!--            <field name="perm_write" eval="1"/>-->
+<!--        </record>-->
+
+<!--        <record model="ir.rule" id="sale_order_rule_salemanager">-->
+<!--            <field name="name">销售经理查看自己的订单</field>-->
+<!--            <field name="model_id" ref="model_sale_order"/>-->
+<!--            <field name="domain_force">['|',('partner_id','=',user.partner_id.id),('create_uid', '=',user.id)]</field>-->
+<!--            <field name="groups" eval="[(4, ref('sf_base.group_sale_salemanager'))]"/>-->
+<!--            <field name="perm_read" eval="1"/>-->
+<!--            <field name="perm_write" eval="1"/>-->
+<!--            <field name="perm_create" eval="1"/>-->
+<!--        </record>-->
 
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml
index ff0b6e73..b7cb707e 100644
--- a/sf_maintenance/views/maintenance_views.xml
+++ b/sf_maintenance/views/maintenance_views.xml
@@ -50,7 +50,9 @@
                     <label for="enroll_machine_tool"/>
                     <div class="col-12 col-lg-6 o_setting_box" style="white-space: nowrap">
                         <button type="object" class="oe_highlight" name='enroll_machine_tool' string="机床注册"
-                                attrs="{'invisible': [('equipment_type', '!=', '机床'), ('brand_id','!=',False),('type_id','!=',False),('control_system_id','!=',False)]}"/>
+                                attrs="{'invisible': [('equipment_type', '!=', '机床'), ('brand_id','!=',False),
+                                ('type_id','!=',False),('control_system_id','!=',False),('code','!=', False)]}"
+                                groups="sf_maintenance.sf_group_equipment_manager"/>
                     </div>
                 </xpath>
                   <xpath expr="//field[@name='category_id']" position="before">
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 5a079abe..29aa7c67 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -6,8 +6,8 @@ import os
 from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
 from odoo.modules import get_resource_path
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+#from OCC.Extend.DataExchange import read_step_file
+#from OCC.Extend.DataExchange import write_stl_file
 
 
 class ResProductMo(models.Model):
diff --git a/sf_sale/models/auto_quatotion_common.py b/sf_sale/models/auto_quatotion_common.py
index 09ea3f0f..1b29c6d2 100644
--- a/sf_sale/models/auto_quatotion_common.py
+++ b/sf_sale/models/auto_quatotion_common.py
@@ -2,7 +2,7 @@
 import logging
 from odoo.modules import get_resource_path
 from odoo import fields, models, api
-from quatotion import readSql, feature_recognize, auto_quatotion
+#from quatotion import readSql, feature_recognize, auto_quatotion
 
 __author__ = 'jinling.yang'
 _logger = logging.getLogger(__name__)
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index 1e5f274c..5ec1fd52 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -5,8 +5,8 @@ import os
 import json
 from datetime import datetime
 import requests
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+#from OCC.Extend.DataExchange import read_step_file
+#from OCC.Extend.DataExchange import write_stl_file
 from odoo import models, fields, api
 from odoo.modules import get_resource_path
 from odoo.exceptions import ValidationError, UserError
diff --git a/sf_sale/security/group_security.xml b/sf_sale/security/group_security.xml
index 33890d49..b94c67c3 100644
--- a/sf_sale/security/group_security.xml
+++ b/sf_sale/security/group_security.xml
@@ -1,42 +1,42 @@
 <odoo>
     <data noupdate="1">
-        <record model="ir.rule" id="crm_team_rule_salemanager">
-            <field name="name">销售经理只可以查看本人所在的团队</field>
-            <field name="model_id" ref="model_crm_team"/>
-            <field name="domain_force">[('crm_team_member_ids.user_id','=',user.id)]</field>
-            <field name="groups" eval="[(4, ref('sf_base.group_sale_salemanager'))]"/>
-            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="0"/>
-            <field name="perm_create" eval="0"/>
-        </record>
+<!--        <record model="ir.rule" id="crm_team_rule_salemanager">-->
+<!--            <field name="name">销售经理只可以查看本人所在的团队</field>-->
+<!--            <field name="model_id" ref="model_crm_team"/>-->
+<!--            <field name="domain_force">[('crm_team_member_ids.user_id','=',user.id)]</field>-->
+<!--            <field name="groups" eval="[(4, ref('sf_base.group_sale_salemanager'))]"/>-->
+<!--            <field name="perm_read" eval="1"/>-->
+<!--            <field name="perm_write" eval="0"/>-->
+<!--            <field name="perm_create" eval="0"/>-->
+<!--        </record>-->
 
-        <record model="ir.rule" id="crm_team_rule_director">
-            <field name="name">销售总监</field>
-            <field name="model_id" ref="model_crm_team"/>
-            <field name="domain_force">[(1,'=',1)]</field>
-            <field name="groups" eval="[(4, ref('sf_base.group_sale_director'))]"/>
-            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="1"/>
-            <field name="perm_create" eval="1"/>
-        </record>
+<!--        <record model="ir.rule" id="crm_team_rule_director">-->
+<!--            <field name="name">销售总监</field>-->
+<!--            <field name="model_id" ref="model_crm_team"/>-->
+<!--            <field name="domain_force">[(1,'=',1)]</field>-->
+<!--            <field name="groups" eval="[(4, ref('sf_base.group_sale_director'))]"/>-->
+<!--            <field name="perm_read" eval="1"/>-->
+<!--            <field name="perm_write" eval="1"/>-->
+<!--            <field name="perm_create" eval="1"/>-->
+<!--        </record>-->
 
-        <record model="ir.rule" id="sale_order_rule_director">
-            <field name="name">销售总监查看所有的订单</field>
-            <field name="model_id" ref="model_sale_order"/>
-            <field name="domain_force">[(1,'=',1)]</field>
-            <field name="groups" eval="[(4, ref('sf_base.group_sale_director'))]"/>
-            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="1"/>
-        </record>
+<!--        <record model="ir.rule" id="sale_order_rule_director">-->
+<!--            <field name="name">销售总监查看所有的订单</field>-->
+<!--            <field name="model_id" ref="model_sale_order"/>-->
+<!--            <field name="domain_force">[(1,'=',1)]</field>-->
+<!--            <field name="groups" eval="[(4, ref('sf_base.group_sale_director'))]"/>-->
+<!--            <field name="perm_read" eval="1"/>-->
+<!--            <field name="perm_write" eval="1"/>-->
+<!--        </record>-->
 
-        <record model="ir.rule" id="sale_order_rule_salemanager">
-            <field name="name">销售经理查看自己的订单</field>
-            <field name="model_id" ref="model_sale_order"/>
-            <field name="domain_force">['|',('partner_id','=',user.partner_id.id),('create_uid', '=',user.id)]</field>
-            <field name="groups" eval="[(4, ref('sf_base.group_sale_salemanager'))]"/>
-            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="1"/>
-            <field name="perm_create" eval="1"/>
-        </record>
+<!--        <record model="ir.rule" id="sale_order_rule_salemanager">-->
+<!--            <field name="name">销售经理查看自己的订单</field>-->
+<!--            <field name="model_id" ref="model_sale_order"/>-->
+<!--            <field name="domain_force">['|',('partner_id','=',user.partner_id.id),('create_uid', '=',user.id)]</field>-->
+<!--            <field name="groups" eval="[(4, ref('sf_base.group_sale_salemanager'))]"/>-->
+<!--            <field name="perm_read" eval="1"/>-->
+<!--            <field name="perm_write" eval="1"/>-->
+<!--            <field name="perm_create" eval="1"/>-->
+<!--        </record>-->
     </data>
 </odoo>
\ No newline at end of file

From 29a55f3ff888fd167a5a9ae121d1902c6cce29c1 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 4 Dec 2023 17:30:19 +0800
Subject: [PATCH 5/8] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=88=9B=E5=BB=BA=E5=88=80=E4=BD=8D=E6=97=B6=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=88=9B=E5=BB=BA=E5=AF=B9=E5=BA=94=E5=88=80=E4=BD=8D?=
 =?UTF-8?q?=E7=9A=84=E6=9C=BA=E5=BA=8A=E6=8D=A2=E5=88=80=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=9B2=E3=80=81=E6=9C=BA=E5=BA=8A?=
 =?UTF-8?q?=E6=8D=A2=E5=88=80=E7=94=B3=E8=AF=B7=E6=A8=A1=E5=9E=8B=E7=9A=84?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E3=80=81=E5=88=80=E4=BD=8D=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=8F=AA=E8=AF=BB=EF=BC=8C=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E8=A7=86=E5=9B=BE=E6=96=B0=E5=A2=9E=E6=8C=89=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=90=9C=E7=B4=A2=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/product_template.py  | 18 ++++++++++++++----
 sf_tool_management/models/base.py            | 18 ++++++++++--------
 sf_tool_management/views/tool_base_views.xml |  7 ++++---
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 124e0058..bed75e6d 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -88,19 +88,19 @@ class ResProductMo(models.Model):
     cutting_tool_run_out_accuracy_min = fields.Float('端跳精度min', digits=(6, 1))
     cutting_tool_blade_tip_working_size = fields.Char('刀尖处理尺寸(R半径mm/倒角)', size=20)
     fit_blade_shape_id = fields.Many2one('maintenance.equipment.image',
-                                          '适配刀片形状', domain=[('type', '=', '刀片形状')])
+                                         '适配刀片形状', domain=[('type', '=', '刀片形状')])
     suitable_machining_method_ids = fields.Many2many('maintenance.equipment.image',
                                                      'rel_machining_product_template', '适合加工方式',
                                                      domain=[('type', '=', '加工能力')])
     blade_tip_characteristics_id = fields.Many2one('maintenance.equipment.image', '刀尖特征',
-                                                    domain=[('type', '=', '刀尖特征')])
-    handle_type_id = fields.Many2one('maintenance.equipment.image',  '柄部类型',domain=[('type', '=', '柄部类型')])
+                                                   domain=[('type', '=', '刀尖特征')])
+    handle_type_id = fields.Many2one('maintenance.equipment.image', '柄部类型', domain=[('type', '=', '柄部类型')])
     cutting_direction_ids = fields.Many2many('maintenance.equipment.image', 'rel_cutting_product_template',
                                              '走刀方向', domain=[('type', '=', '走刀方向')])
     suitable_coolant_ids = fields.Many2many('maintenance.equipment.image', 'rel_coolant_product_template',
                                             '适合冷却液', domain=[('type', '=', '冷却液')])
     compaction_way_id = fields.Many2one('maintenance.equipment.image',
-                                          '压紧方式', domain=[('type', '=', '压紧方式')])
+                                        '压紧方式', domain=[('type', '=', '压紧方式')])
 
     @api.onchange('cutting_tool_material_id')
     def _onchange_cutting_tool_material_id(self):
@@ -873,3 +873,13 @@ class SfMaintenanceEquipmentTool(models.Model):
         for record in self:
             if record.code:
                 record.name = record.code
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        tools = super().create(vals_list)
+        for tool in tools:
+            self.env['sf.machine.table.tool.changing.apply'].sudo().create({
+                'maintenance_equipment_id': tool.equipment_id.id,
+                'cutter_spacing_code_id': tool.id
+            })
+        return tools
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index b5e62d6e..101f9049 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -42,10 +42,12 @@ class FunctionalCuttingToolEntity(models.Model):
     #     计算库存位置数量
     #     """
     #     for obj in self:
-    #         if obj.current_location_id.name in ('组装后', '刀具房'):
-    #             obj.tool_room_num = 1
-    #             obj.line_edge_knife_library_num = 0
-    #             obj.machine_knife_library_num = 0
+    #         if obj.current_location_id:
+    #             if obj.current_location_id.name in ('组装后', '刀具房'):
+    #                 obj.tool_room_num = 1
+    #                 obj.line_edge_knife_library_num = 0
+    #                 obj.machine_knife_library_num = 0
+    #
 
     @api.model
     def _read_group_mrs_cutting_tool_type_id(self, categories, domain, order):
@@ -258,14 +260,14 @@ class MachineTableToolChangingApply(models.Model):
 
     name = fields.Char('名称', related='maintenance_equipment_id.name', store=True)
     # 设备信息
-    maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='CNC机床', required=True, readonly=False,
+    maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='CNC机床', readonly=True,
                                                domain=[('category_id.equipment_type', '=', '机床')])
     production_line_id = fields.Many2one('sf.production.line', string='生产线', readonly=True,
                                          group_expand='_read_group_names')
     machine_table_type_id = fields.Many2one('maintenance.equipment.category', string='机床类型', readonly=True,
                                             compute='_compute_machine_table_type_id')
     machine_tool_code = fields.Char(string='机台号', store=True, invisible=True, readonly=True)
-    cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=False,
+    cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=True,
                                              required=True, domain="[('equipment_id', '=', maintenance_equipment_id)]")
     # 功能刀具信息
     functional_tool_name = fields.Char(string='刀具名称', related='functional_tool_name_id.name', store=True)
@@ -279,7 +281,7 @@ class MachineTableToolChangingApply(models.Model):
     tool_position_interface_type = fields.Selection(
         [('BT刀柄式', 'BT刀柄式'), ('SK刀柄式', 'SK刀柄式'), ('HSK刀柄式', 'HSK刀柄式'),
          ('CAT刀柄式', 'CAT刀柄式'), ('ISO刀盘式', 'ISO刀盘式'), ('DIN刀盘式', 'DIN刀盘式'),
-         ('直装固定式', '直装固定式')], string='刀位接口型号', required=True)
+         ('直装固定式', '直装固定式')], string='刀位接口型号')
     diameter = fields.Integer(string='刀具直径(mm)', )
     knife_tip_r_angle = fields.Float(string='刀尖R角(mm)')
     max_lifetime_value = fields.Integer(string='最大寿命值(min)')
@@ -305,7 +307,7 @@ class MachineTableToolChangingApply(models.Model):
     @api.depends('alarm_value', 'used_value')
     def _compute_functional_tool_status(self):
         for record in self:
-            if record.alarm_value <= record.used_value:
+            if record.alarm_value < record.used_value:
                 record.functional_tool_status = '报警'
             else:
                 record.functional_tool_status = '正常'
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 6e2258e5..745edac7 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -634,15 +634,15 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="maintenance_equipment_id" readonly="0" placeholder="请选择"/>
+                                <field name="maintenance_equipment_id" readonly="1" placeholder="请选择"/>
                             </h1>
                         </div>
                         <group>
                             <group>
                                 <field name="production_line_id"/>
                                 <field name="machine_table_type_id"/>
-                                <field name="cutter_spacing_code_id"/>
-                                <field name="tool_position_interface_type" placeholder="请选择"/>
+                                <field name="cutter_spacing_code_id" options="{'no_create': True}"/>
+                                <field name="tool_position_interface_type" placeholder="请选择" required="1"/>
                                 <field name="sf_functional_tool_assembly_id" string="组装单"/>
                             </group>
                         </group>
@@ -698,6 +698,7 @@
                     <field name="applicant" optional="hide"/>
                     <searchpanel>
                         <field name="production_line_id" enable_counters="1" icon="fa-building"/>
+                        <field name="maintenance_equipment_id" enable_counters="1" icon="fa-building"/>
                         <field name="functional_tool_status" enable_counters="1" icon="fa-building"/>
                     </searchpanel>
                 </search>

From c753df768d97e7afc5a6c8ea207ac7941532b49d Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Tue, 5 Dec 2023 17:24:19 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/__manifest__.py              |  2 +-
 sf_manufacturing/security/group_security.xml  |  7 +-
 sf_manufacturing/security/ir.model.access.csv | 15 ++-
 sf_warehouse/__manifest__.py                  |  4 +-
 sf_warehouse/security/ir.model.access.csv     | 96 ++++++++++++++++++-
 sf_warehouse/security/sf_stock_security.xml   | 18 ++++
 6 files changed, 122 insertions(+), 20 deletions(-)
 create mode 100644 sf_warehouse/security/sf_stock_security.xml

diff --git a/sf_manufacturing/__manifest__.py b/sf_manufacturing/__manifest__.py
index d963ab3e..85e71a5d 100644
--- a/sf_manufacturing/__manifest__.py
+++ b/sf_manufacturing/__manifest__.py
@@ -10,7 +10,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'stock'],
+    'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse'],
     'data': [
         'data/stock_data.xml',
         'security/group_security.xml',
diff --git a/sf_manufacturing/security/group_security.xml b/sf_manufacturing/security/group_security.xml
index 236a0375..fdbc3ae5 100644
--- a/sf_manufacturing/security/group_security.xml
+++ b/sf_manufacturing/security/group_security.xml
@@ -1,10 +1,5 @@
 <odoo>
     <data>
-<!--        &lt;!&ndash; 系统管理相关 &ndash;&gt;-->
-<!--        <record id="group_master_data_manager" model="res.groups">-->
-<!--            <field name="name">基础设置</field>-->
-<!--            <field name="category_id" ref="base.module_category_employee"/>-->
-<!--            <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>-->
-<!--        </record>-->
+
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_manufacturing/security/ir.model.access.csv b/sf_manufacturing/security/ir.model.access.csv
index 1eadee0a..36c02ee7 100644
--- a/sf_manufacturing/security/ir.model.access.csv
+++ b/sf_manufacturing/security/ir.model.access.csv
@@ -1,18 +1,18 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_sf_cnc_processing,sf_cnc_processing,model_sf_cnc_processing,sf_base.group_sf_mrp_user,1,0,0,0
-access_sf_cnc_processing_manager,sf_cnc_processing,model_sf_cnc_processing,sf_base.group_sf_mrp_manager,1,1,1,1
+access_sf_cnc_processing_manager,sf_cnc_processing,model_sf_cnc_processing,sf_base.group_sf_mrp_manager,1,1,1,0
 access_sf_model_type,sf_model_type,model_sf_model_type,sf_base.group_sf_mrp_user,1,0,0,0
-access_sf_model_type_manager,sf_model_type,model_sf_model_type,sf_base.group_sf_mrp_manager,1,1,1,1
+access_sf_model_type_manager,sf_model_type,model_sf_model_type,sf_base.group_sf_mrp_manager,1,1,1,0
 access_sf_product_model_type_routing_sort,sf_product_model_type_routing_sort,model_sf_product_model_type_routing_sort,sf_base.group_sf_mrp_user,1,0,0,0
-access_sf_product_model_type_routing_sort_manager,sf_product_model_type_routing_sort,model_sf_product_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,1
+access_sf_product_model_type_routing_sort_manager,sf_product_model_type_routing_sort,model_sf_product_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,0
 access_sf_embryo_model_type_routing_sort,sf_embryo_model_type_routing_sort,model_sf_embryo_model_type_routing_sort,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_embryo_model_type_routing_sort_manager,sf_embryo_model_type_routing_sort,model_sf_embryo_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,1
 access_sf_surface_technics_model_type_routing_sort,sf_surface_technics_model_type_routing_sort,model_sf_surface_technics_model_type_routing_sort,sf_base.group_sf_mrp_user,1,0,0,0
-access_sf_surface_technics_model_type_routing_sort_manager,sf_surface_technics_model_type_routing_sort,model_sf_surface_technics_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,1
+access_sf_surface_technics_model_type_routing_sort_manager,sf_surface_technics_model_type_routing_sort,model_sf_surface_technics_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,0
 access_sf_production_line,sf.production.line,model_sf_production_line,sf_base.group_sf_mrp_user,1,0,0,0
-access_sf_production_line_manager,sf.production.line,model_sf_production_line,sf_base.group_sf_mrp_manager,1,1,1,1
+access_sf_production_line_manager,sf.production.line,model_sf_production_line,sf_base.group_sf_mrp_manager,1,1,1,0
 access_maintenance_equipment_tool,maintenance_equipment_tool,model_maintenance_equipment_tool,sf_base.group_sf_mrp_user,1,0,0,0
-access_maintenance_equipment_tool_manager,maintenance_equipment_tool,model_maintenance_equipment_tool,sf_base.group_sf_mrp_manager,1,1,1,1
+access_maintenance_equipment_tool_manager,maintenance_equipment_tool,model_maintenance_equipment_tool,sf_base.group_sf_mrp_manager,1,1,1,0
 access_mrp_production,mrp_production,model_mrp_production,sf_base.group_sf_mrp_user,1,0,0,0
 access_mrp_production_manager,mrp_production,model_mrp_production,sf_base.group_sf_mrp_manager,1,1,1,0
 access_mrp_workorder,mrp_workorder,model_mrp_workorder,sf_base.group_sf_mrp_user,1,0,0,0
@@ -22,6 +22,3 @@ access_mrp_workcenter_manager,mrp_workcenter,model_mrp_workcenter,sf_base.group_
 access_mrp_workcenter_productivity,mrp_workcenter_productivity,model_mrp_workcenter_productivity,sf_base.group_sf_mrp_user,1,0,0,0
 access_mrp_workcenter_productivity_manager,mrp_workcenter_productivity,model_mrp_workcenter_productivity,sf_base.group_sf_mrp_manager,1,1,1,0
 
-
-
-
diff --git a/sf_warehouse/__manifest__.py b/sf_warehouse/__manifest__.py
index c3cdf682..eb5f27dd 100644
--- a/sf_warehouse/__manifest__.py
+++ b/sf_warehouse/__manifest__.py
@@ -12,8 +12,8 @@
     'website': 'https://www.sf.jikimo.com',
     'depends': ['stock', 'web', ],
     'data': [
-        # 'security/group_security.xml',
-        # 'security/ir.model.access.csv',
+        'security/sf_stock_security.xml',
+        'security/ir.model.access.csv',
         'views/view.xml',
     ],
     'demo': [
diff --git a/sf_warehouse/security/ir.model.access.csv b/sf_warehouse/security/ir.model.access.csv
index 94ce7d2b..2b36e265 100644
--- a/sf_warehouse/security/ir.model.access.csv
+++ b/sf_warehouse/security/ir.model.access.csv
@@ -1,4 +1,96 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_stock_location,stock.location,model_stock_location,base.group_user,1,1,1,1
-
+access_stock_location,stock.location,model_stock_location,base.group_user,1,1,1,0
 
+access_procurement_group,procurement.group,stock.model_procurement_group,base.group_user,1,1,1,0
+access_stock_warehouse_manager,stock.warehouse.manager,stock.model_stock_warehouse,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_warehouse_user,stock.warehouse.user,stock.model_stock_warehouse,base.group_user,1,0,0,0
+access_stock_location_partner_manager,stock.location.partner.manager,stock.model_stock_location,base.group_partner_manager,1,0,0,0
+access_stock_location_manager,stock.location.manager,stock.model_stock_location,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_location_user,stock.location.user,stock.model_stock_location,base.group_user,1,0,0,0
+access_stock_picking_user,stock.picking user,stock.model_stock_picking,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_picking_manager,stock.picking manager,stock.model_stock_picking,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_picking_type_all,stock.picking.type all users,stock.model_stock_picking_type,base.group_user,1,0,0,0
+access_stock_picking_type_user,stock.picking.type user,stock.model_stock_picking_type,sf_warehouse.group_sf_stock_user,1,0,0,0
+access_stock_picking_type_manager,stock.picking.type manager,stock.model_stock_picking_type,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_lot_user,stock.lot user,stock.model_stock_lot,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_move_manager,stock.move manager,stock.model_stock_move,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_move_user,stock.move user,stock.model_stock_move,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_product_product_stock_user,product_product_stock_user,product.model_product_product,sf_warehouse.group_sf_stock_user,1,0,0,0
+access_product_template_stock_user,product.template stock user,product.model_product_template,sf_warehouse.group_sf_stock_user,1,0,0,0
+access_uom_category_stock_manager,uom.category stock_manager,uom.model_uom_category,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_uom_uom_stock_manager,uom.uom stock_manager,uom.model_uom_uom,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_product_category_stock_manager,product.category stock_manager,product.model_product_category,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_product_template_stock_manager,product.template stock_manager,product.model_product_template,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_product_product_stock_manager,product.product stock_manager,product.model_product_product,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_product_packaging_stock_manager,product.packaging stock_manager,product.model_product_packaging,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_product_supplierinfo_stock_manager,product.supplierinfo stock_manager,product.model_product_supplierinfo,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_product_pricelist_stock_manager,product.pricelist stock_manager,product.model_product_pricelist,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_product_group_res_partner_stock_manager,res_partner group_stock_manager,base.model_res_partner,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_product_pricelist_item_stock_manager,product.pricelist.item stock_manager,product.model_product_pricelist_item,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_product_tag_stock_manager,product.tag.stock.manager,product.model_product_tag,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_warehouse_orderpoint,stock.warehouse.orderpoint,stock.model_stock_warehouse_orderpoint,sf_warehouse.group_sf_stock_user,1,0,0,0
+access_stock_warehouse_orderpoint_system,stock.warehouse.orderpoint system,stock.model_stock_warehouse_orderpoint,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_quant_user,stock.quant user,stock.model_stock_quant,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_quant_all,stock.quant all users,stock.model_stock_quant,base.group_user,1,0,0,0
+access_stock_quant_package_all,stock.quant.package all users,stock.model_stock_quant_package,base.group_user,1,0,0,0
+access_stock_quant_package_stock_manager,stock.quant.package stock manager,stock.model_stock_quant_package,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_quant_package_stock_user,stock.quant.package stock user,stock.model_stock_quant_package,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_package_level_all,stock.package_level all users,stock.model_stock_package_level,base.group_user,1,0,0,0
+access_stock_package_level_stock_manager,stock.package_level stock manager,stock.model_stock_package_level,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_package_level_stock_user,stock.package_level stock user,stock.model_stock_package_level,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_rule_user,stock_rule user,stock.model_stock_rule,sf_warehouse.group_sf_stock_user,1,0,0,0
+access_stock_rule_stock_manager,stock_rule stock manager,stock.model_stock_rule,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_location_route_stock_manager,stock.route,stock.model_stock_route,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_location_route,stock.route,stock.model_stock_route,base.group_user,1,0,0,0
+access_stock_rule_internal,stock.rule.flow internal,stock.model_stock_rule,base.group_user,1,0,0,0
+access_stock_move_line_manager,stock.move.line manager,stock.model_stock_move_line,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_move_line_user,stock.move.line user,stock.model_stock_move_line,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_move_line_all,stock.move.line all users,stock.model_stock_move_line,base.group_user,1,1,1,0
+access_stock_putaway_all,stock.putaway.rule all users,stock.model_stock_putaway_rule,base.group_user,1,0,0,0
+access_stock_putaway_manager,stock.putaway.rule all managers,stock.model_stock_putaway_rule,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_removal_all,product.removal all users,stock.model_product_removal,base.group_user,1,0,0,0
+access_barcode_nomenclature_stock_user,barcode.nomenclature.stock.user,barcodes.model_barcode_nomenclature,sf_warehouse.group_sf_stock_user,1,0,0,0
+access_barcode_nomenclature_stock_manager,barcode.nomenclature.stock.manager,barcodes.model_barcode_nomenclature,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_barcode_rule_stock_user,barcode.rule.stock.user,barcodes.model_barcode_rule,sf_warehouse.group_sf_stock_user,1,0,0,0
+access_barcode_rule_stock_manager,barcode.rule.stock.manager,barcodes.model_barcode_rule,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_scrap_user,stock.scrap.user,stock.model_stock_scrap,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_scrap_manager,stock.scrap.manager,stock.model_stock_scrap,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_product_attribute_manager,product.attribute manager,product.model_product_attribute,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_product_attribute_value_manager,product.attribute manager value,product.model_product_attribute_value,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_product_product_attribute_manager,product.product.attribute manager value,product.model_product_template_attribute_value,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_product_template_attribute_exclusion_manager,product.attribute manager filter line,product.model_product_template_attribute_exclusion,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_product_template_attribute_line_manager,product.attribute manager line,product.model_product_template_attribute_line,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_report_stock_quantity,access_report_stock_quantity,stock.model_report_stock_quantity,base.group_user,1,0,0,0
+access_stock_traceability_report,access.stock.traceability.report,stock.model_stock_traceability_report,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_assign_serial,access.stock.assign.serial,stock.model_stock_assign_serial,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_return_picking_line,access.stock.return.picking.line,stock.model_stock_return_picking_line,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_return_picking,access.stock.return.picking,stock.model_stock_return_picking,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_change_product_qty,access.stock.change.product.qty,stock.model_stock_change_product_qty,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_scheduler_compute,access.stock.scheduler.compute,stock.model_stock_scheduler_compute,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_immediate_transfer_line,access.stock.immediate.transfer.line,stock.model_stock_immediate_transfer_line,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_immediate_transfer,access.stock.immediate.transfer,stock.model_stock_immediate_transfer,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_backorder_confirmation_line,access.stock.backorder.confirmation.line,stock.model_stock_backorder_confirmation_line,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_backorder_confirmation,access.stock.backorder.confirmation,stock.model_stock_backorder_confirmation,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_quantity_history,access.stock.quantity.history,stock.model_stock_quantity_history,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_rules_report,access.stock.rules.report,stock.model_stock_rules_report,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_warn_insufficient_qty_scrap,access.stock.warn.insufficient.qty.scrap,stock.model_stock_warn_insufficient_qty_scrap,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_product_replenish,access.product.replenish,stock.model_product_replenish,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_track_confirmation,access.stock.track.confirmation,stock.model_stock_track_confirmation,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_track_line,access.stock.track.line,stock.model_stock_track_line,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_package_destination,access.stock.package.destination,stock.model_stock_package_destination,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_orderpoint_snooze,access_stock_orderpoint_snooze,stock.model_stock_orderpoint_snooze,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_package_type_user,access_stock_package_type_user,stock.model_stock_package_type,sf_warehouse.group_sf_stock_user,1,0,0,0
+access_stock_package_type_manager,access_stock_package_type_manager,stock.model_stock_package_type,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_storage_category_user,stock.storage.category.user,stock.model_stock_storage_category,base.group_user,1,0,0,0
+access_stock_storage_category_manager,stock.storage.category.manager,stock.model_stock_storage_category,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_storage_category_capacity_user,stock.storage.category.capacity.user,stock.model_stock_storage_category_capacity,base.group_user,1,0,0,0
+access_stock_storage_category_capacity_manager,stock.storage.category.capacity.manager,stock.model_stock_storage_category_capacity,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_inventory_conflict,stock.inventory.conflict,stock.model_stock_inventory_conflict,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_inventory_warning,stock.inventory.warning,stock.model_stock_inventory_warning,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_inventory_adjustment_name,stock.inventory.adjustment.name,stock.model_stock_inventory_adjustment_name,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_request_count,stock.request.count,stock.model_stock_request_count,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_replenishment_info,stock.replenishment.info,stock.model_stock_replenishment_info,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_picking_label_type_user,picking.label.type.user,stock.model_picking_label_type,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_lot_label_layout_user,lot.label.layout.user,stock.model_lot_label_layout,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_stock_replenish_option,stock.replenishment.option,stock.model_stock_replenishment_option,sf_warehouse.group_sf_stock_user,1,1,1,0
+access_mrp_production,mrp.production,mrp.model_mrp_production,sf_warehouse.group_sf_stock_user,1,1,1,0
diff --git a/sf_warehouse/security/sf_stock_security.xml b/sf_warehouse/security/sf_stock_security.xml
new file mode 100644
index 00000000..0ed46055
--- /dev/null
+++ b/sf_warehouse/security/sf_stock_security.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+<data noupdate="0">
+
+    <record id="group_sf_stock_user" model="res.groups">
+        <field name="name">仓储岗</field>
+        <field name="category_id" ref="base.module_category_inventory_inventory"/>
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
+    </record>
+    <record id="group_sf_stock_manager" model="res.groups">
+        <field name="name">仓储总监</field>
+        <field name="category_id" ref="base.module_category_inventory_inventory"/>
+        <field name="implied_ids" eval="[(4, ref('group_sf_stock_user'))]"/>
+    </record>
+
+
+</data>
+</odoo>

From 0d8d54c05be8a957453facdc6be8b511a1bacbc9 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 5 Dec 2023 17:37:47 +0800
Subject: [PATCH 7/8] =?UTF-8?q?1=E3=80=81=E6=9C=BA=E5=BA=8A=E6=8D=A2?=
 =?UTF-8?q?=E5=88=80=E7=94=B3=E8=AF=B7=E6=96=B0=E5=A2=9E=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E6=8D=A2=E5=88=80=E6=97=B6=EF=BC=8C=E4=BE=9D=E6=AC=A1=E6=A3=80?=
 =?UTF-8?q?=E7=B4=A2=E7=BA=BF=E8=BE=B9=E5=88=80=E5=BA=93=E3=80=81=E5=88=80?=
 =?UTF-8?q?=E5=85=B7=E6=88=BF=E6=98=AF=E5=90=A6=E6=9C=89=E6=BB=A1=E8=B6=B3?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=9A=84=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=9C=89=E5=B0=B1=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=B0=B1=E5=8F=91=E8=B5=B7=E7=BB=84=E8=A3=85=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=EF=BC=9B2=E3=80=81=E5=88=80=E5=85=B7=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=A8=A1=E5=9E=8B=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=AF=E4=BF=AE=E6=94=B9=E7=9A=84=E6=9C=80?=
 =?UTF-8?q?=E4=BD=8E=E5=BA=93=E5=AD=98=E9=87=8F=E3=80=81=E6=9C=80=E9=AB=98?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E9=87=8F=E3=80=81=E6=89=B9=E6=AC=A1=E8=A1=A5?=
 =?UTF-8?q?=E8=B4=A7=E9=87=8F=E5=AD=97=E6=AE=B5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/models/base.py            | 24 ++++++-
 sf_tool_management/views/tool_base_views.xml | 31 +++++----
 sf_tool_management/wizard/wizard.py          | 70 ++++++++++++--------
 3 files changed, 81 insertions(+), 44 deletions(-)

diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 101f9049..92242197 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -232,7 +232,13 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
     def _compute_tool_stock_total(self):
         for record in self:
             if record:
-                self.tool_stock_total = record.tool_stock_num + record.side_shelf_num + record.on_tool_stock_num
+                record.tool_stock_total = record.tool_stock_num + record.side_shelf_num + record.on_tool_stock_num
+
+    # @api.depends('tool_stock_total', 'min_stock_num', 'max_stock_num')
+    # def _compute_batch_replenishment_num(self):
+    #     for record in self:
+    #         if record.tool_stock_total < record.min_stock_num:
+    #             record.batch_replenishment_num = record.max_stock_num - record.tool_stock_total
 
     def create_or_edit_safety_stock(self, vals, sf_functional_cutting_tool_entity_ids):
         """
@@ -365,7 +371,7 @@ class MachineTableToolChangingApply(models.Model):
                 'use_tool_time': fields.Datetime.now() + timedelta(hours=4),
                 'production_line_name_id': self.production_line_id.id,
                 'machine_tool_name_id': self.maintenance_equipment_id.id,
-                'applicant': self.applicant,
+                'applicant': '系统自动',
                 'apply_time': fields.Datetime.now(),
                 'cutter_spacing_code_id': self.cutter_spacing_code_id.id,
                 'whether_standard_knife': self.whether_standard_knife,
@@ -687,6 +693,20 @@ class FunctionalToolAssembly(models.Model):
             code = False
         return code
 
+    def get_functional_tool(self, val):
+        functional_tools = self.env['sf.functional.tool.assembly'].search(
+            [('after_assembly_functional_tool_name', '=', val.get('after_assembly_functional_tool_name')),
+             ('after_assembly_functional_tool_diameter', '=', val.get('after_assembly_functional_tool_diameter')),
+             ('after_assembly_knife_tip_r_angle', '=', val.get('after_assembly_knife_tip_r_angle')),
+             ('after_assembly_coarse_middle_thin', '=', val.get('after_assembly_coarse_middle_thin'))])
+        for functional_tool in functional_tools:
+            if functional_tool.barcode_id.quant_ids[-1].location_id.name == '刀具线边库':
+                return functional_tool
+        for functional_tool in functional_tools:
+            if functional_tool.barcode_id.quant_ids[-1].location_id.name == '刀具房':
+                return functional_tool
+        return False
+
     def automated_assembly(self):
         """
         todo 自动组装
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 745edac7..a5e09fb8 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -301,7 +301,7 @@
             <field name="name">功能刀具安全库存</field>
             <field name="model">sf.real.time.distribution.of.functional.tools</field>
             <field name="arch" type="xml">
-                <form create="0" edit="0" delete="0">
+                <form create="0" edit="1" delete="0">
                     <sheet>
                         <div class="oe_title">
                             <h1>
@@ -310,41 +310,44 @@
                         </div>
                         <group>
                             <group>
-                                <field name="sf_cutting_tool_type_id"/>
-                                <field name="diameter"/>
-                                <field name="knife_tip_r_angle"/>
-                                <field name="coarse_middle_thin"/>
-                                <field name="whether_standard_knife"/>
+                                <field name="sf_cutting_tool_type_id" readonly="1"/>
+                                <field name="diameter" readonly="1"/>
+                                <field name="knife_tip_r_angle" readonly="1"/>
+                                <field name="coarse_middle_thin" readonly="1"/>
+                                <field name="whether_standard_knife" readonly="1"/>
+                                <field name="min_stock_num"/>
+                                <field name="max_stock_num"/>
+                                <field name="batch_replenishment_num"/>
                             </group>
                             <group>
-                                <field name="image" widget='image'/>
+                                <field name="image" widget='image' readonly="1"/>
                             </group>
                         </group>
                         <group col="1">
                             <group string="适合加工方式">
                                 <field name="suitable_machining_method_ids" string=""
-                                       widget="custom_many2many_checkboxes"
+                                       widget="custom_many2many_checkboxes" readonly="1"
                                        domain="[('id','in',suitable_machining_method_ids)]"/>
                             </group>
                             <group>
                                 <group string="刀尖特征">
                                     <field name="blade_tip_characteristics_id" string=""
-                                           widget="many2one_radio"
+                                           widget="many2one_radio" readonly="1"
                                            domain="[('id','in',blade_tip_characteristics_id)]"/>
                                 </group>
                                 <group string="柄部类型">
                                     <field name="handle_type_id" string=""
-                                           widget="many2one_radio"
+                                           widget="many2one_radio" readonly="1"
                                            domain="[('id','in',handle_type_id)]"/>
                                 </group>
                             </group>
                             <group>
                                 <group string="走刀方向">
-                                    <field name="cutting_direction_ids" string="" widget="custom_many2many_checkboxes"
+                                    <field name="cutting_direction_ids" string="" widget="custom_many2many_checkboxes" readonly="1"
                                            domain="[('id','in',cutting_direction_ids)]"/>
                                 </group>
                                 <group string="适合冷却液">
-                                    <field name="suitable_coolant_ids" string="" widget="custom_many2many_checkboxes"
+                                    <field name="suitable_coolant_ids" string="" widget="custom_many2many_checkboxes" readonly="1"
                                            domain="[('id','in',suitable_coolant_ids)]"/>
                                 </group>
                             </group>
@@ -352,7 +355,7 @@
                         <notebook>
                             <page string="刀具信息">
                                 <field name="sf_functional_cutting_tool_entity_ids" widget="many2many">
-                                    <tree>
+                                    <tree edit="0" create="0" delete="0">
                                         <field name="barcode_id"/>
                                         <field name="functional_tool_name_id"/>
                                         <field name="new_former"/>
@@ -468,7 +471,7 @@
             <field name="name">机床换刀申请</field>
             <field name="model">sf.machine.table.tool.changing.apply</field>
             <field name="arch" type="xml">
-                <tree>
+                <tree create="0" delete="0">
                     <field name="name" invisible="1"/>
                     <field name="production_line_id" invisible="1"/>
                     <field name="maintenance_equipment_id"/>
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index 2c81cb31..b072ec2c 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -62,33 +62,47 @@ class ToolChangeRequirementInformation(models.TransientModel):
              ('cutter_spacing_code_id', '=', self.cutter_spacing_code_id.id)
              ])
 
-        # 功能刀具组装创建新任务(new_assembly_task)
-        sf_functional_tool_assembly = self.env['sf.functional.tool.assembly'].sudo().create({
-            'functional_tool_name': self.replacement_tool_name,
-            'functional_tool_type_id': self.replacement_tool_type_id.id,
-            'functional_tool_diameter': self.replacement_diameter,
-            'knife_tip_r_angle': self.replacement_knife_tip_r_angle,
-            'coarse_middle_thin': self.replacement_tool_coarse_middle_thin,
-            'new_former': self.new_former,
-            'tool_loading_length': self.replacement_tool_setting_length,
-            'functional_tool_length': self.replacement_extension_length,
-            'effective_length': self.replacement_effective_length,
-            'loading_task_source': '1',
-            'use_tool_time': self.used_tool_time,
-            'production_line_name_id': self.production_line_id.id,
-            'machine_tool_name_id': self.maintenance_equipment_id.id,
-            'applicant': self.applicant,
-            'apply_time': fields.Datetime.now(),
-            'cutter_spacing_code_id': self.cutter_spacing_code_id.id,
-            'whether_standard_knife': self.whether_standard_knife,
-            'reason_for_applying': self.reason_for_applying,
-            'sf_machine_table_tool_changing_apply_id': record.id
-        })
-        # 修改机床换刀申请状态
-        record.write({
-            'status': '1',
-            'sf_functional_tool_assembly_id': sf_functional_tool_assembly.id
+        # 搜索满足需求的功能刀具
+        functional_tool = self.env['sf.functional.tool.assembly'].get_functional_tool({
+            'after_assembly_functional_tool_name': self.replacement_tool_name,
+            'after_assembly_functional_tool_diameter': self.replacement_diameter,
+            'after_assembly_knife_tip_r_angle': self.replacement_knife_tip_r_angle,
+            'after_assembly_coarse_middle_thin': self.replacement_tool_coarse_middle_thin
         })
+        # 如果有满足需求的刀具，就返回刀具信息
+        if functional_tool:
+            record.write({'status': '3'})
+            # todo 将功能刀具信息传递到机床
+            return functional_tool
+        # 如果没有满足需求的刀具，就创建功能刀具组装单
+        else:
+            # 功能刀具组装创建新任务(new_assembly_task)
+            sf_functional_tool_assembly = self.env['sf.functional.tool.assembly'].sudo().create({
+                'functional_tool_name': self.replacement_tool_name,
+                'functional_tool_type_id': self.replacement_tool_type_id.id,
+                'functional_tool_diameter': self.replacement_diameter,
+                'knife_tip_r_angle': self.replacement_knife_tip_r_angle,
+                'coarse_middle_thin': self.replacement_tool_coarse_middle_thin,
+                'new_former': self.new_former,
+                'tool_loading_length': self.replacement_tool_setting_length,
+                'functional_tool_length': self.replacement_extension_length,
+                'effective_length': self.replacement_effective_length,
+                'loading_task_source': '1',
+                'use_tool_time': self.used_tool_time,
+                'production_line_name_id': self.production_line_id.id,
+                'machine_tool_name_id': self.maintenance_equipment_id.id,
+                'applicant': self.applicant,
+                'apply_time': fields.Datetime.now(),
+                'cutter_spacing_code_id': self.cutter_spacing_code_id.id,
+                'whether_standard_knife': self.whether_standard_knife,
+                'reason_for_applying': self.reason_for_applying,
+                'sf_machine_table_tool_changing_apply_id': record.id
+            })
+            # 修改机床换刀申请状态
+            record.write({
+                'status': '1',
+                'sf_functional_tool_assembly_id': sf_functional_tool_assembly.id
+            })
 
         # 关闭弹出窗口
         return {'type': 'ir.actions.act_window_close'}
@@ -323,14 +337,14 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
                                                              string='组装后功能刀具类型')
     after_assembly_functional_tool_diameter = fields.Integer(string='组装后功能刀具直径(mm)')
     after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)')
-    after_assembly_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='组装后新/旧')
+    after_assembly_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='组装后新/旧', default='0')
     cut_time = fields.Integer(string='已切削时间(min)')
     cut_length = fields.Float(string='已切削长度(mm)')
     cut_number = fields.Integer(string='已切削次数')
 
     after_assembly_whether_standard_knife = fields.Boolean(string='组装后是否标准刀', default=True)
     after_assembly_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')],
-                                                         string='组装后粗/中/精')
+                                                         string='组装后粗/中/精', default='3')
     after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)')
     after_assembly_alarm_value = fields.Integer(string='组装后报警值(min)')
     after_assembly_used_value = fields.Integer(string='组装后已使用值(min)')

From 70109c09656c68500ae07a403fff5796576a10ab Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Wed, 6 Dec 2023 11:31:59 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B6=E9=80=A0?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/security/group_security.xml           |  1 -
 sf_manufacturing/models/product_template.py   |  4 +-
 sf_manufacturing/security/ir.model.access.csv | 63 +++++++++++++++++++
 sf_sale/models/auto_quatotion_common.py       |  2 +-
 sf_sale/models/quick_easy_order.py            |  4 +-
 5 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/sf_base/security/group_security.xml b/sf_base/security/group_security.xml
index 4d57bc43..89dfa51a 100644
--- a/sf_base/security/group_security.xml
+++ b/sf_base/security/group_security.xml
@@ -3,7 +3,6 @@
         <record id="group_sf_mrp_user" model="res.groups">
             <field name="name">制造普通用户</field>
             <field name="category_id" ref="base.module_category_manufacturing_manufacturing"/>
-                       <field name="implied_ids" eval="[(4, ref('mrp.group_mrp_user'))]"/>
         </record>
 <!--        <record id="group_sf_mrp_manager" model="res.groups">-->
 <!--            <field name="name">制造管理用户</field>-->
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 29aa7c67..5a079abe 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -6,8 +6,8 @@ import os
 from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
 from odoo.modules import get_resource_path
-#from OCC.Extend.DataExchange import read_step_file
-#from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 
 
 class ResProductMo(models.Model):
diff --git a/sf_manufacturing/security/ir.model.access.csv b/sf_manufacturing/security/ir.model.access.csv
index 36c02ee7..0c620608 100644
--- a/sf_manufacturing/security/ir.model.access.csv
+++ b/sf_manufacturing/security/ir.model.access.csv
@@ -22,3 +22,66 @@ access_mrp_workcenter_manager,mrp_workcenter,model_mrp_workcenter,sf_base.group_
 access_mrp_workcenter_productivity,mrp_workcenter_productivity,model_mrp_workcenter_productivity,sf_base.group_sf_mrp_user,1,0,0,0
 access_mrp_workcenter_productivity_manager,mrp_workcenter_productivity,model_mrp_workcenter_productivity,sf_base.group_sf_mrp_manager,1,1,1,0
 
+access_mrp_workcenter_productivity_loss_manager,mrp.workcenter.productivity.loss,mrp.model_mrp_workcenter_productivity_loss,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_workcenter_productivity_loss,mrp.workcenter.productivity.loss,mrp.model_mrp_workcenter_productivity_loss,sf_base.group_sf_mrp_user,1,0,0,0
+access_mrp_workcenter_productivity_loss_type,mrp.workcenter.productivity.loss.type,mrp.model_mrp_workcenter_productivity_loss_type,sf_base.group_sf_mrp_user,1,0,0,0
+access_mrp_workcenter_productivity,mrp.workcenter.productivity,mrp.model_mrp_workcenter_productivity,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_workcenter,mrp.workcenter,mrp.model_mrp_workcenter,sf_base.group_sf_mrp_user,1,0,0,0
+access_mrp_routing_workcenter,mrp.routing.workcenter,mrp.model_mrp_routing_workcenter,sf_base.group_sf_mrp_user,1,0,0,0
+access_mrp_bom,mrp.bom,mrp.model_mrp_bom,sf_base.group_sf_mrp_user,1,0,0,0
+access_mrp_bom_line,mrp.bom.line,mrp.model_mrp_bom_line,sf_base.group_sf_mrp_user,1,0,0,0
+access_mrp_bom_byproduct_user,mrp.bom.byproduct,mrp.model_mrp_bom_byproduct,sf_base.group_sf_mrp_user,1,0,0,0
+access_mrp_production,mrp.production user,mrp.model_mrp_production,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_workcenter_manager,mrp.workcenter.manager,mrp.model_mrp_workcenter,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_routing_workcenter_manager,mrp.routing.workcenter.manager,mrp.model_mrp_routing_workcenter,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_bom_manager,mrp.bom.manager,mrp.model_mrp_bom,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_bom_line_manager,mrp.bom.line.manager,mrp.model_mrp_bom_line,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_bom_byproduct_manager,mrp.bom.byproduct manager,mrp.model_mrp_bom_byproduct,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_production_stock_worker,mrp.production stock_worker,mrp.model_mrp_production,stock.group_stock_user,1,0,0,0
+access_product_product_user,product.product user,product.model_product_product,sf_base.group_sf_mrp_user,1,0,0,0
+access_product_template_user,product.template user,product.model_product_template,sf_base.group_sf_mrp_user,1,0,0,0
+access_uom_uom_user,uom.uom user,uom.model_uom_uom,sf_base.group_sf_mrp_user,1,0,0,0
+access_product_supplierinfo_user,product.supplierinfo user,product.model_product_supplierinfo,sf_base.group_sf_mrp_user,1,1,1,0
+access_res_partner,res.partner,base.model_res_partner,sf_base.group_sf_mrp_user,1,0,0,0
+access_mrp_workorder_mrp_user,mrp.workorder.user,mrp.model_mrp_workorder,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_workorder_mrp_manager,mrp.workorder,mrp.model_mrp_workorder,sf_base.group_sf_mrp_user,1,1,1,0
+access_resource_calendar_leaves_user,mrp.resource.calendar.leaves.user,resource.model_resource_calendar_leaves,sf_base.group_sf_mrp_user,1,1,1,0
+access_resource_calendar_leaves_manager,mrp.resource.calendar.leaves.manager,resource.model_resource_calendar_leaves,sf_base.group_sf_mrp_user,1,0,0,0
+access_resource_calendar_attendance_mrp_user,mrp.resource.calendar.attendance.mrp.user,resource.model_resource_calendar_attendance,sf_base.group_sf_mrp_user,1,1,1,0
+access_resource_calendar_attendance_manager,mrp.resource.calendar.attendance.manager,resource.model_resource_calendar_attendance,sf_base.group_sf_mrp_user,1,1,1,0
+access_uom_category,uom.category,uom.model_uom_category,sf_base.group_sf_mrp_user,1,0,0,0
+access_resource_resource,resource.resource,resource.model_resource_resource,sf_base.group_sf_mrp_user,1,0,0,0
+access_resource_resource_manager,resource.resource.manager,resource.model_resource_resource,sf_base.group_sf_mrp_user,1,1,1,0
+access_product_supplierinfo_manager,product.supplierinfo user,product.model_product_supplierinfo,sf_base.group_sf_mrp_user,1,0,0,0
+access_mrp_production_manager,mrp.production manager,mrp.model_mrp_production,sf_base.group_sf_mrp_user,1,0,0,0
+access_mrp_bom_stockuser,mrp.bom,mrp.model_mrp_bom,stock.group_stock_user,1,0,0,0
+access_mrp_bom_line_stockuser,mrp.bom.line,mrp.model_mrp_bom_line,stock.group_stock_user,1,0,0,0
+access_uom_category_mrp_manager,uom.category mrp_manager,uom.model_uom_category,sf_base.group_sf_mrp_user,1,1,1,0
+access_uom_uom_mrp_manager,uom.uom mrp_manager,uom.model_uom_uom,sf_base.group_sf_mrp_user,1,1,1,0
+access_product_category_mrp_manager,product.category mrp_manager,product.model_product_category,sf_base.group_sf_mrp_user,1,1,1,0
+access_product_template_mrp_manager,product.template mrp_manager,product.model_product_template,sf_base.group_sf_mrp_user,1,1,1,0
+access_product_product_mrp_manager,product.product mrp_manager,product.model_product_product,sf_base.group_sf_mrp_user,1,1,1,0
+access_product_packaging_mrp_manager,product.packaging mrp_manager,product.model_product_packaging,sf_base.group_sf_mrp_user,1,1,1,0
+access_product_pricelist_mrp_manager,product.pricelist mrp_manager,product.model_product_pricelist,sf_base.group_sf_mrp_user,1,1,1,0
+access_product_group_res_partner_mrp_manager,res_partner sf_base.group_sf_mrp_manager,base.model_res_partner,sf_base.group_sf_mrp_user,1,1,1,0
+access_product_pricelist_item_mrp_manager,product.pricelist.item mrp_manager,product.model_product_pricelist_item,sf_base.group_sf_mrp_user,1,1,1,0
+access_product_tag_mrp_manager,product.tag.mrp.manager,product.model_product_tag,sf_base.group_sf_mrp_manager,1,1,1,0
+access_resource_calendar_manufacturinguser,resource.calendar manufacturing.user,resource.model_resource_calendar,sf_base.group_sf_mrp_user,1,0,0,0
+access_mrp_unbuild,mrp.unbuild,mrp.model_mrp_unbuild,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_unbuild_manager,mrp.unbuild manager,mrp.model_mrp_unbuild,sf_base.group_sf_mrp_manager,1,1,1,0
+access_mrp_document_mrp_manager,mrp.document group_user,mrp.model_mrp_document,sf_base.group_sf_mrp_manager,1,1,1,0
+access_mrp_document_mrp_user,mrp.document group_user,mrp.model_mrp_document,sf_base.group_sf_mrp_user,1,1,1,0
+access_change_production_qty,access.change.production.qty,mrp.model_change_production_qty,sf_base.group_sf_mrp_user,1,1,1,0
+access_stock_warn_insufficient_qty_unbuild,access.stock.warn.insufficient.qty.unbuild,mrp.model_stock_warn_insufficient_qty_unbuild,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_production_backorder,access.mrp.production.backorder,mrp.model_mrp_production_backorder,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_production_backorder_line,access.mrp.production.backorder.line,mrp.model_mrp_production_backorder_line,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_consumption_warning,access.mrp.consumption.warning,mrp.model_mrp_consumption_warning,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_consumption_warning_line,access.mrp.consumption.warning.line,mrp.model_mrp_consumption_warning_line,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_immediate_production,access.mrp.immediate.production,mrp.model_mrp_immediate_production,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_immediate_production_line,access.mrp.immediate.production.line,mrp.model_mrp_immediate_production_line,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_workcenter_tag_group_user,access.mrp.workcenter.tag,mrp.model_mrp_workcenter_tag,sf_base.group_sf_mrp_user,1,0,0,0
+access_mrp_workcenter_tag_manager,access.mrp.workcenter.tag,mrp.model_mrp_workcenter_tag,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_production_split_multi,access.mrp.production.split.multi,mrp.model_mrp_production_split_multi,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_production_split,access.mrp.production.split,mrp.model_mrp_production_split,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_production_split_line,access.mrp.production.split.line,mrp.model_mrp_production_split_line,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_workcenter_capacity_manager,mrp.workcenter.capacity.manager,mrp.model_mrp_workcenter_capacity,sf_base.group_sf_mrp_user,1,1,1,0
\ No newline at end of file
diff --git a/sf_sale/models/auto_quatotion_common.py b/sf_sale/models/auto_quatotion_common.py
index 1b29c6d2..09ea3f0f 100644
--- a/sf_sale/models/auto_quatotion_common.py
+++ b/sf_sale/models/auto_quatotion_common.py
@@ -2,7 +2,7 @@
 import logging
 from odoo.modules import get_resource_path
 from odoo import fields, models, api
-#from quatotion import readSql, feature_recognize, auto_quatotion
+from quatotion import readSql, feature_recognize, auto_quatotion
 
 __author__ = 'jinling.yang'
 _logger = logging.getLogger(__name__)
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index 5ec1fd52..1e5f274c 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -5,8 +5,8 @@ import os
 import json
 from datetime import datetime
 import requests
-#from OCC.Extend.DataExchange import read_step_file
-#from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 from odoo import models, fields, api
 from odoo.modules import get_resource_path
 from odoo.exceptions import ValidationError, UserError