采购按钮位置修改

Merge Request: 零件图纸,质检标准显示位置修改

Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1452

mrp_workorder/i18n/zh_CN.po

@@ -1273,3 +1273,18 @@ msgstr ""
 #: model:product.template,description_sale:mrp_workorder.product_template_stool_top
 msgid "wooden stool top"
 msgstr ""
+
+#. module: mrp_workorder
+#: model:quality.point.test_type,name:mrp_workorder.test_type_register_consumed_materials
+msgid "Register Consumed Materials"
+msgstr "登记消耗材料"
+
+#. module: mrp_workorder
+#: model:quality.point.test_type,name:mrp_workorder.test_type_register_byproducts
+msgid "Register By-products"
+msgstr "按产品注册"
+
+#. module: mrp_workorder
+#: model:quality.point.test_type,name:mrp_workorder.test_type_print_label
+msgid "Print label"
+msgstr "打印标签"

quality/i18n/zh_CN.po

@@ -1050,3 +1050,13 @@ msgstr "工作中心故障"
 #: model:ir.model.fields,field_description:quality.field_quality_point_test_type__active
 msgid "active"
 msgstr "有效"
+
+#. module: quality
+#: model:quality.point.test_type,name:quality.test_type_instructions
+msgid "Instructions"
+msgstr "使用说明"
+
+#. module: quality
+#: model:quality.point.test_type,name:quality.test_type_picture
+msgid "Take a Picture"
+msgstr "照片"

quality/models/quality.py

@@ -15,7 +15,7 @@ class TestType(models.Model):
     _description = "Quality Control Test Type"
 
     # Used instead of selection field in order to hide a choice depending on the view.
-    name = fields.Char('Name', required=True)
+    name = fields.Char('Name', required=True,translate=True)
     technical_name = fields.Char('Technical name', required=True)
     active = fields.Boolean('active', default=True)
 

quality_control/i18n/zh_CN.po

@@ -1185,3 +1185,14 @@ msgstr "请先进行质量检查！"
 #: model_terms:ir.ui.view,arch_db:quality_control.quality_alert_team_view_form
 msgid "e.g. The QA Masters"
 msgstr "例如：QA大师"
+
+
+#. module: quality_control
+#: model:quality.point.test_type,name:quality_control.test_type_passfail
+msgid "Pass - Fail"
+msgstr "通过-失败"
+
+#. module: quality_control
+#: model:quality.point.test_type,name:quality_control.test_type_measure
+msgid "Measure"
+msgstr "测量"

quality_control/models/__init__.py

@@ -6,3 +6,4 @@ from . import stock_move
 from . import stock_move_line
 from . import stock_picking
 from . import stock_lot
+from . import product_category

quality_control/models/product_category.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from math import sqrt
+from dateutil.relativedelta import relativedelta
+from datetime import datetime
+
+import random
+
+from odoo import api, models, fields, _
+from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT, float_round
+from odoo.osv.expression import OR
+
+
+class ProductCategory(models.Model):
+    _inherit = 'product.category'
+    @api.model
+    def name_search(self, name='', args=None, operator='ilike', limit=100):
+        if args is None:
+            args = []
+        # 添加过滤条件，确保只返回名称为 'abc' 的记录
+        args += [('name', 'not in', ['Saleable', 'Expenses', 'Deliveries'])]
+
+        # 调用父类的 name_search 方法
+        return super(ProductCategory, self).name_search(name, args=args, operator=operator, limit=limit)
+
+    @api.model
+    def search(self, args, limit=100, offset=0, order=None, count=False):
+        # 添加过滤条件，确保只返回名称不在指定列表中的记录
+        args += [('name', 'not in', ['Saleable', 'Expenses', 'Deliveries'])]
+
+        # 调用父类的 search 方法
+        return super(ProductCategory, self).search(args, limit=limit, offset=offset, order=order, count=count)

sf_base/models/base.py

@@ -394,3 +394,11 @@ class MachineToolCategory(models.Model):
     active = fields.Boolean('有效', default=True)
     category = fields.Selection([('shukong', u'数控'), ('putong', u'普通')], string=u'机床类别',
                                 default='shukong')
+
+
+class MachiningAccuracy(models.Model):
+    _name = 'sf.machining.accuracy'
+    _description = '加工精度'
+    name = fields.Char('一般公差', index=True)
+    standard_tolerance = fields.Char(string="标准公差")
+    sync_id = fields.Char('同步ID')

sf_base/security/ir.model.access.csv

@@ -247,3 +247,7 @@ access_sf_cutting_tool_type_group_sf_stock_manager,sf_cutting_tool_type_group_sf
 access_sf_cutting_tool_material_group_plan_dispatch,sf_cutting_tool_material_group_plan_dispatch,model_sf_cutting_tool_material,sf_base.group_plan_dispatch,1,0,0,0
 access_sf_functional_cutting_tool_model_group_plan_dispatch,sf_functional_cutting_tool_model_group_plan_dispatch,model_sf_functional_cutting_tool_model,sf_base.group_plan_dispatch,1,0,0,0
 access_sf_cutting_tool_type_group_plan_dispatch,sf_cutting_tool_type_group_plan_dispatch,model_sf_cutting_tool_type,sf_base.group_plan_dispatch,1,0,0,0
+
+
+access_sf_machining_accuracy,sf_machining_accuracy,model_sf_machining_accuracy,base.group_user,1,0,0,0
+access_sf_machining_accuracy_admin,sf_machining_accuracy_admin,model_sf_machining_accuracy,base.group_system,1,0,0,0

sf_base/static/js/customTable.js

@@ -0,0 +1,125 @@
+// 获取表格数据
+function getDomData() {
+    const dom = $('div[name=cutting_speed_ids]')
+    if (!dom.length) return
+    const table = dom.find('.o_list_table')
+    const thead = table.children('thead')
+    const tbody = table.children('tbody')
+    const tbody_child = tbody.children()
+    const hideTheadDom = thead.find('[data-name=process_capability]')
+    hideTheadDom.hide().next().hide()
+    hideTheadDom.before('<th customTh>精加工</th><th customTh>粗加工</th>')
+    tbody_child.each(function () {
+        const dom = $(this).children('[name=process_capability]')
+        if(!dom.length) return
+        dom.css('cssText', 'display: none!important').next().css('cssText', 'display: none!important')
+        const isCu = dom.text() == '粗加工' // 是否粗加工
+        const v = dom.next().text() // 切削速度
+        dom.after(`<td customSpeed="1" name="process_capability" is="精加工" val="${ v }">${!isCu ? v : ''}</td><td customSpeed="1" name="process_capability" is="粗加工" val="${ v }">${isCu ? v : ''}</td>`)
+        setListenClick()
+    })
+return;
+    handleTbody(tbody, newTableData, ΦList, table)
+}
+
+// 监听点击
+function setListenClick() {
+    $(document).click(function (e) {
+        if ($(e.target).attr('customSpeed')) {
+            const orginV = $('[customInput=1]').children('input').val()
+            $('[customInput=1]').parent().html(orginV)
+            const v = $(e.target).attr('val')
+            const is = $(e.target).attr('is')
+            $(e.target).html('')
+            const input = $('<div customInput="1" is="' + is + '" class="o_field_widget o_field_char"><input class="o_input" type="text" autocomplete="off" maxlength="20"></div>')
+            input.children('input').val(v)
+            $(e.target).append(input)
+            input.children('input').focus()
+            input.children('input').select()
+        } else if ($(e.target).attr('customInput')) {
+
+        } else {
+            const orginV = $('[customInput=1]').children('input').val()
+            $('[customInput=1]').parent().html(orginV)
+            const v = $(e.target).attr('val')
+        }
+    })
+    $(document).off('change') // 防止重复绑定
+    $(document).on('change', '[customInput] input', async function () {
+        $(this).parents('td').attr('val', $(this).val())
+        $(this).parents('td').siblings('[customspeed]').attr('val', $(this).val())
+        var eve1 = new Event('change')
+        var eve2 = new Event('input')
+        var eve3 = new Event('click')
+        let patchSpeedDom = $(this).parents('td').siblings('[name=cutting_speed]')
+        let patchProcessDom = $(this).parents('td').siblings('[name=process_capability]')
+        $(this).parents('td').siblings('[customspeed]').text('') // 清空其他加工类型的数据
+        await timeOut(500)
+        patchProcessDom[0].dispatchEvent(eve3)
+        await timeOut(200)
+        const processVal = $(this).parent().attr('is')
+        patchProcessDom.find('select').val(`"${processVal}"`) // 设置源select的val为“加工类型 is”、
+        patchProcessDom.attr("data-tooltip", `${processVal}`)
+        patchProcessDom.find('select')[0].dispatchEvent(eve1)
+
+        patchSpeedDom[0].dispatchEvent(eve3)
+        await timeOut(200)
+        patchSpeedDom.find('input').val($(this).val())
+        await timeOut(50)
+        patchSpeedDom.find('input')[0].dispatchEvent(eve2)
+        patchSpeedDom.find('input')[0].dispatchEvent(eve1)
+    })
+    $(document).off('blur') // 防止重复绑定
+    $(document).on('blur', '[customInput] input', async function () {
+        if(!$(this).length) return
+
+        $(this).parents('td').siblings('[customspeed]').text('') // 清空其他加工类型的数据
+        let patchProcessDom = $(this).parents('td').siblings('[name=process_capability]')
+        try {
+            patchProcessDom[0].dispatchEvent(new Event('click'))
+            const processVal = $(this).parent().attr('is')
+            patchProcessDom.find('select').val(`"${processVal}"`) // 设置源select的val为“加工类型 is”、
+            patchProcessDom.attr("data-tooltip", `${processVal}`)
+            patchProcessDom.find('select')[0].dispatchEvent(new Event('change'))
+        } catch {
+
+        }
+
+    })
+}
+function timeOut(time) {
+    return new Promise(resolve => {
+        setTimeout(() => {
+           resolve()
+        }, time)
+    })
+}
+
+function listenAdd() {
+    $('td.o_field_x2many_list_row_add a').click(async function () {
+        await timeOut(500)
+        const tr = $('.o_list_table').children('tbody').children('tr').eq(-2)
+        if(tr.children('td').eq(2).text() == '') {
+            const dom = tr.children('[name=process_capability]')
+            if(!dom.length) return
+            dom.css('cssText', 'display: none!important').next().css('cssText', 'display: none!important')
+            const isCu = dom.text() == '粗加工' // 是否粗加工
+            const v = dom.next().text() // 切削速度
+            dom.after(`<td customSpeed="1" name="process_capability" is="精加工" val="${ v }">${!isCu ? v : ''}</td><td customSpeed="1" name="process_capability" is="粗加工" val="${ v }">${isCu ? v : ''}</td>`)
+        }
+    })
+}
+
+function listenSave() {
+    $('.o_form_button_save').click( async function () {
+        await timeOut(1000)
+        if($(this).parent().next().length) return
+        $('th[customTh],td[cusomSpeed]').remove()
+        getDomData()
+
+    })
+}
+
+listenAdd()
+listenSave()
+getDomData()

sf_base/static/js/setTableWidth.js

@@ -0,0 +1,47 @@
+// 因为表格可以拖动设置宽度，所以需要用js设置初始宽度
+function setBasicParamTableWidth() {
+    // const _100px = 'th[data-name="cutting_blade_length"],th[data-name="cutting_blade_length"],th[data-name="name"],th[data-name="tip_handling_size"],th[data-name="cutting_depth_max"],th[data-name="diameter_inner_circle"],th[data-name="diameter_mounting_hole" ],th[data-name="radius_tip_re" ],th[data-name="is_chip_breaker"],th[data-name="chip_breaker_type_code"],th[data-name="blade_profile"]'
+    // const _65px = 'th[data-name="edge_angle"],th[data-name="relief_angle"],[data-name="total_length"],th[data-name="length"],th[data-name="thickness"],th[data-name="blade_number"]'
+    // const _80px = 'th[data-name="arbor_diameter"],th[data-name="head_height"],th[data-name="head_width"],th[data-name="head_length"],th[data-name="blade_diameter"],th[data-name="blade_length"] ,th[data-name="neck_length"] ,th[data-name="neck_diameter"] ,th[data-name="shank_diameter"],th[data-name="shank_length"],th[data-name="tip_diameter"],th[data-name="knife_tip_taper"],th[data-name="blade_helix_angle"] ,th[data-name="blade_width"],th[data-name="blade_depth"]'
+    // const _50px = 'th[data-name="pitch"],th[data-name="width"],th[data-name="height"]'
+
+    const basicParamDom = $('.fixTableCss')
+    // const basicParamDom_100px = basicParamDom.find(_100px) // 四字以上
+    // const basicParamDom_65px = basicParamDom.find(_65px) // 大概三个字加单位
+    // const basicParamDom_80px = basicParamDom.find(_80px) //  大概四个字加单位
+    // const basicParamDom_50px= basicParamDom.find(_50px) // 大概两个字加单位
+    //
+    // basicParamDom_100px.css({'width': '100px', 'max-width': 'auto', ',min-width': 'auto'})
+    // basicParamDom_65px.css({'width': '65px', 'max-width': 'auto', ',min-width': 'auto'})
+    // basicParamDom_80px.css({'width': '80px', 'max-width': 'auto', ',min-width': 'auto'})
+    // basicParamDom_50px.css({'width': '50px', 'max-width': 'auto', ',min-width': 'auto'})
+    let dom = []
+    try {
+        dom = basicParamDom.find('table').find('thead').children().children()
+
+    } catch {
+        dom = []
+    }
+    if (!dom) return
+    dom.each(function () {
+        if ($(this).hasClass('row_no') >= 0) { // 序号列
+            // 不设置 通过css设置
+        }
+        const text = $(this).text().split('(')
+        if ($(this).attr('data-name') == 'name' || text[0].length > 4) {
+            $(this).width('100px')
+        } else if(text[0].length == 4){
+            $(this).width('80px')
+        } else if(text[0].length == 3){
+            $(this).width('65px')
+        } else if(text[0].length == 2){
+            $(this).width('50px')
+        }
+
+    })
+}
+
+setBasicParamTableWidth()
+$('.o_field_many2one_selection').on('click', $('#cutting_tool_material_id + ul'), function () {
+    setTimeout(setBasicParamTableWidth, 500)
+})

sf_base/static/js/updateTable.js

@@ -0,0 +1,159 @@
+// 获取表格数据
+function getDomData() {
+    const dom = $('#updateTable').prev()
+    if (!dom.length) return
+    const table = $('#updateTable').prev().find('.o_list_table')
+    const customTable = table.clone()
+    customTable.addClass('customTable')
+    table.parent().append(customTable)
+    table.hide()
+    const thead = customTable.children('thead')
+    const tbody = customTable.children('tbody')
+    const tableData = []
+    const tbody_child = tbody.children()
+
+    const tbody_child_len = tbody_child.length
+
+    for (let v = 0; v < tbody_child_len; v++) { // 将数据取出来到tableData里面
+        const data = tbody_child[v].innerText.split('\t')
+        // console.log('dom data',data)
+        const [index, deep, name, Φ, value] = data
+        tableData.push({index, deep, name, Φ, value})
+    }
+    const ΦList = [...new Set(tableData.map(_ => _.name))] // ΦList去重
+    const newTableData = {}
+    tableData.forEach(_ => {
+        const key = _.deep + '|' + _.Φ
+        !newTableData[key] ? newTableData[key] = {i: _.index} : '';
+        if (_.Φ) { // 去除没有Φ的脏数据
+            newTableData[key]['Φ' + _.Φ] = _.value
+            newTableData[key]['Φ' + _.Φ + 'i'] = _.index
+        }
+    })
+    // console.log('qwdh',tableData, ΦList, newTableData);
+
+    if (ΦList.filter(_ => _).length == 0) return;
+    handleThead(thead, ΦList)
+
+    handleTbody(tbody, newTableData, ΦList, table)
+}
+
+// 重新设置表头、
+function handleThead(thead, ΦList) {
+    const dom = thead.children().eq(0).children()
+    const len = dom.length
+    dom.eq(0).attr('rowspan', 2)
+    dom.eq(1).attr('rowspan', 2)
+    len == 5 ? dom.eq(2).attr('rowspan', 2) : ''
+    dom.eq(-2).attr('colspan', ΦList.length)
+    dom.eq(-1).remove()
+
+    const tr = document.createElement('tr')
+    for (let v = 0; v < ΦList.length; v++) {
+        const th = document.createElement('th')
+        th.innerText = 'Φ' + ΦList[v]
+        tr.append(th)
+    }
+    thead.append(tr)
+}
+
+// 重新设置表格
+function handleTbody(tbody, newTableData, ΦList, table) {
+    console.log(newTableData)
+    tbody.html('')
+    let i = 0
+    const data = Object.keys(newTableData)
+    // data.sort((a, b) => {
+    //     a = a.split('=')[1].split('%')[0]
+    //     b = b.split('=')[1].split('%')[0]
+    //     return a - b
+    // })
+    // console.log('wqoqw ',ΦList)
+    data.forEach(_ => {
+        i++
+        const tr = $('<tr class="o_data_row"></tr>')
+        const td0 = $('<td></td>')
+        td0.text(i)
+        tr.append(td0)
+        const lit = _.split('|')
+        //
+        const td1 = $('<td></td>')
+        const td2 = $('<td></td>')
+        td1.text(lit[0])
+        td2.text(lit[1] || '')
+        tr.append(td1)
+        tr.append(td2)
+        ΦList.forEach(Φ => {
+            const td = $('<td class="o_data_cell cursor-pointer o_field_cell o_list_char"></td>')
+            td.text(newTableData[_]['Φ' + Φ])
+            td.attr('col', newTableData[_]['Φ' + Φ + 'i'])
+            td.attr('val', newTableData[_]['Φ' + Φ])
+            td.attr('coustomTd', 1)
+            tr.append(td)
+        })
+        //                 // for (let j = 0; j < ΦList.length; j++) {
+        //                 //     const td = document.createElement('td')
+        //                 //     td.innerText = newTableData[data[v]][_]
+        //                 //     th.append(td)
+        //                 // }
+        tbody.append(tr)
+    })
+    // $(document).click(function (e) {
+    //     if ($(e.target).attr('coustomTd')) {
+    //         const orginV = $('[coustomInput=1]').children('input').val()
+    //         $('[coustomInput=1]').parent().html(orginV)
+    //         const v = $(e.target).attr('val')
+    //         console.log($(e.target));
+    //         $(e.target).html('')
+    //         const input = $('<div coustomInput="1" name="feed_per_tooth" class="o_field_widget o_field_char"><input class="o_input" type="text" autocomplete="off" maxlength="20"></div>')
+    //         input.children('input').val(v)
+    //         $(e.target).append(input)
+    //         input.children('input').focus()
+    //         input.children('input').select()
+    //     } else if ($(e.target).attr('coustomInput')) {
+    //
+    //     } else {
+    //         const orginV = $('[coustomInput=1]').children('input').val()
+    //         $('[coustomInput=1]').parent().html(orginV)
+    //         const v = $(e.target).attr('val')
+    //     }
+    // })
+    // $(document).off('change') // 防止重复绑定
+//     $(document).on('change', '[coustomInput] input', function () {
+//     $(this).parents('td').attr('val', $(this).val());
+//     var eve1 = new Event('change');
+//     var eve2 = new Event('input');
+//     var eve3 = new Event('click');
+//     const i = $(this).parents('td').attr('col');
+//     let patchDom = table.find('tbody').children('tr').eq(i - 1);
+//
+//     if (patchDom.length === 0) {
+//         console.error('No such row found');
+//         return;
+//     }
+//
+//     patchDom = patchDom.children().eq(-1);
+//
+//     setTimeout(() => {
+//         if (patchDom.length === 0) {
+//             console.error('No such cell found');
+//             return;
+//         }
+//         patchDom[0].dispatchEvent(eve3); // Simulate click event
+//
+//         setTimeout(() => {
+//             patchDom = patchDom.find('input');
+//             if (patchDom.length === 0) {
+//                 console.error('No input found in the target cell');
+//                 return;
+//             }
+//             patchDom.val($(this).val());
+//             patchDom[0].dispatchEvent(eve2);
+//             patchDom[0].dispatchEvent(eve1);
+//         }, 200);
+//     }, 500);
+// });
+
+}
+
+getDomData()

sf_base/static/src/scss/change.scss

@@ -0,0 +1,52 @@
+.o_list_renderer .o_list_table tbody > tr > td:not(.o_list_record_selector):not(.o_handle_cell):not(.o_list_button):not(.o_list_record_remove) {
+  white-space: nowrap !important;
+}
+
+.text-truncate  {
+  overflow: unset !important;
+  text-overflow: unset !important;
+  white-space: unset !important;
+}
+
+
+//   设置表格不超出页面宽度
+.o_form_view .o_field_widget .o_list_renderer {
+  width: calc(100% - 64px) !important;
+  margin:0 auto;
+  overflow: auto;
+}
+
+// 表格针对处理
+.fixTableCss {
+  text-align: center;
+  .o_list_number_th,.o_list_number {
+    text-align: center!important;
+  }
+  .ui-sortable {
+    tr > td:first-child {
+      padding: 0!important;
+    }
+  }
+  .row_no {
+    padding: 0!important;;
+    width: 35px!important;
+  }
+
+  th[data-name="total_length"],th[data-name="length"],th[data-name="thickness"] {
+    .flex-row-reverse {
+      span {
+        text-align: center;
+      }
+    }
+  }
+}
+
+// 其他不能用js处理的表格
+.otherTableFix {
+  th[data-name="cutting_tool_material_id"] {
+    width: 100px!important;
+  }
+  th[data-name="ramping_angle_max"],th[data-name="ramping_angle_min"] {
+        width: 200px!important;
+  }
+}

sf_base/views/base_view.xml

@@ -614,4 +614,23 @@
         <field name="res_model">sf.machine.control_system</field>
         <field name="view_mode">tree</field>
     </record>
+
+    #------------------加工精度------------------
+    <record model="ir.ui.view" id="tree_sf_machining_accuracy_view">
+        <field name="name">tree.sf.machining.accuracy</field>
+        <field name="model">sf.machining.accuracy</field>
+        <field name="arch" type="xml">
+            <tree string="加工精度" create="0" edit="0" delete="0">
+                <field name="name"/>
+                <field name="standard_tolerance"/>
+            </tree>
+        </field>
+    </record>
+
+      <record id="action_sf_machining_accuracy" model="ir.actions.act_window">
+        <field name="name">加工精度</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.machining.accuracy</field>
+        <field name="view_mode">tree</field>
+    </record>
 </odoo>

sf_base/views/menu_view.xml

@@ -141,12 +141,18 @@
                 sequence="1"
                 action="action_sf_machine_brand"/>
 
+        <menuitem
+                id="menu_sf_machining_accuracy"
+                parent="menu_sf_base"
+                name="加工精度"
+                sequence="1"
+                action="action_sf_machining_accuracy"/>
 
         <menuitem
                 id="menu_sf_machine_control_system"
                 parent="menu_sf_base"
                 name="数控系统"
-                sequence="1"
+                sequence="2"
                 action="action_sf_machine_control_system"/>
 
 

sf_base/views/tool_views.xml

@@ -360,6 +360,7 @@
                                         <field name="cooling_jacket"/>
                                     </tree>
                                 </field>
+                                <script src="/sf_base/static/js/setTableWidth.js?time=3"></script>
                             </page>
                             <page string="切削速度Vc"
                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">
@@ -380,6 +381,9 @@
                                         <field name="cutting_speed"/>
                                     </tree>
                                 </field>
+                                <script src="/sf_base/static/js/customTable.js?time=3"></script>
+                                <script src="/sf_base/static/js/setTableWidth.js?time=3"></script>
+
                             </page>
                             <page string="每齿走刀量fz"
                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">
@@ -392,6 +396,8 @@
                                         <field name="feed_per_tooth"/>
                                     </tree>
                                 </field>
+                                <div id="updateTable"></div>
+                                <script src="/sf_base/static/js/updateTable.js?time=3"></script>
                                 <field name="feed_per_tooth_ids_3"
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}">
                                     <tree editable="bottom" class="center" create="0" delete="0">

sf_dlm_management/views/product_template_management_view.xml

@@ -16,8 +16,6 @@
                     <field name='is_bfm' invisible="1"/>
                     <field name='categ_type' invisible="1"/>
                     <field name='part_number' attrs="{'invisible': [('categ_type', '!=', '成品')]}"/>
-                    <field name='machining_drawings' attrs="{'invisible': [('categ_type', '!=', '成品')]}" widget="adaptive_viewer"/>
-                    <field name='quality_standard' attrs="{'invisible': [('categ_type', '!=', '成品')]}" widget="adaptive_viewer"/>
                     <field name='manual_quotation' attrs="{'invisible':[('upload_model_file', '=', [])]}"/>
                     <field name="upload_model_file"
                            widget="many2many_binary"
@@ -111,6 +109,19 @@
                         '刀具')], 'required': True}
                     </attribute>
                 </xpath>
+                <xpath expr="//sheet//notebook" position="inside">
+                    <page string="2D加工图纸">
+                        <field name='machining_drawings' attrs="{'invisible': [('categ_type', '!=', '成品')]}"
+                               widget="adaptive_viewer"/>
+                    </page>
+                </xpath>
+                <xpath expr="//sheet//notebook" position="inside">
+                    <page string="质检标准">
+                        <field name='quality_standard' attrs="{'invisible': [('categ_type', '!=', '成品')]}"
+                               widget="adaptive_viewer"/>
+
+                    </page>
+                </xpath>
                 <!--                <xpath expr="//field[@name='default_code']" position="attributes">-->
                 <!--                    <attribute name="attrs">{'readonly': [('categ_type', '=', '刀具')], 'invisible':-->
                 <!--                        [('product_variant_count', '>' , 1)]}-->

sf_maintenance/__init__.py

@@ -2,3 +2,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import models
+from . import wizard

sf_maintenance/__manifest__.py

@@ -18,6 +18,7 @@
         'views/equipment_maintenance_standards_views.xml',
         'views/maintenance_request_views.xml',
         'views/maintenance_equipment_category_views.xml',
+        'wizard/maintenance_request_wizard.xml',
     ],
     'installable': True,
     'application': False,

sf_maintenance/models/sf_maintenance.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 import json
 import base64
+import logging
 from datetime import timedelta
 import requests
 from odoo.addons.sf_base.commons.common import Common
 from odoo import api, fields, models, _
-from odoo.exceptions import UserError
+from odoo.exceptions import UserError, ValidationError
 
 
 class SfMaintenanceEquipmentCategory(models.Model):
@@ -122,6 +123,13 @@ class SfMaintenanceEquipment(models.Model):
                                                            'sf_maintenance_equipment_ids', string='设备维保标准')
     eq_maintenance_id = fields.Many2one('equipment.maintenance.standards', string='设备保养标准',
                                         domain="[('maintenance_type','=','保养')]")
+
+    initial_action_date = fields.Date(string='重置保养日期')
+    initial_action_date_old = fields.Date(string='重置保养日期(旧)')
+    next_action_date = fields.Date(string='下次预防保养')
+
+    initial_overhaul_date = fields.Date(string='重置维修日期')
+    initial_overhaul_date_old = fields.Date(string='重置维修日期(旧)')
     overhaul_date = fields.Date(string='下次预防检修')
     overhaul_period = fields.Integer(string='预防检修频次')
     overhaul_duration = fields.Float(string='检修时长')
@@ -129,6 +137,61 @@ class SfMaintenanceEquipment(models.Model):
     overhaul_id = fields.Many2one('equipment.maintenance.standards', string='设备检修标准',
                                   domain="[('maintenance_type','=','检修')]")
 
+    def confirm_maintenance(self):
+        """
+        确认保养/检修
+        """
+        context = self.env.context
+        if context['type'] == '保养':
+            if not self.initial_action_date:
+                raise ValidationError('重置保养日期不能为空!!')
+            elif self.initial_action_date < fields.Date.today():
+                raise ValidationError('重置保养日期不能小于当前日期!!')
+        elif context['type'] == '检修':
+            if not self.initial_overhaul_date:
+                raise ValidationError('重置检修日期不能为空!!')
+            elif self.initial_overhaul_date < fields.Date.today():
+                raise ValidationError('重置检修日期不能小于当前日期!!')
+
+        request_ids = self.env['maintenance.request'].search([('stage_id.done', '=', False),
+                                                              ('equipment_id', '=', self.id),
+                                                              ('maintenance_type', '=', 'preventive'),
+                                                              ('sf_maintenance_type', '=', context['type'])])
+
+        if not request_ids:
+            return self.create_maintenance_request(context['type'])
+        else:
+            return {
+                "type": "ir.actions.act_window",
+                "res_model": "maintenance.request.wizard",
+                "views": [[False, "form"]],
+                "target": "new",
+                'context': {
+                    'equipment_id': self.id
+                }
+            }
+
+    def create_maintenance_request(self, maintenance_request_type):
+        """
+        根据条件创建维保计划
+        """
+        if maintenance_request_type == '保养':
+            self._create_new_request(self.initial_action_date + timedelta(days=self.period))
+            self.initial_action_date_old = self.initial_action_date
+        elif maintenance_request_type == '检修':
+            self._create_new_request1(self.initial_overhaul_date + timedelta(days=self.overhaul_period))
+            self.initial_overhaul_date_old = self.initial_overhaul_date
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'display_notification',
+            'params': {
+                'title': f'创建{maintenance_request_type}计划',
+                'message': f'新{maintenance_request_type}维保计划创建成功',
+                'type': 'success',
+                'next': {'type': 'ir.actions.act_window_close'},
+            }
+        }
+
     @api.onchange('eq_maintenance_id', 'overhaul_id')
     def _compute_equipment_maintenance_standards_ids(self):
         for record in self:
@@ -591,11 +654,13 @@ class SfMaintenanceEquipment(models.Model):
                     ('equipment_id', '=', equipment.id),
                     ('sf_maintenance_type', '=', '保养'),
                     ('stage_id.done', '!=', True),
+                    ('active', '!=', False),
                     ('close_date', '=', False)], order="request_date asc", limit=1)
                 last_maintenance_done = self.env['maintenance.request'].search([
                     ('equipment_id', '=', equipment.id),
                     ('sf_maintenance_type', '=', '保养'),
                     ('stage_id.done', '=', True),
+                    ('active', '!=', False),
                     ('close_date', '!=', False)], order="close_date desc", limit=1)
                 if next_maintenance_todo and last_maintenance_done:
                     next_date = next_maintenance_todo.request_date
@@ -624,7 +689,7 @@ class SfMaintenanceEquipment(models.Model):
                     if next_date < date_now:
                         next_date = date_now
                 else:
-                    next_date = equipment.effective_date + timedelta(days=equipment.period)
+                    next_date = equipment.initial_action_date + timedelta(days=equipment.period)
                 equipment.next_action_date = next_date
         else:
             self.next_action_date = False
@@ -635,11 +700,13 @@ class SfMaintenanceEquipment(models.Model):
                     ('equipment_id', '=', equipment.id),
                     ('sf_maintenance_type', '=', '检修'),
                     ('stage_id.done', '!=', True),
+                    ('active', '!=', False),
                     ('close_date', '=', False)], order="request_date asc", limit=1)
                 last_maintenance_done = self.env['maintenance.request'].search([
                     ('equipment_id', '=', equipment.id),
                     ('sf_maintenance_type', '=', '检修'),
                     ('stage_id.done', '=', True),
+                    ('active', '!=', False),
                     ('close_date', '!=', False)], order="close_date desc", limit=1)
                 if next_maintenance_todo and last_maintenance_done:
                     next_date = next_maintenance_todo.request_date
@@ -668,7 +735,7 @@ class SfMaintenanceEquipment(models.Model):
                     if next_date < date_now:
                         next_date = date_now
                 else:
-                    next_date = equipment.effective_date + timedelta(days=equipment.overhaul_period)
+                    next_date = equipment.initial_overhaul_date + timedelta(days=equipment.overhaul_period)
                 equipment.overhaul_date = next_date
         else:
             self.overhaul_date = False
@@ -735,6 +802,7 @@ class SfMaintenanceEquipment(models.Model):
             next_requests = self.env['maintenance.request'].search([('stage_id.done', '=', False),
                                                                     ('equipment_id', '=', equipment.id),
                                                                     ('maintenance_type', '=', 'preventive'),
+                                                                    ('active', '=', True),
                                                                     ('request_date', '=', equipment.next_action_date),
                                                                     ('sf_maintenance_type', '=', '保养')])
             if not next_requests:
@@ -743,6 +811,7 @@ class SfMaintenanceEquipment(models.Model):
             next_requests = self.env['maintenance.request'].search([('stage_id.done', '=', False),
                                                                     ('equipment_id', '=', equipment.id),
                                                                     ('maintenance_type', '=', 'preventive'),
+                                                                    ('active', '=', True),
                                                                     ('request_date', '=', equipment.overhaul_date),
                                                                     ('sf_maintenance_type', '=', '检修')])
             if not next_requests:

sf_maintenance/models/sf_maintenance_requests.py

@@ -14,6 +14,8 @@ class SfMaintenanceEquipmentCategory(models.Model):
     equipment_maintenance_id = fields.Many2one('equipment.maintenance.standards', string='设备维保标准',
                                                domain="[('maintenance_type','=',sf_maintenance_type)]")
 
+    active = fields.Boolean('有效', default=True)
+
     @api.onchange('sf_maintenance_type')
     def _compute_equipment_maintenance_request_id(self):
         for record in self:

sf_maintenance/security/ir.model.access.csv

@@ -20,7 +20,8 @@ access_maintenance_equipment_agv_log,maintenance_equipment_agv_log,model_mainten
 
 
 
-access_maintenance_system_user,equipment.request system user,maintenance.model_maintenance_request,base.group_user,1,0,0,0
+access_maintenance_system_user,equipment.request system user,maintenance.model_maintenance_request,base.group_user,1,1,1,0
+access_maintenance_wizard_system_user,maintenance.request.wizard system user,model_maintenance_request_wizard,base.group_user,1,1,1,0
 
 access_maintenance_equipment_group_plan_dispatch,maintenance.equipment,maintenance.model_maintenance_equipment,sf_base.group_plan_dispatch,1,0,0,0
 access_maintenance_equipment_oee_group_plan_dispatch,maintenance_equipment_oee,model_maintenance_equipment_oee,sf_base.group_plan_dispatch,1,0,0,0

sf_maintenance/views/maintenance_views.xml

@@ -60,9 +60,9 @@
                     <field name="function_type"/>
                     <field name="code" readonly="1"/>
                     <field name="equipment_type" invisible="1"/>
-                    <field name="brand_id" force_save="1" />
+                    <field name="brand_id" force_save="1"/>
                     <field name="type_id" attrs="{'required': [('equipment_type', '=', '机床')]}"
-                           domain="[('brand_id', '=', brand_id)]" />
+                           domain="[('brand_id', '=', brand_id)]"/>
                     <field name="machine_tool_category" readonly="1" attrs="{'invisible': [('type_id', '=', False)]}"
                            force_save="1"/>
                     <field name="run_time" force_save="1"/>
@@ -73,7 +73,7 @@
                         <group>
                             <group string="基础参数">
                                 <field name="control_system_id" attrs="{'required': [('equipment_type', '=', '机床')]}"
-                                       options="{'no_create': True}" />
+                                       options="{'no_create': True}"/>
                                 <label for="workbench_L" string="工作台尺寸(mm)"/>
                                 <div class="test_model">
                                     <label for="workbench_L" string="长"/>
@@ -85,7 +85,7 @@
                                     <field name="workbench_W" class="o_address_zip"
                                            attrs="{'required': [('equipment_type', '=', '机床')]}"
                                            options="{'format': false}"/>
-                                     <span>&amp;nbsp;</span>
+                                    <span>&amp;nbsp;</span>
                                     <label for="workbench_H" string="高"/>
                                     <field name="workbench_H" class="o_address_zip"
                                            attrs="{'required': [('equipment_type', '=', '机床')]}"
@@ -134,7 +134,7 @@
                                 <!--                                    <field name="guide_rail" required="1"/>-->
                                 <field name="number_of_axles" attrs="{'required': [('equipment_type', '=', '机床')]}"
                                        widget="radio"
-                                       options="{'horizontal': true}" />
+                                       options="{'horizontal': true}"/>
                                 <label for="x_axis" string="加工行程(mm)"
                                        attrs="{'invisible': [('number_of_axles', '=', False)]}"/>
                                 <div class="test_model"
@@ -196,8 +196,8 @@
                                 <field name="T_tool_time"/>
                                 <field name="C_tool_time"/>
                             </group>
-                               <group string="主轴">
-                                <field name="taper_type_id" attrs="{'required': [('equipment_type', '=', '机床')]}" />
+                            <group string="主轴">
+                                <field name="taper_type_id" attrs="{'required': [('equipment_type', '=', '机床')]}"/>
                                 <label for="distance_min" string="主轴端面-工作台距离(mm)"/>
                                 <div class="test_model">
                                     <label for="distance_min" string="最小(min)"/>
@@ -237,7 +237,7 @@
                                 <field name="c_precision"/>
                                 <field name="c_precision_repeat"/>
                             </group>
-                              <group string="进给参数">
+                            <group string="进给参数">
                                 <field name="X_axis_rapid_traverse_speed"/>
                                 <field name="Y_axis_rapid_traverse_speed"/>
                                 <field name="Z_axis_rapid_traverse_speed"/>
@@ -252,21 +252,21 @@
 
 
                     </page>
-                     <page string="AGV运行日志" name="sf_equipment"
+                    <page string="AGV运行日志" name="sf_equipment"
                           attrs="{'invisible': [('equipment_type', '!=', 'AGV小车')]}">
-                         <field name="agv_logs">
-                             <tree create="1" edit="1" delete="1" editable="bottom">
-                                    <field name = 'run_type'/>
-                                    <field name = 'run_code'/>
-                                    <field name = 'run_first'/>
-                                    <field name = 'run_last'/>
-                                    <field name = 'production_line'/>
-                                    <field name = 'workorder'/>
-                                    <field name = 'time'/>
-                                    <field name = 'state'/>
-                                </tree>
-                         </field>
-                     </page>
+                        <field name="agv_logs">
+                            <tree create="1" edit="1" delete="1" editable="bottom">
+                                <field name='run_type'/>
+                                <field name='run_code'/>
+                                <field name='run_first'/>
+                                <field name='run_last'/>
+                                <field name='production_line'/>
+                                <field name='workorder'/>
+                                <field name='time'/>
+                                <field name='state'/>
+                            </tree>
+                        </field>
+                    </page>
 
                     <page string="设备参数" name="sf_equipment"
                           attrs="{'invisible': [('equipment_type', '!=', 'AGV小车')]}">
@@ -979,31 +979,58 @@
                     </group>
                 </xpath>
 
-                <xpath expr="//field[@name='next_action_date']" position="before">
 
-                    <field name='eq_maintenance_id' force_save="1" widget="many2one"/>
+                <xpath expr="//page[@name='maintenance']" position="replace">
+                    <page string="维保" name="maintenance">
+                        <group>
+                            <group string="保养">
+                                <field name='eq_maintenance_id' force_save="1" widget="many2one"/>
+                                <field name="initial_action_date"/>
+                                <field name="next_action_date" string="下次预防保养"/>
+                                <label for="period" string="预防保养频次"/>
+                                <div class="o_row">
+                                    <field name="period"/>
+                                    days
+                                </div>
+                                <label for="maintenance_duration" string="保养时长"/>
+                                <div class="o_row">
+                                    <field name="maintenance_duration"/>
+                                    hours
+                                </div>
+                                <div class="col-12 col-lg-6 o_setting_box" style="white-space: nowrap">
+                                    <button name="confirm_maintenance" string="确认保养" type="object"
+                                            class="oe_highlight" context="{'type': '保养'}"/>
+                                </div>
+                            </group>
+                            <group string="检修">
+                                <field name='overhaul_id'/>
+                                <field name="initial_overhaul_date"/>
+                                <field name="overhaul_date" string="下次预防检修"/>
+                                <label for="overhaul_period" string="预防检修频次"/>
+                                <div class="o_row">
+                                    <field name="overhaul_period"/>
+                                    days
+                                </div>
 
+                                <label for="overhaul_duration" string="检修时长"/>
+                                <div class="o_row">
+                                    <field name="overhaul_duration"/>
+                                    hours
+                                </div>
+                                <field name='equipment_maintenance_standards_ids' widget="many2many_tags"
+                                       invisible="1"/>
+
+                                <div class="col-12 col-lg-6 o_setting_box" style="white-space: nowrap">
+                                    <button name="confirm_maintenance" string="确认检修" type="object"
+                                            class="oe_highlight" context="{'type': '检修'}"/>
+                                </div>
+                            </group>
+                        </group>
+
+
+                    </page>
                 </xpath>
 
-                <xpath expr="//div[hasclass('o_row')][field[@name='maintenance_duration']]" position="after">
-
-
-                    <field name='overhaul_id' options="{'no_create':True}"/>
-                    <field name="overhaul_date" string="下次预防检修"/>
-                    <label for="overhaul_period" string="预防检修频次"/>
-                    <div class="o_row">
-                        <field name="overhaul_period"/>
-                        days
-                    </div>
-
-                    <label for="overhaul_duration" string="检修时长"/>
-                    <div class="o_row">
-                        <field name="overhaul_duration"/>
-                        hours
-                    </div>
-                    <field name='equipment_maintenance_standards_ids' widget="many2many_tags" invisible="1"/>
-
-                </xpath>
                 <xpath expr="//page[@name='description']" position="attributes">
                     <attribute name="invisible">1</attribute>
                 </xpath>
@@ -1189,7 +1216,7 @@
                 <field name="name" readonly="1"/>
                 <field name="type" readonly="1"/>
                 <field name="image" widget="image" readonly="1"/>
-<!--                <field name="equipment_id"/>-->
+                <!--                <field name="equipment_id"/>-->
                 <field name="active" invisible="1"/>
             </tree>
         </field>

sf_maintenance/wizard/__init__.py

@@ -0,0 +1 @@
+from . import maintenance_request_wizard

sf_maintenance/wizard/maintenance_request_wizard.py

@@ -0,0 +1,26 @@
+from odoo import fields, models
+
+
+class MaintenanceRequestWizard(models.TransientModel):
+    _name = 'maintenance.request.wizard'
+    _description = '维保二次确认弹窗'
+
+    name = fields.Char('')
+
+    def submit(self):
+        context = self.env.context
+        equipment_id = self.env['maintenance.equipment'].sudo().search([('id', '=', context['equipment_id'])])
+        request_ids = self.env['maintenance.request'].search([('stage_id.done', '=', False),
+                                                              ('equipment_id', '=', equipment_id.id),
+                                                              ('maintenance_type', '=', 'preventive'),
+                                                              ('sf_maintenance_type', '=', context['type'])])
+        request_ids.write({'active': False})
+        return equipment_id.create_maintenance_request(context['type'])
+
+    def cancel(self):
+        context = self.env.context
+        equipment_id = self.env['maintenance.equipment'].sudo().search([('id', '=', context['equipment_id'])])
+        if context['type'] == '保养':
+            equipment_id.initial_action_date = equipment_id.initial_action_date_old
+        elif context['type'] == '检修':
+            equipment_id.initial_overhaul_date = equipment_id.initial_overhaul_date_old

sf_maintenance/wizard/maintenance_request_wizard.xml

@@ -0,0 +1,29 @@
+<openerp>
+    <data>
+        <record id="action_maintenance_request_wizard" model="ir.actions.act_window">
+            <field name="name">维保计划</field>
+            <field name="res_model">maintenance.request.wizard</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <record model="ir.ui.view" id="maintenance_request_wizard_form_view">
+            <field name="name">maintenance.request.wizard.form.view</field>
+            <field name="model">maintenance.request.wizard</field>
+            <field name="arch" type="xml">
+                <form>
+                    <div>
+                        <field name="name" invisible="1"/>
+                        有未执行的历史维保计划，是否创建新维保计划！！
+                    </div>
+                    <footer>
+                        <button string="确认" name="submit" type="object" class="oe_highlight"/>
+                        <button string="取消" name="cancel" type="object" class="oe_highlight"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+
+    </data>
+</openerp>

sf_manufacturing/models/mrp_production.py

@@ -37,12 +37,25 @@ class MrpProduction(models.Model):
     @api.depends('procurement_group_id.mrp_production_ids.move_dest_ids.group_id.sale_id')
     def _compute_deadline_of_delivery(self):
         for production in self:
-            sale_order_ids = production.procurement_group_id.mrp_production_ids.move_dest_ids.group_id.sale_id.ids
-            if not sale_order_ids or len(sale_order_ids) < 1:
-                continue
-            sale_id = self.env['sale.order'].sudo().browse(sale_order_ids[0])
-            if sale_id:
-                production.deadline_of_delivery = sale_id.deadline_of_delivery
+            # 确保 procurement_group_id 和相关字段存在
+            if production.procurement_group_id:
+                # 获取相关的 sale_id
+                sale_order_id = production.procurement_group_id.mrp_production_ids.mapped(
+                    'move_dest_ids.group_id.sale_id')
+
+                # 确保 sale_order_id 是有效的 ID 列表
+                if sale_order_id:
+                    # 获取 sale.order 记录
+                    sale_id = self.env['sale.order'].sudo().browse(sale_order_id.ids)  # 使用 mapped 返回的 ID 列表
+
+                    # 处理 sale_id
+                    if sale_id:
+                        # 假设我们只需要第一个 sale_id
+                        production.deadline_of_delivery = sale_id[0].deadline_of_delivery if sale_id else False
+                else:
+                    production.deadline_of_delivery = False
+            else:
+                production.deadline_of_delivery = False
 
     @api.depends('workorder_ids.tool_state_remark')
     def _compute_tool_state_remark(self):

sf_manufacturing/models/mrp_workorder.py

@@ -1051,6 +1051,17 @@ class ResMrpWorkOrder(models.Model):
                     if workorder.production_id.tool_state in ['1', '2'] and workorder.state == 'ready':
                         workorder.state = 'waiting'
                         continue
+                if (workorder.production_id.tool_state in ['1', '2']
+                        and not workorder.production_id.workorder_ids.filtered(lambda a: a.sequence == 0)
+                        and workorder.production_id.programming_state == '编程中' and workorder.name == '装夹预调'):
+                    if workorder.state == 'pending' and workorder == self.search(
+                            [('production_id', '=', workorder.production_id.id),
+                             ('routing_type', '=', '装夹预调'),
+                             ('state', 'not in', ['rework', 'done', 'cancel'])],
+                            limit=1,
+                            order="sequence"):
+                        workorder.state = 'waiting'
+                        continue
 
             # elif workorder.routing_type == 'CNC加工' and workorder.state not in ['done', 'cancel', 'progress',
             #                                                                      'rework']:

sf_manufacturing/models/product_template.py

@@ -16,6 +16,12 @@ from OCC.Extend.DataExchange import write_stl_file
 class ResProductMo(models.Model):
     _inherit = 'product.template'
 
+    def _get_machining_precision(self):
+        machinings = self.env['sf.machining.accuracy'].sudo().search([])
+
+        list = [(m.sync_id, m.name) for m in machinings]
+        return list
+
     model_file = fields.Binary('模型文件')
     categ_type = fields.Selection(string='产品的类别', related='categ_id.type', store=True)
     model_name = fields.Char('模型名称')
@@ -23,12 +29,7 @@ class ResProductMo(models.Model):
     model_width = fields.Float('模型宽(mm)', digits=(16, 3))
     model_height = fields.Float('模型高(mm)', digits=(16, 3))
     model_volume = fields.Float('模型体积(m³)')
-    model_machining_precision = fields.Selection([
-        ('0.10', '±0.10mm'),
-        ('0.05', '±0.05mm'),
-        ('0.03', '±0.03mm'),
-        ('0.02', '±0.02mm'),
-        ('0.01', '±0.01mm')], string='加工精度')
+    model_machining_precision = fields.Selection(selection=_get_machining_precision, string='加工精度')
     model_processing_panel = fields.Char('模型加工面板')
     model_remark = fields.Char('模型备注说明')
     length = fields.Float('长(mm)', digits=(16, 3))
@@ -776,6 +777,8 @@ class ResProductMo(models.Model):
     part_number = fields.Char(string='零件图号', readonly=True)
     machining_drawings = fields.Binary('2D加工图纸', readonly=True)
     quality_standard = fields.Binary('质检标准', readonly=True)
+    machining_drawings_name = fields.Char('2D加工图纸名', readonly=True)
+    quality_standard_name = fields.Char('质检标准名', readonly=True)
 
     @api.constrains('tool_length')
     def _check_tool_length_size(self):
@@ -837,6 +840,11 @@ class ResProductMo(models.Model):
         else:
             return self.env.ref('sf_dlm.product_uom_cubic_millimeter')
 
+    def attachment_update(self, name, res_id, res_field):
+        attachment_info = self.env['ir.attachment'].sudo().search(
+            [('res_id', '=', res_id), ('res_field', '=', res_field)], limit=1)
+        attachment_info.write({'name': name})
+
     # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品
     def product_create(self, product_id, item, order_id, order_number, i):
         copy_product_id = product_id.with_user(self.env.ref("base.user_admin")).copy()
@@ -875,8 +883,11 @@ class ResProductMo(models.Model):
             'manual_quotation': item['manual_quotation'] or False,
             'part_number': item.get('part_number') or '',
             'active': True,
-            'machining_drawings':  '' if not item['machining_drawings'] else base64.b64decode(item['machining_drawings']),
-            'quality_standard':  '' if not item['quality_standard'] else base64.b64decode(item['quality_standard']),
+            'machining_drawings_name': item['machining_drawings_name'],
+            'quality_standard_name': item['quality_standard_name'],
+            'machining_drawings': '' if not item['machining_drawings'] else base64.b64decode(
+                item['machining_drawings']),
+            'quality_standard': '' if not item['quality_standard'] else base64.b64decode(item['quality_standard']),
         }
         tax_id = self.env['account.tax'].sudo().search(
             [('type_tax_use', '=', 'sale'), ('amount', '=', item.get('tax')), ('price_include', '=', 'True')])
@@ -884,6 +895,12 @@ class ResProductMo(models.Model):
             vals.update({'taxes_id': [(6, 0, [int(tax_id)])]})
         copy_product_id.sudo().write(vals)
         product_id.product_tmpl_id.active = False
+        if item['machining_drawings'] and item['machining_drawings_name']:
+            self.attachment_update(item['machining_drawings_name'], copy_product_id.product_tmpl_id.id,
+                                   'machining_drawings')
+        if item['quality_standard'] and item['quality_standard_name']:
+            self.attachment_update(item['quality_standard_name'], copy_product_id.product_tmpl_id.id,
+                                   'quality_standard')
         return copy_product_id
 
     def _get_ids(self, param):

sf_manufacturing/models/stock.py

@@ -182,6 +182,11 @@ class StockRule(models.Model):
             moves._action_confirm()
         return True
 
+    def attachment_update(self, name, res_id, res_field):
+        attachment_info = self.env['ir.attachment'].sudo().search(
+            [('res_id', '=', res_id), ('res_field', '=', res_field)], limit=1)
+        attachment_info.write({'name': name})
+
     @api.model
     def _run_manufacture(self, procurements):
         productions_values_by_company = defaultdict(list)
@@ -276,6 +281,12 @@ class StockRule(models.Model):
                     production.write({'part_number': production.product_id.part_number,
                                       'part_drawing': production.product_id.machining_drawings,
                                       'quality_standard': production.product_id.quality_standard})
+                    if production.product_id.machining_drawings and production.product_id.machining_drawings_name:
+                        self.attachment_update(production.product_id.machining_drawings_name, production.id,
+                                               'part_drawing')
+                    if production.product_id.quality_standard and production.product_id.quality_standard_name:
+                        self.attachment_update(production.product_id.quality_standard_name, production.id,
+                                               'quality_standard')
                 if sale_order:
                     # sale_order.write({'schedule_status': 'to schedule'})
                     self.env['sf.production.plan'].sudo().with_company(company_id).create({

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -98,8 +98,6 @@
                     <field name="production_line_id" readonly="1"/>
                     <!--                    <field name="production_line_state" readonly="1"/>-->
                     <field name="part_number" string="成品的零件图号"/>
-                    <field name="part_drawing" widget="adaptive_viewer"/>
-                    <field name="quality_standard" widget="adaptive_viewer"/>
                     <field name="tool_state"/>
                     <field name="tool_state_remark" string="备注" attrs="{'invisible': [('tool_state', '!=', '1')]}"/>
                     <field name="deadline_of_delivery" readonly="1"/>
@@ -330,6 +328,16 @@
                 <xpath expr="//field[@name='components_availability']" position="attributes">
                     <attribute name="string">投料状态</attribute>
                 </xpath>
+                <xpath expr="//sheet//notebook" position="inside">
+                    <page string="零件图纸">
+                        <field name="part_drawing" widget="adaptive_viewer"/>
+                    </page>
+                </xpath>
+                <xpath expr="//sheet//notebook" position="inside">
+                    <page string="质检标准">
+                        <field name="quality_standard" widget="adaptive_viewer"/>
+                    </page>
+                </xpath>
             </field>
         </record>
 

sf_manufacturing/views/mrp_workorder_view.xml

@@ -268,8 +268,6 @@
                     <field name="material_height" class="o_address_zip"/>
                 </div>
                 <field name="part_number" string="成品的零件图号"/>
-                <field name="machining_drawings" widget="adaptive_viewer"  attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}"/>
-                <field name="quality_standard" widget="adaptive_viewer" attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}"/>
             </xpath>
             <xpath expr="//label[1]" position="attributes">
                 <attribute name="string">计划加工时间</attribute>
@@ -591,7 +589,18 @@
                     mrp.group_mrp_manager,sf_base.group_sf_mrp_manager,sf_base.group_sf_equipment_user,sf_base.group_sf_order_user
                 </attribute>
             </xpath>
-
+            <xpath expr="//sheet//notebook" position="inside">
+                <page string="2D加工图纸">
+                    <field name="machining_drawings" widget="adaptive_viewer"
+                           attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}"/>
+                </page>
+            </xpath>
+            <xpath expr="//sheet//notebook" position="inside">
+                <page string="质检标准">
+                    <field name="quality_standard" widget="adaptive_viewer"
+                           attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}"/>
+                </page>
+            </xpath>
         </field>
     </record>
 

sf_message/__manifest__.py

@@ -17,7 +17,7 @@
         'data/cron_data.xml',
         'data/template_data.xml',
         'security/ir.model.access.csv',
-
+        'views/mrp_workorder_views.xml',
     ],
     'test': [
     ],

sf_message/models/sf_message_maintenance_logs.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from odoo import models, fields, api
 
 class SFMessageMaintenanceLogs(models.Model):

sf_message/models/sf_message_sale.py

@@ -103,39 +103,58 @@ class SFMessageSale(models.Model):
         today = datetime.today().date()
         deadline_check = today + timedelta(days=1)
         logging.info(f"today: {today}, deadline_check: {deadline_check}")
-        sale_order = self.sudo().search([('state', 'in', ['sale']), ('deadline_of_delivery', '!=', False)])
+        sale_order = self.sudo().search(
+            [('state', 'in', ['sale']), ('deadline_of_delivery', '!=', False), ('delivery_status', '!=', 'full')])
         for item in sale_order:
             production = self.env['mrp.production'].search([('origin', '=', item.name)])
             production_not_done = production.filtered(lambda p: p.state not in ['done', 'scrap', 'cancel'])
             production_done_count = len(production.filtered(lambda p: p.state in ['done', 'scrap', 'cancel']))
-            if len(production_not_done) != item.mrp_production_count:
-                if deadline_check == item.deadline_of_delivery:
+            if (len(production_not_done) >= 1 and len(production_not_done) != item.mrp_production_count) or len(
+                    production_not_done) != production_done_count:
+                logging.info("-----不等于----")
+                logging.info(f"name: {item.name}")
+                logging.info(
+                    f"production_not_done: {len(production_not_done)}, production_done_count: {production_done_count}")
+                logging.info(f"deadline_of_delivery: {item.deadline_of_delivery}")
+                if deadline_check == item.deadline_of_delivery and item.delivery_warning not in ['warning']:
                     item.delivery_warning = 'warning'
-                elif today == item.deadline_of_delivery:
+                elif today >= item.deadline_of_delivery and item.delivery_warning not in ['overdue']:
                     item.delivery_warning = 'overdue'
             elif production_done_count == item.mrp_production_count:
+                logging.info("-----等于----")
+                logging.info(f"name: {item.name}")
+                logging.info(
+                    f"production_not_done: {len(production_not_done)}, production_done_count: {production_done_count}")
+                logging.info(f"deadline_of_delivery: {item.deadline_of_delivery}")
                 if item.delivery_status in ['pending', 'partial']:
-                    if deadline_check == item.deadline_of_delivery:
+                    if deadline_check == item.deadline_of_delivery and item.delivery_warning not in ['warning']:
                         item.delivery_warning = 'warning'
-                    elif today == item.deadline_of_delivery:
+                    elif today >= item.deadline_of_delivery and item.delivery_warning not in ['overdue']:
                         item.delivery_warning = 'overdue'
             else:
+                logging.info("-----1111111----")
+                logging.info(f"name: {item.name}")
+                logging.info(
+                    f"production_not_done: {len(production_not_done)}, production_done_count: {production_done_count}")
                 continue
+        # 获取业务节点
+        business_node_ids = {
+            'warning': self.env.ref('sf_message.bussiness_sale_order_overdue_warning').id,
+            'overdue': self.env.ref('sf_message.bussiness_sale_order_overdue').id
+        }
         overdue_orders = self.sudo().search([('delivery_warning', 'in', ['warning', 'overdue'])])
         for wo in overdue_orders:
-            message_template = self.env["jikimo.message.template"].search([
-                ("model", "=", self._name),
-                ("bussiness_node_id", "=", self.env.ref('sf_message.bussiness_sale_order_overdue_warning').id)
-            ])
-            sale_order_has = self.env['jikimo.message.queue'].search([
-                ('res_id', '=', wo.id),
-                ('message_status', '=', 'pending'),
-                ('message_template_id', '=', message_template.id)
-            ])
-            if not sale_order_has:
-                if wo.delivery_warning == 'warning':
-                    wo.add_queue('销售订单逾期预警')
-                elif wo.delivery_warning == 'overdue':
-                    wo.add_queue('销售订单已逾期')
-
-
+            business_node_id = business_node_ids.get(wo.delivery_warning)
+            if business_node_id:
+                message_template = self.env["jikimo.message.template"].search([
+                    ("model", "=", self._name),
+                    ("bussiness_node_id", "=", business_node_id)
+                ], limit=1)
+                sale_order_has = self.env['jikimo.message.queue'].search([
+                    ('res_id', '=', wo.id),
+                    ('message_status', '=', 'pending'),
+                    ('message_template_id', '=', message_template.id)
+                ])
+                if not sale_order_has:
+                    message_name = '销售订单逾期预警' if wo.delivery_warning == 'warning' else '销售订单已逾期'
+                    wo.add_queue(message_name)

sf_message/models/sf_message_workorder.py

@@ -73,7 +73,7 @@ class SFMessageWork(models.Model):
                         if record:
                             i += 1
         if i >= 1:
-            action_id = self.env.ref('sf_manufacturing.mrp_workorder_action_tablet').id
+            action_id = self.env.ref('sf_message.mrp_workorder_action_notify').id
             url_with_id = f"{url}/web#view_type=list&action={action_id}"
             content_template = content.replace('{{url}}', url_with_id)
             if bussiness_node in template_names['预警']:
@@ -85,11 +85,12 @@ class SFMessageWork(models.Model):
 
     def request_url(self):
         url = self.env['ir.config_parameter'].get_param('web.base.url')
-        action_id = self.env.ref('sf_manufacturing.mrp_workorder_action_tablet').id
+        action_id = self.env.ref('sf_message.mrp_workorder_issued_action').id
         menu_id = self.env['ir.model.data'].search([('name', '=', 'module_stock_dropshipping')]).id
+        active_id = self.env['mrp.workcenter'].search([('name', '=', '工件装夹中心')]).id
         # 查询参数
         params = {'menu_id': menu_id, 'action': action_id, 'model': 'mrp.workorder',
-                  'view_type': 'list', 'active_id': 1}
+                  'view_type': 'list', 'active_id': active_id}
         # 拼接查询参数
         query_string = urlencode(params)
         # 拼接URL
@@ -115,12 +116,13 @@ class SFMessageWork(models.Model):
                         item.date_planned_finished.strftime("%Y-%m-%d %H:%M:%S"))
                     date_planned_finished = datetime.strptime(date_planned_finished_str, '%Y-%m-%d %H:%M:%S')
                     twelve_hours_ago = current_time_datetime - timedelta(hours=12)
-                    if current_time_datetime >= date_planned_finished:
+                    if current_time_datetime >= date_planned_finished and item.delivery_warning not in ['overdue']:
                         logging.info("------overdue-------")
                         logging.info(f"Workorder: {item.production_id.name}, Current Time: {current_time_datetime}, "
                                      f"Planned Finish: {date_planned_finished}")
                         item.delivery_warning = 'overdue'
-                    elif twelve_hours_ago <= current_time_datetime <= date_planned_finished:
+                    elif twelve_hours_ago <= current_time_datetime <= date_planned_finished and item.delivery_warning not in [
+                        'warning']:
                         logging.info("------warning-------")
                         logging.info(f"Workorder: {item.production_id.name}, Current Time: {current_time_datetime}, "
                                      f"Planned Finish: {date_planned_finished}")

sf_message/views/mrp_workorder_views.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record model="ir.actions.act_window" id="mrp_workorder_action_notify">
+        <field name="name">工单</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">mrp.workorder</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_ids" eval="[(5, 0, 0),
+            (0, 0, {'view_mode': 'tree', 'view_id': ref('mrp.mrp_production_workorder_tree_editable_view')}) ]"/>
+        <!--            (0, 0, {'view_mode': 'kanban', 'view_id': ref('mrp.workcenter_line_kanban')})-->
+        <!--        <field name="target">fullscreen</field>-->
+        <field name="target">current</field>
+        <field name="domain">[('state', '!=', 'cancel'),('schedule_state', '=', '已排')]</field>
+        <field name="context">{'search_default_product': 1, 'search_default_workcenter_id':
+            active_id,'search_default_filter_order_warning':1,'search_default_filter_order_overdue':1,
+            'search_default_ready': 1, 'search_default_progress': 1}
+        </field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_workorder">
+                没有工单要做！
+            </p>
+            <p>
+                工作订单是作为制造订单的一部分执行的操作。
+                工序在物料清单中定义或直接添加到制造订单中。
+            </p>
+            <p>
+                使用工作台工作中心控制面板直接登记车间中的操作.
+                平板电脑为您的工人提供工作表，并允许他们报废产品，跟踪时间,
+                发起维护请求，执行质量测试等.
+            </p>
+        </field>
+    </record>
+
+
+    <record model="ir.actions.act_window" id="mrp_workorder_issued_action">
+        <field name="name">工单</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">mrp.workorder</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_ids" eval="[(5, 0, 0),
+            (0, 0, {'view_mode': 'tree', 'view_id': ref('mrp.mrp_production_workorder_tree_editable_view')}) ]"/>
+        <!--            (0, 0, {'view_mode': 'kanban', 'view_id': ref('mrp.workcenter_line_kanban')})-->
+        <!--        <field name="target">fullscreen</field>-->
+        <field name="target">current</field>
+        <field name="domain">[('state', '!=', 'cancel'),('schedule_state', '=', '已排')]</field>
+        <field name="context">{'search_default_product': 1, 'search_default_workcenter_id':
+            active_id,'search_default_ready': 1, 'search_default_progress': 1}
+        </field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_workorder">
+                没有工单要做！
+            </p>
+            <p>
+                工作订单是作为制造订单的一部分执行的操作。
+                工序在物料清单中定义或直接添加到制造订单中。
+            </p>
+            <p>
+                使用工作台工作中心控制面板直接登记车间中的操作.
+                平板电脑为您的工人提供工作表，并允许他们报废产品，跟踪时间,
+                发起维护请求，执行质量测试等.
+            </p>
+        </field>
+    </record>
+    
+</odoo>

sf_mrs_connect/models/res_config_setting.py

@@ -84,6 +84,8 @@ class ResConfigSettings(models.TransientModel):
             _logger.info("同步刀具物料切削速度完成")
             self.env['sf.feed.per.tooth'].sync_all_feed_per_tooth()
             _logger.info("同步刀具物料每齿走刀量完成")
+            self.env['sf.machining.accuracy'].sync_machining_accuracy_all()
+            _logger.info("同步加工精度完成")
 
         except Exception as e:
             _logger.info("sf_all_sync error: %s" % e)

sf_mrs_connect/models/sync_common.py

@@ -74,6 +74,8 @@ class MrStaticResourceDataSync(models.Model):
             _logger.info("同步刀具物料切削速度完成")
             self.env['sf.feed.per.tooth'].sync_feed_per_tooth_yesterday()
             _logger.info("同步刀具物料每齿走刀量完成")
+            self.env['sf.machining.accuracy'].sync_machining_accuracy_all()
+            _logger.info("同步加工精度完成")
         except Exception as e:
             traceback_error = traceback.format_exc()
             logging.error("同步静态资源库失败:%s" % traceback_error)
@@ -3133,3 +3135,36 @@ class CuttingToolBasicParameters(models.Model):
                                 })
         else:
             raise ValidationError("刀具物料基本参数认证未通过")
+
+
+class MachiningAccuracySync(models.Model):
+    _inherit = 'sf.machining.accuracy'
+    _description = '加工精度'
+    url = '/api/machining_accuracy/list'
+
+    def sync_machining_accuracy_all(self):
+        config = self.env['res.config.settings'].get_values()
+        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+        strUrl = config['sf_url'] + self.url
+        r = requests.post(strUrl, json={}, data=None, headers=headers)
+        r = r.json()
+        result = json.loads(r['result'])
+        _logger.info('加工精度:%s' % result)
+        if result['status'] == 1:
+            machining_accuracy_all_list = result['machining_accuracy_all_list']
+            # 获取同步的id集合
+            ids = [obj['id'] for obj in machining_accuracy_all_list]
+            self.env['sf.machining.accuracy'].sudo().search(
+                [('sync_id', 'not in', ids)]).unlink()
+            for time in machining_accuracy_all_list:
+                machining_accuracy = self.env['sf.machining.accuracy'].sudo().search(
+                    [('sync_id', '=', time['id'])])
+                if machining_accuracy:
+                    machining_accuracy.name = time['name']
+                    machining_accuracy.standard_tolerance = time['standard_tolerance']
+                else:
+                    self.env['sf.machining.accuracy'].sudo().create({
+                        "sync_id": time['id'],
+                        "name": time['name'],
+                        "standard_tolerance": time['standard_tolerance'],
+                    })

sf_quality/models/quality_cnc_test.py

@@ -31,8 +31,8 @@ class SfQualityCncTest(models.Model):
          ("technology", "工艺"), ("customer redrawing", "客户改图")], string="原因")
     detailed_reason = fields.Text('详细原因')
 
-    # machining_drawings = fields.Binary(related='workorder_id.machining_drawings', string='2D加工图纸', readonly=True)
-    # quality_standard = fields.Binary(related='workorder_id.quality_standard', string='质检标准', readonly=True)
+    machining_drawings = fields.Binary('2D加工图纸', related='workorder_id.machining_drawings', readonly=True)
+    quality_standard = fields.Binary('质检标准', related='workorder_id.quality_standard', readonly=True)
 
     def submit_pass(self):
         if self.test_results in ['返工', '报废']:

sf_quality/views/quality_cnc_test_view.xml

@@ -107,10 +107,10 @@
                             </group>
                         </page>
                         <page string="2D图纸">
-                            <!--                            <field name="machining_drawings" string="" widget="pdf_viewer"/>-->
+                            <field name="machining_drawings" string="" widget="adaptive_viewer"/>
                         </page>
                         <page string="客户质量标准">
-                            <!--                            <field name="quality_standard" string=""/>-->
+                            <field name="quality_standard" string="" widget="adaptive_viewer"/>
                         </page>
                         <page string="其他" attrs="{'invisible': [('state','=', 'waiting')]}">
                             <group>

sf_sale/models/quick_easy_order_old.py

@@ -20,6 +20,12 @@ class QuickEasyOrder(models.Model):
     _description = '简易下单'
     _order = 'id desc'
 
+    def _get_machining_precision(self):
+        machinings = self.env['sf.machining.accuracy'].sudo().search([])
+
+        list = [(m.sync_id, m.name) for m in machinings]
+        return list
+
     name = fields.Char('订单编号', default=lambda self: self.env['ir.sequence'].next_by_code('quick.easy.order'))
     model_length = fields.Float('长(mm)', digits=(16, 3))
     model_width = fields.Float('宽(mm)', digits=(16, 3))
@@ -27,12 +33,7 @@ class QuickEasyOrder(models.Model):
     model_volume = fields.Float('体积(mm³)', digits=(16, 3))
     model_processing_side = fields.Char('加工面', default='A')
     model_feature = fields.Char('特征')
-    machining_precision = fields.Selection([
-        ('0.10', '±0.10mm'),
-        ('0.05', '±0.05mm'),
-        ('0.03', '±0.03mm'),
-        ('0.02', '±0.02mm'),
-        ('0.01', '±0.01mm')], string='加工精度', default='0.10')
+    machining_precision = fields.Selection(selection=_get_machining_precision, string='加工精度')
     material_id = fields.Many2one('sf.production.materials', '材料', tracking=True)
     material_model_id = fields.Many2one('sf.materials.model', '型号', domain="[('materials_id', '=', material_id)]",
                                         tracking=True)

sf_sale/views/purchase_order_view.xml

@@ -6,6 +6,31 @@
             <field name="model">purchase.order</field>
             <field name="inherit_id" ref="purchase.purchase_order_form"/>
             <field name="arch" type="xml">
+                <xpath expr="//header/button[@name='action_view_picking']" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+                <xpath expr="//header/button[@name='action_rfq_send'][1]" position="before">
+                    <button name="button_confirm" type="object" states="sent" string="Confirm Order"
+                            context="{'validate_analytic': True}" class="oe_highlight" id="bid_confirm"
+                            data-hotkey="v"/>
+                    <button name="button_confirm" type="object" states="draft" context="{'validate_analytic': True}"
+                            string="Confirm Order" id="draft_confirm"/>
+                    <button name="action_view_picking"
+                    string="接收产品" class="oe_highlight" type="object"
+                    attrs="{'invisible': ['|', '|' , ('is_shipped', '=', True), ('state','not in', ('purchase','done')), ('incoming_picking_count', '=', 0)]}"
+                    data-hotkey="y" groups="stock.group_stock_user"/>
+                    <button name="button_cancel" states="draft,to approve,sent,purchase" string="取消" type="object" data-hotkey="x" />
+                </xpath>
+                <xpath expr="//header/button[@name='button_cancel'][2]" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+                <xpath expr="//header/button[@name='button_confirm'][3]" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+                <xpath expr="//header/button[@name='button_confirm'][4]" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+
                 <field name="partner_id" position="replace">
                     <field name="partner_id" widget="res_partner_many2one" context="{'is_supplier': True }"/>
                 </field>

sf_sale/views/sale_order_view.xml

@@ -95,7 +95,7 @@
                     <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
                 </field>
                 <field name="payment_term_id" position="after">
-                    <field name="deadline_of_delivery"  readonly="1"/>
+                    <field name="deadline_of_delivery"  readonly="0"/>
                     <field name="payments_way" attrs="{'readonly': [('state', 'in', ('sale','cancel'))]}"/>
                     <field name="pay_way" attrs="{'readonly': [('state', 'in', ('sale','cancel'))]}"/>
                     <!--                     <field name="schedule_status" readonly="1"/> -->

sf_tool_management/models/functional_tool.py

@@ -51,6 +51,8 @@ class FunctionalCuttingToolEntity(models.Model):
         string='位置', compute='_compute_current_location_id', store=True)
     image = fields.Binary('图片', readonly=True)
 
+    stock_num = fields.Integer('库存变更次数', default=0)
+
     safe_inventory_id = fields.Many2one('sf.real.time.distribution.of.functional.tools',
                                         string='功能刀具安全库存', readonly=True)
 
@@ -71,7 +73,7 @@ class FunctionalCuttingToolEntity(models.Model):
                     })
 
     @api.depends('barcode_id.quant_ids', 'barcode_id.quant_ids.location_id', 'functional_tool_status',
-                 'current_shelf_location_id')
+                 'current_shelf_location_id', 'stock_num')
     def _compute_current_location_id(self):
         for record in self:
             if record.functional_tool_status == '已拆除':

sf_tool_management/models/stock.py

@@ -53,6 +53,13 @@ class StockMoveLine(models.Model):
                     [('barcode_id', '=', line_id.lot_id.id),
                      ('functional_tool_status', '=', '正常')]).cnc_function_tool_use_verify()
 
+        for move_line in move_lines:
+            if move_line.lot_id:
+                tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search(
+                    [('barcode_id', '=', move_line.lot_id.id),
+                     ('functional_tool_status', '=', '正常')])
+                tool_id.stock_num += tool_id.stock_num
+
 
 class StockPicking(models.Model):
     _inherit = 'stock.picking'