1、计划管理-产线设备资源设置模块优化，工作日历设置模块优化，添加选择提示；2、刀具管理-功能刀具组装、列表、预警、实时分布、出入库记录和组装界面的刀具物料字段绑定对象更改为库存下的刀具物料；3、功能刀具组装-组装界面添加选择提示，4、功能刀具列表下的能力参数对没有选择的图片不展示

2023-09-25 13:43:08 +08:00
parent d4180df7e9
commit a538477272
7 changed files with 146 additions and 147 deletions
--- a/sf_plan_management/models/base.py
+++ b/sf_plan_management/models/base.py
@@ -8,48 +8,42 @@ class ProcedureEquipmentResourceSetting(models.Model):

    name = fields.Many2one('sf.production.line', string='生产线', required=True)
    work_center_name_id = fields.Many2one('mrp.workcenter', string='工作中心名称')
-    equipment_code = fields.Char(string='机台号', readonly=True, compute='_onchange_equipment_name_id')
-    equipment_name_id = fields.Many2one('maintenance.equipment',
-                                        string='设备名称',
-                                        readonly=True,
-                                        compute='_onchange_work_center_name_id')
-    brand = fields.Char(string='品牌', readonly=True, compute='_onchange_equipment_name_id')
-    model = fields.Char(string='型号', readonly=True, compute='_onchange_equipment_name_id')
+    equipment_name_id = fields.Many2one('maintenance.equipment', string='设备名称', readonly=True, search=True,
+                                        compute='_compute_equipment_name_id')
+    equipment_code = fields.Char(string='机台号', readonly=True, related='equipment_name_id.code')
+    brand_id = fields.Many2one('sf.machine.brand', string='品牌', readonly=True, related='equipment_name_id.brand_id')
+    type_id = fields.Many2one('sf.machine_tool.type', string='型号', readonly=True, related='equipment_name_id.type_id')
+    status = fields.Selection(string='设备状态', readonly=True, related='equipment_name_id.state')
    # todo 传入工序数据
    working_procedure = fields.Char(string='工序', readonly=True)
    production_capacity = fields.Float(string='产能', required=True, digits=(4, 1))
    working_calendar_id = fields.Many2one('sf.work.log.setting', string='工作日历')
-    working_shift_id = fields.Many2many('sf.working.shift', string='班次', readonly=True, compute='_onchange_working_calendar_id')
+    working_shift_id = fields.Many2many('sf.working.shift', string='班次', readonly=True,
+                                        compute='_compute_working_shift_id')
    create_time = fields.Datetime(string='新增时间', default=lambda self: fields.Datetime.now(), readonly=True)
-    status = fields.Selection([('正常', '正常'), ('1', '故障停机'), ('2', '计划停机')],
-                              string='设备状态',
-                              readonly=True,
-                              compute='_onchange_equipment_name_id')
    participate_in_scheduling = fields.Boolean(string='参与排程', default=True)

-    @api.onchange('production_capacity')
-    def _onchange_production_capacity(self):
+    @api.depends('work_center_name_id')
+    def _compute_equipment_name_id(self):
+        for record in self:
+            if record.work_center_name_id:
+                record.equipment_name_id = record.work_center_name_id.equipment_id
+            else:
+                record.equipment_name_id = None
+
+    @api.constrains('production_capacity')
+    def _check_production_capacity(self):
        for record in self:
            if record.production_capacity < 0:
-                raise UserError("输入的产能值不正确，请重新输入！")
-
-    @api.depends('work_center_name_id')
-    def _onchange_work_center_name_id(self):
-        for record in self:
-            record.equipment_name_id = record.work_center_name_id.equipment_id
-
-    @api.onchange('equipment_name_id')
-    def _onchange_equipment_name_id(self):
-        for record in self:
-            record.equipment_code = record.equipment_name_id.code
-            record.brand = record.equipment_name_id.brand_id.name
-            record.model = record.equipment_name_id.type_id.name
-            record.status = record.equipment_name_id.state
+                raise UserError("产能不能为负！")

    @api.depends('working_calendar_id')
-    def _onchange_working_calendar_id(self):
+    def _compute_working_shift_id(self):
        for record in self:
-            record.working_shift_id = record.working_calendar_id.working_shift_ids
+            if record.working_calendar_id:
+                record.working_shift_id = record.working_calendar_id.working_shift_ids
+            else:
+                record.working_shift_id = None



--- a/sf_plan_management/models/calendar_base.py
+++ b/sf_plan_management/models/calendar_base.py
@@ -256,7 +256,7 @@ class WorkScheduleCalendar(models.Model):
    name = fields.Selection([('休息日', '休息日'), ('计划停机', '计划停机'), ('工作日', '工作日')], '日历事件名称')
    date_time = fields.Date('休息时间')
    name_id = fields.Many2one('sf.work.log.setting', '工作日历名称')
-    calendar_code = fields.Char('工作日历编码', readonly=True, compute='_compute_name_id')
+    calendar_code = fields.Char('工作日历编码', readonly=True, compute='_compute_calendar_code')

    day_off_id = fields.Many2many('sf.day.off', string='休息日')
    scheduled_outage = fields.Char('计划停机')
@@ -266,7 +266,7 @@ class WorkScheduleCalendar(models.Model):
    annual_planned_downtime = fields.Char('年计划停机时长', readonly=True)

    @api.depends('name_id')
-    def _compute_name_id(self):
+    def _compute_calendar_code(self):
        for record in self:
            if record:
                record.calendar_code = record.name_id.code
--- a/sf_plan_management/views/plan_base_view.xml
+++ b/sf_plan_management/views/plan_base_view.xml
@@ -47,7 +47,7 @@
                    <group>
                        <group>
                            <field name="code"/>
-                            <field name="day_off_ids" widget="many2many_tags"
+                            <field name="day_off_ids" widget="many2many_tags" placeholder="请选择"
                                   options="{'no_create': True, 'no_quick_create': True}"/>
                            <field name="status"/>
                        </group>
@@ -101,8 +101,8 @@
            <tree string="班次" editable="bottom" >
                <field name="code"/>
                <field name="name"/>
-                <field name="start_time"/>
-                <field name="end_time"/>
+                <field name="start_time" placeholder="请选择"/>
+                <field name="end_time" placeholder="请选择"/>
                <field name="remark"/>
            </tree>
        </field>
@@ -211,8 +211,8 @@
                <field name="work_center_name_id"/>
                <field name="equipment_name_id"/>
                <field name="equipment_code"/>
-                <field name="brand" optional="hide"/>
-                <field name="model" optional="hide"/>
+                <field name="brand_id" optional="hide"/>
+                <field name="type_id" optional="hide"/>
                <field name="working_procedure"/>
                <field name="production_capacity" optional="hide"/>
                <field name="working_calendar_id" optional="hide"/>
@@ -233,14 +233,14 @@
                <sheet>
                    <div>
                        <h1>
-                            <field name="name"/>
+                            <field name="name" placeholder="请选择"/>
                        </h1>
                    </div>
                    <group>
                        <group>
-                            <field name="work_center_name_id"/>
+                            <field name="work_center_name_id" placeholder="请选择"/>
                            <field name="production_capacity"/>
-                            <field name="working_calendar_id"/>
+                            <field name="working_calendar_id" placeholder="请选择"/>
                            <field name="create_time"/>
                        </group>
                        <group>
@@ -254,12 +254,12 @@
                            <group>`
                                <group>
                                    <field name="equipment_name_id"/>
-                                    <field name="brand"/>
+                                    <field name="brand_id"/>
                                    <field name="status"/>
                                </group>
                                <group>
                                    <field name="equipment_code" string="机台号"/>
-                                    <field name="model"/>
+                                    <field name="type_id"/>
                                </group>
                            </group>
                        </page>
@@ -277,8 +277,8 @@
                <field name="work_center_name_id"/>
                <field name="equipment_code"/>
                <field name="equipment_name_id"/>
-                <field name="brand"/>
-                <field name="model"/>
+                <field name="brand_id"/>
+                <field name="type_id"/>
                <field name="working_procedure"/>
                <field name="production_capacity"/>
                <field name="working_calendar_id"/>