Accept Merge Request #2004: (feature/功能刀具拆解单优化_1 -> develop)

Merge Request: Merge branch 'feature/功能刀具拆解单优化' into feature/功能刀具拆解单优化_1

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2004

jikimo_account_process/__manifest__.py

@@ -20,7 +20,7 @@
     'version': '0.1',
 
     # any module necessary for this one to work correctly
-    'depends': ['base', 'account'],
+    'depends': ['base', 'account', 'l10n_cn'],
 
     # always loaded
     'data': [

jikimo_account_process/models/account_move.py

@@ -1,4 +1,4 @@
-from odoo import models, fields, api
+from odoo import models, fields, api, _
 
 from odoo.exceptions import ValidationError
 
@@ -7,6 +7,14 @@ class CustomAccountMoveLine(models.Model):
     _inherit = 'account.move'
     _description = "account move line"
 
+    fapiao = fields.Char(string='发票号', size=20, copy=False, tracking=True, required=True)
+
+    @api.constrains('fapiao')
+    def _check_fapiao(self):
+        for record in self:
+            if record.fapiao and (len(record.fapiao) != 20 or not record.fapiao.isdecimal()):
+                raise ValidationError(_("Fapiao number is an 20-digit number. Please enter a correct one."))
+
     @api.model_create_multi
     def create(self, vals):
         for val in vals:

jikimo_frontend/__manifest__.py

@@ -21,8 +21,8 @@
         'web.assets_qweb': [
         ],
         'web.assets_backend': [
-            'jikimo_frontend/static/src/fields/custom_many2many_checkboxes/*',
-            'jikimo_frontend/static/src/fields/Many2OneRadioField/*',
+            # 'jikimo_frontend/static/src/fields/custom_many2many_checkboxes/*',
+            # 'jikimo_frontend/static/src/fields/Many2OneRadioField/*',
             # 移除odoo相关标识
             'jikimo_frontend/static/src/bye_odoo/*',
             'jikimo_frontend/static/src/scss/custom_style.scss',

jikimo_frontend/static/src/css/list_border_styles.css

@@ -1,3 +1,8 @@
 .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){
     border:1px solid #dee2e6 !important;
 }
+
+.custom_required_add::before{
+    content: '*';
+    color: red;
+}

jikimo_frontend/static/src/fields/Many2OneRadioField/many2one_radio_field.css

@@ -1,3 +0,0 @@
-.many2one_radio_field {
-    display: inline-block;
-}

jikimo_frontend/static/src/fields/Many2OneRadioField/many2one_radio_field.js

@@ -1,53 +0,0 @@
-/** @odoo-module **/
-
-import { RadioField } from "@web/views/fields/radio/radio_field";  // 导入单选按钮组件
-import { registry } from "@web/core/registry";
-
-export class Many2OneRadioField extends RadioField {
-    // 你可以重写或者添加一些方法和属性
-    // 例如，你可以重写setup方法来添加一些事件监听器或者初始化一些变量
-    setup() {
-        super.setup(); // 调用父类的setup方法
-        // 你自己的代码
-    }
-
-    onImageClick(event) {
-        // 放大图片逻辑
-        // 获取图片元素
-        const img = event.target;
-        const close = img.nextSibling;
-        // 实现放大图片逻辑
-        // 比如使用 CSS 放大
-        img.parentElement.classList.add('zoomed');
-        close.classList.add('img_close');
-    }
-
-    onCloseClick(event) {
-        const close = event.target;
-        const img = close.previousSibling;
-        img.parentElement.classList.remove('zoomed');
-        close.classList.remove('img_close');
-    }
-
-   get items() {
-      return Many2OneRadioField.getItems(this.props.name, this.props.record);
-   }
-
-   static getItems(fieldName, record) {
-      switch (record.fields[fieldName].type) {
-          case "selection":
-            return record.fields[fieldName].selection;
-          case "many2one": {
-            const value = record.preloadedData[fieldName] || [];
-            return value.map((item) => [item.id, item.display_name, item.image]);
-          }
-          default:
-            return [];
-    }
-  }
-}
-
-Many2OneRadioField.template = "jikimo_frontend.Many2OneRadioField";
-// MyCustomWidget.supportedTypes = ['many2many'];
-
-registry.category("fields").add("many2one_radio", Many2OneRadioField);

jikimo_frontend/static/src/fields/Many2OneRadioField/many2one_radio_field.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates xml:space="preserve">
-
-    <t t-name="jikimo_frontend.Many2OneRadioField" owl="1">
-        <div
-            role="radiogroup"
-            t-attf-class="o_{{ props.orientation }}"
-            t-att-aria-label="string"
-        >
-            <t t-foreach="items" t-as="item" t-key="item[0]">
-                <div class="form-check o_radio_item many2one_radio_field" aria-atomic="true">
-                    <input
-                        type="radio"
-                        class="form-check-input o_radio_input"
-                        t-att-checked="item[0] === value"
-                        t-att-disabled="props.readonly"
-                        t-att-name="id"
-                        t-att-data-value="item[0]"
-                        t-att-data-index="item_index"
-                        t-att-id="`${id}_${item[0]}`"
-                        t-on-change="() => this.onChange(item)"
-                    />
-                    <label class="form-check-label o_form_label" t-att-for="`${id}_${item[0]}`" t-esc="item[1]" />
-                    <div t-on-dblclick="onImageClick">
-                    <t>
-                        <img t-att-src="item[2]" width="50" height="50"/>
-                        <div class="close" t-on-click="onCloseClick">×</div>
-                    </t>
-                    </div>
-                </div>
-            </t>
-        </div>
-    </t>
-
-</templates>

jikimo_frontend/static/src/fields/custom_many2many_checkboxes/custom_many2many_checkboxes.css

@@ -1,100 +0,0 @@
-
-.processing-capabilities-grid {
-    display: grid;
-    grid-template-columns: repeat(6, 1fr);
-    gap: 10px;
-    width: 100%;
-}
-
-.grid-item {
-    display: flex;
-    align-items: center;
-}
-
-.item-content {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    text-align: center;
-}
-/*控制图片大小*/
-.item-icon {
-    width: 50px;
-    height: 50px;
-    margin-bottom: 5px;
-    margin-top: 15px;
-}
-
-.item-label {
-    font-size: 12px;
-    word-break: break-word;
-}
-
-@media (max-width: 1200px) {
-    .processing-capabilities-grid {
-        grid-template-columns: repeat(4, 1fr);
-    }
-}
-
-@media (max-width: 768px) {
-    .processing-capabilities-grid {
-        grid-template-columns: repeat(3, 1fr);
-    }
-}
-
-@media (max-width: 480px) {
-    .processing-capabilities-grid {
-        grid-template-columns: repeat(2, 1fr);
-    }
-}
-.image-preview-container {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(0, 0, 0, 0.9);
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    z-index: 1000;
-    opacity: 0;
-    transition: opacity 0.3s ease;
-}
-
-.image-preview-container.show {
-    opacity: 1;
-}
-
-.image-preview {
-    max-width: 90%;
-    max-height: 90%;
-    object-fit: contain;
-    box-shadow: 0 0 20px rgba(255, 255, 255, 0.2);
-    border-radius: 5px;
-    transform: scale(0.9);
-    transition: transform 0.3s ease;
-}
-
-.image-preview-container.show .image-preview {
-    transform: scale(1);
-}
-
-.image-preview-close {
-    position: absolute;
-    top: 20px;
-    right: 30px;
-    color: #fff;
-    font-size: 40px;
-    font-weight: bold;
-    transition: 0.3s;
-    cursor: pointer;
-    opacity: 0.7;
-}
-
-.image-preview-close:hover,
-.image-preview-close:focus {
-    opacity: 1;
-    text-decoration: none;
-    cursor: pointer;
-}

jikimo_frontend/static/src/fields/custom_many2many_checkboxes/custom_many2many_checkboxes.js

@@ -1,60 +0,0 @@
-/** @odoo-module **/
-
-import {Many2ManyCheckboxesField} from "@web/views/fields/many2many_checkboxes/many2many_checkboxes_field";
-import {registry} from "@web/core/registry";
-
-export class MyCustomWidget extends Many2ManyCheckboxesField {
-    setup() {
-        super.setup();
-    }
-
-    onImageClick(event, src) {
-        event.preventDefault();
-        event.stopPropagation();
-
-        // 创建预览框
-        const previewContainer = document.createElement('div');
-        previewContainer.className = 'image-preview-container';
-
-        const previewImg = document.createElement('img');
-        previewImg.src = src;
-        previewImg.className = 'image-preview';
-        // 设置放大的预览图片大小
-        previewImg.style.width = '600px';
-        previewImg.style.height = 'auto'; // 保持宽高比
-
-        const closeButton = document.createElement('span');
-        closeButton.innerHTML = '×';
-        closeButton.className = 'image-preview-close';
-
-        previewContainer.appendChild(previewImg);
-        previewContainer.appendChild(closeButton);
-        document.body.appendChild(previewContainer);
-
-        // 添加关闭预览的事件监听器
-        const closePreview = () => {
-            previewContainer.classList.remove('show');
-            setTimeout(() => {
-                document.body.removeChild(previewContainer);
-            }, 300);
-        };
-
-        closeButton.addEventListener('click', closePreview);
-
-        // 点击预览框外部也可以关闭
-        previewContainer.addEventListener('click', (e) => {
-            if (e.target === previewContainer) {
-                closePreview();
-            }
-        });
-
-        // 使用 setTimeout 来触发过渡效果
-        setTimeout(() => {
-            previewContainer.classList.add('show');
-        }, 10);
-    }
-}
-
-MyCustomWidget.template = "jikimo_frontend.MyCustomWidget";
-
-registry.category("fields").add("custom_many2many_checkboxes", MyCustomWidget);

jikimo_frontend/static/src/fields/custom_many2many_checkboxes/custom_many2many_checkboxes.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates xml:space="preserve">
-
-    <t t-name="jikimo_frontend.MyCustomWidget" owl="1">
-        <div aria-atomic="true" class="many2many_flex processing-capabilities-grid">
-            <t t-foreach="items" t-as="item" t-key="item[0]">
-                <div class="grid-item">
-                    <CheckBox
-                            value="isSelected(item)"
-                            disabled="props.readonly"
-                            onChange="(ev) => this.onChange(item[0], ev)"
-                    >
-                        <div class="item-content">
-                            <img t-att-src="item[2]" class="item-icon" t-on-click="(ev) => this.onImageClick(ev, item[2])"/>
-                            <span class="item-label"><t t-esc="item[1]"/></span>
-                        </div>
-                    </CheckBox>
-                </div>
-            </t>
-        </div>
-    </t>
-
-</templates>

jikimo_frontend/static/src/js/custom_form_status_indicator.js

@@ -6,8 +6,9 @@ import {_t} from "@web/core/l10n/translation";
 import {FormStatusIndicator} from "@web/views/form/form_status_indicator/form_status_indicator";
 import {ListRenderer} from "@web/views/list/list_renderer";
 // import {StatusBarField} from "@web/views/fields/statusbar/statusbar_field";
+import {FormLabel} from "@web/views/form/form_label";
+import { fieldVisualFeedback } from "@web/views/fields/field";
 
-import {Field} from "@web/views/fields/field";
 
 var Dialog = require('web.Dialog');
 // var {patch} = require("web.utils") 这句话也行
@@ -51,7 +52,6 @@ const tableRequiredList = [
     'product_template_id', 'product_uom_qty', 'price_unit','product_id','product_qty',
     'name', 'fault_type', 'maintenance_standards', 'Period'
 ]
-
 patch(FormStatusIndicator.prototype, 'jikimo_frontend.FormStatusIndicator', {
         setup() {
             owl.onMounted(() => {
@@ -107,33 +107,7 @@ patch(FormStatusIndicator.prototype, 'jikimo_frontend.FormStatusIndicator', {
 
     }
 );
-patch(Field.prototype, 'jikimo_frontend.Field', {
-    setup() {
-        owl.onMounted(this.setRequired);
-        return this._super(...arguments);
-    },
-    setRequired() {
-        const id = this.props.id
-        const isRequired = filedRequiredList[id]
-        if(id == 'number_of_axles') {
-            console.log(isRequired)
-        }
-        if(isRequired) {
-            let dom;
-            dom = $(`label[for=${id}]`)
-            if(isRequired.multiple && dom.length > 1) {
-                dom = dom.eq(-1)
-                dom = dom.parent().parent().next().find('label')
-            }
-            if(isRequired.noLabel) {
-                dom = dom.parent().parent()
-            }
-            let t = dom.html()
-            t = '<i class="c* r" style="color: red;margin-left: -4px">*</i>' + t
-            dom.html(t)
-        }
-    }
-})
+
 patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', {
     setup(){
         owl.onMounted(() => {
@@ -144,6 +118,15 @@ patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', {
         owl.onPatched(() => { 
             this.listherHeaderBodyNum()
         })
+        const treeModifiers = this.getFieldModifiers(this.props.archInfo.__rawArch);
+        if(treeModifiers) {
+            this.props.merge_key = treeModifiers.merge_key;
+            this.props.merge_fields = treeModifiers.merge_fields.split(',');
+            const data = this.setColumns(this.props.merge_key);
+            owl.onMounted(() => {
+                this.mergeColumns(this.props.merge_fields,  data)
+            })
+        }
         return this._super(...arguments);
     },
     setRequired() {
@@ -189,40 +172,107 @@ patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', {
         } catch (e) {
             console.log(e)
         }
+    },
+    setColumns( merge_key) {
+        merge_key = merge_key.split(',')
+        const data = this.props.list.records
+        let sourceIndex = 0;
+        let sourceValue = merge_key.reduce((acc, key) => {
+            acc[key] = '';
+            return acc;
+        }, {});
+        
+        data.forEach((item, index) => {
+            if(!item.colspan) {
+                item.colspan = 1;
+            }
+            const itemValue = merge_key.reduce((acc, key) => {
+                acc[key] = item.data[key];
+                return acc;
+            }, {});
+            if(JSON.stringify(itemValue) == JSON.stringify(sourceValue)) {
+                data[sourceIndex].colspan ++ ;
+                item.colspan = 0;
+            } else {
+                sourceIndex = index;
+                sourceValue = itemValue;
+            }
+        })
+        return data
+    },
+    getFieldModifiers(xmlString) {
+        const parser = new DOMParser();
+        const xmlDoc = parser.parseFromString(xmlString, "text/xml");
+
+        // 提取 <tree> 的 modifiers
+        const treeElement = xmlDoc.querySelector("tree");
+        const treeModifiers = treeElement.getAttribute("modifiers");
+        if (treeModifiers) {
+            const parsedTreeModifiers = JSON.parse(treeModifiers);
+            console.log("Tree Modifiers:", parsedTreeModifiers);
+            return parsedTreeModifiers;
+        }
+        return null;
+    },
+    mergeColumns(merge_fields, data) {
+        const dom = this.tableRef.el
+        const thead = $(dom).children('thead')
+        const tbody = $(dom).children('tbody')
+        let row_no = 0
+        tbody.children('tr.o_data_row').each(function () {
+            const tr = $(this)
+            const td = tr.children('td')
+            const index = $(this).index()
+            const col = data[index].colspan
+            row_no ++
+            if(col == 0) {
+                row_no --
+            }
+            td.eq(0).text(row_no).attr('rowspan', col)
+            
+            if(col == 0) {
+                td.eq(0).remove()
+            }
+            td.each(function () {
+                if(merge_fields.indexOf($(this).attr('name')) >= 0) {
+                    $(this).attr('rowspan', col)
+                    if(col == 0) {
+                        $(this).remove()
+                    }
+                }
+            })
+        })
+    }
+    
+})
+patch(FormLabel.prototype, 'jikimo_frontend.FormLabel', {
+    get className() {
+        
+        const { invalid, empty, readonly } = fieldVisualFeedback(
+            this.props.fieldInfo.FieldComponent,
+            this.props.record,
+            this.props.fieldName,
+            this.props.fieldInfo
+        );
+        const classes = this.props.className ? [this.props.className] : [];
+        const otherRequired = filedRequiredList[this.props.fieldName]
+        if(this.props.fieldInfo?.rawAttrs?.class?.indexOf('custom_required') >= 0 || otherRequired) {
+            classes.push('custom_required_add')
+        }
+        if (invalid) {
+            classes.push("o_field_invalid");
+        }
+        if (empty) {
+            classes.push("o_form_label_empty");
+        }
+        if (readonly) {
+            classes.push("o_form_label_readonly");
+        }
+        return classes.join(" ");
     }
 })
 
 
-// 根据进度条设置水印
-// const statusbar_params = {
-//     '已完工': 'bg-primary',
-//     '完成': 'bg-primary',
-//     '采购订单': 'bg-primary',
-//     '作废': 'bg-danger',
-//     '封存(报废)': 'bg-danger',
-// }
-// patch(StatusBarField.prototype, 'jikimo_frontend.StatusBarField', {
-//    setup() {
-//         owl.onMounted(this.ribbons);
-//         return this._super(...arguments);
-//    },
-//    ribbons() {
-//        try {
-//            const dom = $('.o_form_sheet.position-relative')
-//            const status = statusbar_params[this.currentName]
-//            if(status && dom.length) {
-//                dom.prepend(`<div class="o_widget o_widget_web_ribbon">
-//                                 <div class="ribbon ribbon-top-right">
-//                                     <span class="bg-opacity-75 ${status}" title="">${this.currentName}</span>
-//                                 </div>
-//                             </div>`)
-//            }
-//        } catch (e) {
-//            console.log(e)
-//        }
-//    }
-// })
-
 $(function () {
 
     function customRequired() {
@@ -231,7 +281,6 @@ $(function () {
         clearInterval(timer)
         timer = setInterval(() => {
             timer_count++
-            const dom = $('.custom_required')
             let tableDom = $('.table_custom_required')
             if (tableDom.length) {
                 tableDom = tableDom.eq(0).parents('tr').children('.table_custom_required')
@@ -243,17 +292,6 @@ $(function () {
                 })
                 clearInterval(timer)
             }
-            if (dom.length) {
-                dom.each(function () {
-                    const requiredDom = $(this).parent().prev().find('label')
-                    let t = requiredDom.html()
-                    if (t && t.indexOf('c*') < 0) {
-                        t = '<i class="c*" style="color: red;margin-left: -4px">*</i>' + t
-                    }
-                    requiredDom.html(t)
-                })
-                clearInterval(timer)
-            }
             if (timer_count == 20) {
                 clearInterval(timer)
             }

jikimo_frontend/static/src/views/list_nums/list_nums.xml

@@ -10,7 +10,6 @@
 </t>
 
 
-
 <!-- 暂存，同一份文件中有问题，拆分后正常工作 -->
 
 <!-- <t t-name="og.web.ListRenderer.Rows" t-inherit="web.ListRenderer.Rows" t-inherit-mode="extension"> -->

jikimo_purchase_request/__init__.py

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+from . import models
+from . import wizard

jikimo_purchase_request/__manifest__.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+{
+    'name': '机企猫 采购申请',
+    'version': '16.0.1.0.0',
+    'summary': """ 机企猫 采购申请 """,
+    'author': '机企猫',
+    'website': 'https://bfw.jikimo.com',
+    'category': 'purchase',
+    'depends': ['sf_manufacturing', 'purchase_request'],
+    'data': [
+        'views/sale_order_view.xml',
+        'views/mrp_production.xml',
+        'views/purchase_request_view.xml',
+        'wizard/purchase_request_line_make_purchase_order_view.xml',
+    ],
+    # 'assets': {
+    #           'web.assets_backend': [
+    #               'jikimo_purchase_request/static/src/**/*'
+    #           ],
+    #       },
+    'application': True,
+    'installable': True,
+    'auto_install': False,
+    'license': 'LGPL-3',
+}

jikimo_purchase_request/models/__init__.py

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+from . import product_template
+from . import purchase_request
+from . import sale_order
+from . import mrp_production
+from . import purchase_order
+from . import stock_rule

jikimo_purchase_request/models/mrp_production.py

@@ -0,0 +1,39 @@
+from odoo import fields, models, api, _
+
+
+class MrpProduction(models.Model):
+    _inherit = 'mrp.production'
+
+    pr_mp_count = fields.Integer('采购申请单数量', compute='_compute_pr_mp_count', store=True)
+
+    @api.depends('state')
+    def _compute_pr_mp_count(self):
+        for item in self:
+            pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name)])
+            if pr_ids:
+                item.pr_mp_count = len(pr_ids)
+            else:
+                item.pr_mp_count = 0
+
+    def action_view_pr_mp(self):
+        """
+        采购请求
+        """
+        self.ensure_one()
+        pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name)])
+        action = {
+            'res_model': 'purchase.request',
+            'type': 'ir.actions.act_window',
+        }
+        if len(pr_ids) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': pr_ids[0].id,
+            })
+        else:
+            action.update({
+                'name': _("从 %s生成采购请求单", self.name),
+                'domain': [('id', 'in', pr_ids)],
+                'view_mode': 'tree,form',
+            })
+        return action

jikimo_purchase_request/models/product_template.py

@@ -0,0 +1,19 @@
+from odoo import models, fields
+
+
+class ProductTemplate(models.Model):
+    _inherit = 'product.template'
+
+    purchase_request_id = fields.Many2one('purchase.request', string='采购申请')
+
+    def no_bom_product_create(self, product_id, item, order_id, route_type, i, finish_product):
+        """ 创建坯料时，复制采购申请 """
+        template_id = super(ProductTemplate, self).no_bom_product_create(product_id, item, order_id, route_type, i,
+                                                                         finish_product)
+        template_id.purchase_request = product_id.purchase_request
+        return template_id
+
+    def copy_template(self, product_template_id):
+        """ 复制成品模板时，复制采购申请 """
+        super(ProductTemplate, self).copy_template(product_template_id)
+        self.purchase_request = product_template_id.purchase_request

jikimo_purchase_request/models/purchase_order.py

@@ -0,0 +1,16 @@
+from odoo import api, fields, models, _
+
+
+class PurchaseOrder(models.Model):
+    _inherit = 'purchase.order'
+
+    state = fields.Selection([
+        ('draft', '询价'),
+        ('sent', '发送询价'),
+        ('to approve', '待批准'),
+        ("approved", "已批准"),
+        ('purchase', '采购订单'),
+        ('done', '完成'),
+        ('cancel', '取消'),
+        ('rejected', '已驳回')
+    ], string='Status', readonly=True, index=True, copy=False, default='draft', tracking=True)

jikimo_purchase_request/models/purchase_request.py

@@ -0,0 +1,100 @@
+import re
+import ast
+from odoo import models, fields, api
+
+
+class PurchaseRequest(models.Model):
+    _inherit = 'purchase.request'
+    _description = '采购申请'
+
+     # 为state添加取消状态
+    state = fields.Selection(
+        selection_add=[('cancel', '已取消')],
+        ondelete={'cancel': 'set default'}  # 添加 ondelete 策略
+    )
+
+    rule_new_add = fields.Boolean('采购请求为规则创建', default=False, compute='_compute_state', store=True)
+
+    @api.depends('state')
+    def _compute_state(self):
+        for pr in self:
+            if pr.state != 'draft' and pr.rule_new_add:
+                pr.rule_new_add = False
+
+    def action_view_purchase_order(self):
+        action = super(PurchaseRequest, self).action_view_purchase_order()
+        origin_context = ast.literal_eval(action['context'])
+        if 'search_default_draft' in origin_context:
+            origin_context.pop('search_default_draft')
+        action['context'] = origin_context
+        return action
+
+class PurchaseRequestLine(models.Model):
+    _inherit = 'purchase.request.line'
+    _description = '采购申请明细'
+
+    origin = fields.Char(string="Source Document")
+
+    part_number = fields.Char('零件图号', store=True, compute='_compute_part_number')
+    part_name = fields.Char('零件名称', store=True, compute='_compute_part_number')
+    related_product = fields.Many2one('product.product', string='关联产品',
+                                      help='经此产品工艺加工成的成品')
+
+    supply_method = fields.Selection([
+        ('automation', "自动化产线加工"),
+        ('manual', "人工线下加工"),
+        ('purchase', "外购"),
+        ('outsourcing', "委外加工"),
+    ], string='供货方式', compute='_compute_supply_method', store=True)
+
+    @api.depends('origin')
+    def _compute_supply_method(self):
+        for prl in self:
+            order_ids = []
+            if not prl.origin:
+                continue
+            origin = [origin.replace(' ', '') for origin in prl.origin.split(',')]
+            if 'S' in prl.origin:
+                # 原单据是销售订单
+                order_ids = self.env['sale.order'].sudo().search([('name', 'in', origin)]).ids
+            elif 'MO' in prl.origin:
+                # 原单据是制造订单
+                mp_ids = self.env['mrp.production'].sudo().search([('name', 'in', origin)])
+                order_ids = [mp_id.sale_order_id.id for mp_id in mp_ids] if mp_ids else []
+            elif 'WH' in prl.origin:
+                # 原单据是调拨单
+                sp_ids = self.env['stock.picking'].sudo().search([('name', 'in', origin)])
+                order_ids = [sp_id.sale_order_id.id for sp_id in sp_ids] if sp_ids else []
+            order_line = self.env['sale.order.line'].sudo().search(
+                [('product_id', '=', prl.product_id.id), ('order_id', 'in', order_ids)])
+            if order_line:
+                prl.supply_method = order_line[0].supply_method
+            else:
+                prl.supply_method = None
+
+    @api.depends('product_id')
+    def _compute_part_number(self):
+        for record in self:
+            if record.part_number and record.part_name:
+                continue
+            if record.product_id.categ_id.name == '坯料':
+                product_name = ''
+                match = re.search(r'(S\d{5}-\d)', record.product_id.name)
+                # 如果匹配成功，提取结果
+                if match:
+                    product_name = match.group(0)
+                sale_order_name = ''
+                match_sale = re.search(r'S(\d+)', record.product_id.name)
+                if match_sale:
+                    sale_order_name = match_sale.group(0)
+                sale_order = self.env['sale.order'].sudo().search(
+                    [('name', '=', sale_order_name)])
+                if sale_order:
+                    filtered_order_line = sale_order.order_line.filtered(
+                        lambda order_line: re.search(f'{product_name}$', order_line.product_id.name)
+                    )
+                    record.part_number = filtered_order_line.product_id.part_number
+                    record.part_name = filtered_order_line.product_id.part_name
+            else:
+                record.part_number = record.product_id.part_number
+                record.part_name = record.product_id.part_name

jikimo_purchase_request/models/sale_order.py

@@ -0,0 +1,50 @@
+from odoo import fields, models, api, _
+
+
+class StatusChange(models.Model):
+    _inherit = 'sale.order'
+
+    # def action_confirm(self):
+    #     res = super(StatusChange, self).action_confirm()
+    #     # 采购申请自动确认
+    #     pr_ids = self.env["purchase.request"].sudo().search(
+    #         [('origin', 'like', self.name), ('rule_new_add', '=', True)])
+    #     if pr_ids:
+    #         pr_ids.write({'need_validation': False})
+    #         pr_ids.write({"state": "approved"})
+    #     return res
+
+    purchase_request_purchase_order_count = fields.Integer('采购申请单数量', compute='_compute_purchase_request_count',
+                                                           store=True)
+
+    @api.depends('state')
+    def _compute_purchase_request_count(self):
+        for so in self:
+            pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', so.name)])
+            if pr_ids:
+                so.purchase_request_purchase_order_count = len(pr_ids)
+            else:
+                so.purchase_request_purchase_order_count = 0
+
+    def action_view_purchase_request_purchase_orders(self):
+        """
+        采购请求
+        """
+        self.ensure_one()
+        pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name)])
+        action = {
+            'res_model': 'purchase.request',
+            'type': 'ir.actions.act_window',
+        }
+        if len(pr_ids) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': pr_ids[0].id,
+            })
+        else:
+            action.update({
+                'name': _("从 %s生成采购请求单", self.name),
+                'domain': [('id', 'in', pr_ids)],
+                'view_mode': 'tree,form',
+            })
+        return action

jikimo_purchase_request/models/stock_rule.py

@@ -0,0 +1,56 @@
+from odoo import api, fields, models
+
+
+class StockRule(models.Model):
+    _inherit = "stock.rule"
+
+    def create_purchase_request(self, procurement_group):
+        """
+        Create a purchase request containing procurement order product.
+        """
+        procurement = procurement_group[0]
+        rule = procurement_group[1]
+        purchase_request_model = self.env["purchase.request"]
+        purchase_request_line_model = self.env["purchase.request.line"]
+        cache = {}
+        pr = self.env["purchase.request"]
+        domain = rule._make_pr_get_domain(procurement.values)
+        if domain in cache:
+            pr = cache[domain]
+        elif domain:
+            pr = self.env["purchase.request"].search([dom for dom in domain])
+            pr = pr[0] if pr else False
+            cache[domain] = pr
+        if not pr:
+            request_data = rule._prepare_purchase_request(
+                procurement.origin, procurement.values
+            )
+            request_data.update({'rule_new_add': True})
+            pr = purchase_request_model.create(request_data)
+            cache[domain] = pr
+        elif (
+                not pr.origin
+                or procurement.origin not in pr.origin.split(", ")
+                and procurement.origin != "/"
+        ):
+            if pr.origin:
+                if procurement.origin:
+                    pr.write({"origin": pr.origin + ", " + procurement.origin})
+            else:
+                pr.write({"origin": procurement.origin})
+        # Create Line
+        request_line_data = rule._prepare_purchase_request_line(pr, procurement)
+        request_line_data.update({'origin': procurement.origin})
+        purchase_request_line_model.create(request_line_data)
+
+    def _run_buy(self, procurements):
+        res = super(StockRule, self)._run_buy(procurements)
+        # 判断是否根据规则生成新的采购申请单据，如果生成则修改状态为 approved
+        origins = list(set([procurement[0].origin for procurement in procurements]))
+        for origin in origins:
+            pr_ids = self.env["purchase.request"].sudo().search(
+                [('origin', 'like', origin), ('rule_new_add', '=', True), ('state', '=', 'draft')])
+            if pr_ids:
+                pr_ids.write({'need_validation': False})
+                pr_ids.write({"state": "approved", 'need_validation': True, 'rule_new_add': False})
+        return res

jikimo_purchase_request/views/mrp_production.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="mrp_production_inherited_form_purchase_request" model="ir.ui.view">
+        <field name="name">mrp.production.inherited.form.purchase.request</field>
+        <field name="model">mrp.production</field>
+        <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//button[@name='action_view_mo_delivery']" position="before">
+                <button class="oe_stat_button" name="action_view_pr_mp" type="object" icon="fa-credit-card"
+                        attrs="{'invisible': [('pr_mp_count', '=', 0)]}">
+                    <div class="o_field_widget o_stat_info">
+                        <span class="o_stat_value">
+                            <field name="pr_mp_count"/>
+                        </span>
+                        <span class="o_stat_text">采购申请</span>
+                    </div>
+                </button>
+            </xpath>
+        </field>
+    </record>
+</odoo>

jikimo_purchase_request/views/purchase_request_view.xml

@@ -0,0 +1,66 @@
+<odoo>
+    <record id="view_purchase_request_form_sf" model="ir.ui.view">
+        <field name="name">purchase.request.sf.form</field>
+        <field name="model">purchase.request</field>
+        <field name="inherit_id" ref="purchase_request.view_purchase_request_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//button[@name='button_draft']" position="attributes">
+                <attribute name="string">重置草稿</attribute>
+            </xpath>
+            <xpath expr="//field[@name='line_ids']//field[@name='purchased_qty']" position="after">
+                <field name="supply_method"/>
+            </xpath>
+            <xpath expr="//field[@name='line_ids']//field[@name='name']" position="replace">
+                <field name="related_product"/>
+                <field name="part_number"/>
+                <field name="part_name"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_purchase_request_line_tree_sf" model="ir.ui.view">
+        <field name="name">purchase.request.line.sf.tree</field>
+        <field name="model">purchase.request.line</field>
+        <field name="inherit_id" ref="purchase_request.purchase_request_line_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='requested_by']" position="replace">
+                <field name="supply_method"/>
+            </xpath>
+            <xpath expr="//field[@name='assigned_to']" position="attributes">
+                <attribute name="invisible">True</attribute>
+            </xpath>
+            <xpath expr="//field[@name='name']" position="attributes">
+                <attribute name="invisible">True</attribute>
+            </xpath>
+            <xpath expr="//field[@name='supplier_id']" position="after">
+                <field name="requested_by" widget="many2one_avatar_user"/>
+                <field name="assigned_to" widget="many2one_avatar_user" invisible="1"/>
+            </xpath>
+            <xpath expr="//field[@name='purchased_qty']" position="attributes">
+                <attribute name="string">采购数量</attribute>
+            </xpath>
+            <xpath expr="//field[@name='purchase_state']" position="attributes">
+                <attribute name="string">订单状态</attribute>
+            </xpath>
+            <xpath expr="//field[@name='product_id']" position="after">
+                <field name="related_product"/>
+                <field name="part_number"/>
+                <field name="part_name" invisible="1"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_purchase_request_line_search_sf" model="ir.ui.view">
+        <field name="name">purchase.request.line.sf.search</field>
+        <field name="model">purchase.request.line</field>
+        <field name="inherit_id" ref="purchase_request.purchase_request_line_search"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='product_id']" position="after">
+                <field name="supply_method"/>
+                <field name="related_product"/>
+                <field name="part_number"/>
+                <field name="part_name"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>

jikimo_purchase_request/views/sale_order_view.xml

@@ -0,0 +1,19 @@
+<odoo>
+    <record id="sale_order_inherited_form_purchase_request_sf" model="ir.ui.view">
+        <field name="name">sale.order.inherited.form.purchase.request</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale_purchase.sale_order_inherited_form_purchase"/>
+        <field name="arch" type="xml">
+            <xpath expr="//button[@name='action_preview_sale_order']" position="before">
+                <button class="oe_stat_button" name="action_view_purchase_request_purchase_orders" type="object" icon="fa-credit-card"
+                        groups='purchase.group_purchase_user'
+                        attrs="{'invisible': [('purchase_request_purchase_order_count', '=', 0)]}">
+                    <div class="o_field_widget o_stat_info">
+                        <span class="o_stat_value"><field name="purchase_request_purchase_order_count"/></span>
+                        <span class="o_stat_text">采购申请</span>
+                    </div>
+                </button>
+            </xpath>
+        </field>
+    </record>
+</odoo>

jikimo_purchase_request/wizard/__init__.py

@@ -0,0 +1,3 @@
+# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0)
+
+from . import purchase_request_line_make_purchase_order

jikimo_purchase_request/wizard/purchase_request_line_make_purchase_order.py

@@ -0,0 +1,108 @@
+# Copyright 2018-2019 ForgeFlow, S.L.
+# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0).
+from datetime import datetime
+
+from odoo import _, api, fields, models
+from odoo.exceptions import UserError, ValidationError
+from odoo.tools import get_lang
+
+
+class PurchaseRequestLineMakePurchaseOrder(models.TransientModel):
+    _inherit = "purchase.request.line.make.purchase.order"
+
+    def make_purchase_order(self):
+        res = []
+        purchase_obj = self.env["purchase.order"]
+        po_line_obj = self.env["purchase.order.line"]
+        purchase = False
+
+        if len(set([item_id.line_id.supply_method for item_id in self.item_ids])) > 1:
+            raise ValidationError('不同供货方式不可合并创建询价单!')
+
+        for item in self.item_ids:
+            line = item.line_id
+            if item.product_qty <= 0.0:
+                raise UserError(_("Enter a positive quantity."))
+            if self.purchase_order_id:
+                purchase = self.purchase_order_id
+            if not purchase:
+                po_data = self._prepare_purchase_order(
+                    line.request_id.picking_type_id,
+                    line.request_id.group_id,
+                    line.company_id,
+                    line.request_id.origin,
+                )
+                purchase = purchase_obj.create(po_data)
+
+            # Look for any other PO line in the selected PO with same
+            # product and UoM to sum quantities instead of creating a new
+            # po line
+            domain = self._get_order_line_search_domain(purchase, item)
+            available_po_lines = po_line_obj.search(domain)
+            new_pr_line = True
+            # If Unit of Measure is not set, update from wizard.
+            if not line.product_uom_id:
+                line.product_uom_id = item.product_uom_id
+            # Allocation UoM has to be the same as PR line UoM
+            alloc_uom = line.product_uom_id
+            wizard_uom = item.product_uom_id
+            if available_po_lines and not item.keep_description:
+                new_pr_line = False
+                po_line = available_po_lines[0]
+                po_line.purchase_request_lines = [(4, line.id)]
+                po_line.move_dest_ids |= line.move_dest_ids
+                po_line_product_uom_qty = po_line.product_uom._compute_quantity(
+                    po_line.product_uom_qty, alloc_uom
+                )
+                wizard_product_uom_qty = wizard_uom._compute_quantity(
+                    item.product_qty, alloc_uom
+                )
+                all_qty = min(po_line_product_uom_qty, wizard_product_uom_qty)
+                self.create_allocation(po_line, line, all_qty, alloc_uom)
+            else:
+                po_line_data = self._prepare_purchase_order_line(purchase, item)
+                if item.keep_description:
+                    po_line_data["name"] = item.name
+                po_line = po_line_obj.create(po_line_data)
+                po_line_product_uom_qty = po_line.product_uom._compute_quantity(
+                    po_line.product_uom_qty, alloc_uom
+                )
+                wizard_product_uom_qty = wizard_uom._compute_quantity(
+                    item.product_qty, alloc_uom
+                )
+                all_qty = min(po_line_product_uom_qty, wizard_product_uom_qty)
+                self.create_allocation(po_line, line, all_qty, alloc_uom)
+            self._post_process_po_line(item, po_line, new_pr_line)
+            res.append(purchase.id)
+
+        purchase_requests = self.item_ids.mapped("request_id")
+        purchase_requests.button_in_progress()
+        return {
+            "domain": [("id", "in", res)],
+            "name": _("RFQ"),
+            "view_mode": "tree,form",
+            "res_model": "purchase.order",
+            "view_id": False,
+            "context": False,
+            "type": "ir.actions.act_window",
+        }
+    
+    def _check_valid_request_line(self, request_line_ids):
+        for line in self.env["purchase.request.line"].browse(request_line_ids):
+            if line.request_id.state not in ["approved", "in_progress"]:
+                raise UserError(
+                    _("采购申请 %s 未审批或未进行中")
+                    % line.request_id.name
+                )
+        super(PurchaseRequestLineMakePurchaseOrder, self)._check_valid_request_line(request_line_ids)
+    
+    @api.model
+    def check_group(self, request_lines):
+        # 去掉合并必须同一采购组的限制
+        pass
+        
+
+class PurchaseRequestLineMakePurchaseOrderItem(models.TransientModel):
+    _inherit = "purchase.request.line.make.purchase.order.item"
+
+    supply_method = fields.Selection(related='line_id.supply_method', string='供货方式')

jikimo_purchase_request/wizard/purchase_request_line_make_purchase_order_view.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_purchase_request_line_make_purchase_order_sf" model="ir.ui.view">
+        <field name="name">Purchase Request Line Make Purchase Order sf</field>
+        <field name="model">purchase.request.line.make.purchase.order</field>
+        <field name="inherit_id" ref="purchase_request.view_purchase_request_line_make_purchase_order"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='item_ids']//field[@name='keep_description']" position="before">
+                <field name="supply_method"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>

jikimo_purchase_request_tier_validation/__init__.py

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import models

jikimo_purchase_request_tier_validation/__manifest__.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+{
+    'name': "机企猫 采购审批流程",
+
+    'summary': """
+        Short (1 phrase/line) summary of the module's purpose, used as
+        subtitle on modules listing or apps.openerp.com""",
+
+    'description': """
+        Long description of module's purpose
+    """,
+
+    'author': "My Company",
+    'website': "https://www.yourcompany.com",
+
+    # Categories can be used to filter modules in modules listing
+    # Check https://github.com/odoo/odoo/blob/16.0/odoo/addons/base/data/ir_module_category_data.xml
+    # for the full list
+    'category': 'Uncategorized',
+    'version': '0.1',
+
+    # any module necessary for this one to work correctly
+    'depends': ['purchase_request_tier_validation'],
+
+    # always loaded
+    'data': [
+    ],
+}

jikimo_purchase_request_tier_validation/models/__init__.py

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import models

jikimo_purchase_request_tier_validation/models/models.py

@@ -0,0 +1,24 @@
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError
+import logging
+
+_logger = logging.getLogger(__name__)
+
+
+class PurchaseRequest(models.Model):
+    _inherit = 'purchase.request'
+    
+
+    def _validate_tier(self, tiers=False):
+        res = super(PurchaseRequest, self)._validate_tier(tiers)
+
+        # 检查是否所有审批都已通过
+        all_approved = all(
+            tier_review.status == 'approved'
+            for tier_review in self.review_ids
+        )
+
+        if self.review_ids and all_approved:  # 确保有审批记录
+            self.state = 'approved'
+
+        return res

jikimo_purchase_tier_validation/__manifest__.py

@@ -1,14 +1,12 @@
 # -*- coding: utf-8 -*-
 {
-    'name': "机企猫 采购审批流程",
+    'name': "机企猫 采购申请审批流程",
 
     'summary': """
-        Short (1 phrase/line) summary of the module's purpose, used as
-        subtitle on modules listing or apps.openerp.com""",
+        采购申请审批流程""",
 
     'description': """
-        Long description of module's purpose
-    """,
+        采购申请审批流程""",
 
     'author': "My Company",
     'website': "https://www.yourcompany.com",

jikimo_purchase_tier_validation/models/models.py

@@ -9,6 +9,8 @@ class jikimo_purchase_tier_validation(models.Model):
     _name = 'purchase.order'
     _inherit = ['purchase.order', 'tier.validation']
     _description = "采购订单"
+    _state_from = ["draft", "to approve", "rejected"]
+    _state_to = ["approved", "purchase"]
 
     _tier_validation_buttons_xpath = "/form/header/button[@id='draft_confirm'][1]"
 
@@ -20,9 +22,9 @@ class jikimo_purchase_tier_validation(models.Model):
     is_upload_contract_file = fields.Boolean(string='是否已上传合同文件', default=False)
 
     def button_confirm(self):
-        for record in self:
-            if record.state in ['to approve']:
-                raise ValidationError(_('请先完成审批。'))
+        # for record in self:
+        #     if record.need_validation and not record.validation_status == 'validated':
+        #         raise ValidationError(_('请先完成审批。'))
         res = super(jikimo_purchase_tier_validation, self).button_confirm()
         for record in self:
             if record.state == 'approved':
@@ -68,11 +70,6 @@ class jikimo_purchase_tier_validation(models.Model):
 
         return res
 
-    def _rejected_tier(self, tiers=False):
-        res = super(jikimo_purchase_tier_validation, self)._rejected_tier(tiers)
-        self.state = 'draft'
-        return res
-
     @api.model
     def _get_under_validation_exceptions(self):
         res = super(jikimo_purchase_tier_validation, self)._get_under_validation_exceptions()

jikimo_sale_multiple_supply_methods/models/mrp_bom.py

@@ -9,5 +9,6 @@ class MrpBom(models.Model):
 
         # 成品的供应商从模板中获取
         if product_type == 'product':
-            bom_id.subcontractor_id = product.product_tmpl_id.seller_ids.partner_id.id
+            if product.product_tmpl_id.seller_ids:
+                bom_id.subcontractor_id = product.product_tmpl_id.seller_ids[-1].partner_id.id
         return bom_id

jikimo_test_assistant/__init__.py

@@ -0,0 +1,3 @@
+from . import models
+from . import controllers
+from . import wizards

jikimo_test_assistant/__manifest__.py

@@ -0,0 +1,32 @@
+{
+    'name': '机企猫 测试助手',
+    'version': '16.0.1.0.0',
+    'category': 'Technical',
+    'summary': '测试数据初始化工具',
+    'description': """
+        用于初始化测试环境数据的工具模块
+    """,
+    'author': 'Jikimo',
+    'website': 'www.jikimo.com',
+    'depends': [
+        'base',
+        'sale_management',
+        'purchase',
+        'mrp',
+        'stock',
+        'account'
+    ],
+    'data': [
+        'security/ir.model.access.csv',
+        'wizards/jikimo_data_clean_wizard.xml',
+    ],
+    'assets': {
+        'web.assets_backend': [
+            'jikimo_test_assistant/static/src/js/data_clean_confirm.js',
+        ],
+    },
+    'installable': True,
+    'application': False,
+    'auto_install': False,
+    'license': 'LGPL-3',
+} 

jikimo_test_assistant/controllers/__init__.py

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import main

jikimo_test_assistant/controllers/main.py

@@ -0,0 +1,86 @@
+from odoo import http
+import logging
+import os
+import json
+import sys
+
+_logger = logging.getLogger(__name__)
+
+class Main(http.Controller):
+    @http.route('/api/pdf2image', type='http', auth='public', methods=['POST'], csrf=False)
+    def convert_pdf_to_image(self, **kwargs):
+        """将PDF文件转换为图片文件
+        
+        Returns:
+            dict: 包含转换后图片url的字典
+        """
+        res = {}
+        try:
+            # 检查poppler是否可用
+            # if sys.platform.startswith('win'):
+            #     if not os.environ.get('POPPLER_PATH'):
+            #         return {
+            #             'code': 400,
+            #             'msg': '请先配置POPPLER_PATH环境变量'
+            #         }
+            # else:
+            #     import shutil
+            #     if not shutil.which('pdftoppm'):
+            #         return {
+            #             'code': 400,
+            #             'msg': '请先安装poppler-utils'
+            #         }
+                
+            # 获取上传的PDF文件
+            pdf_file = kwargs.get('file')
+            if not pdf_file:
+                res = {'code': 400, 'msg': '未找到上传的PDF文件'}
+                
+            # 检查文件类型
+            if not pdf_file.filename.lower().endswith('.pdf'):
+                res = {'code': 400, 'msg': '请上传PDF格式的文件'}
+            
+            # 读取PDF文件内容
+            pdf_content = pdf_file.read()
+            
+            # 使用pdf2image转换
+            from pdf2image import convert_from_bytes
+            import tempfile
+            
+            # 转换PDF
+            with tempfile.TemporaryDirectory() as path:
+                images = convert_from_bytes(pdf_content)
+                image_urls = []
+                
+                # 保存每一页为图片
+                for i, image in enumerate(images):
+                    image_path = os.path.join(path, f'page_{i+1}.jpg')
+                    image.save(image_path, 'JPEG')
+                    
+                    # 将图片保存到ir.attachment
+                    with open(image_path, 'rb') as img_file:
+                        attachment = http.request.env['ir.attachment'].sudo().create({
+                            'name': f'page_{i+1}.jpg',
+                            'datas': img_file.read(),
+                            'type': 'binary',
+                            'access_token': kwargs.get('access_token') or '123'
+                        })
+                        image_urls.append({
+                            'page': i+1,
+                            'url': f'/web/content/{attachment.id}'
+                        })
+                        
+            res = {
+                'code': 200,
+                'msg': '转换成功',
+                'data': image_urls
+            }
+            
+        except Exception as e:
+            _logger.error('PDF转换失败: %s', str(e))
+            res = {
+                'code': 500,
+                'msg': f'转换失败: {str(e)}'
+            }
+        return json.JSONEncoder().encode(res)
+

jikimo_test_assistant/models/__init__.py

@@ -0,0 +1 @@
+

jikimo_test_assistant/security/ir.model.access.csv

@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_jikimo_data_clean_wizard,jikimo_test_assistant.jikimo_data_clean_wizard,model_jikimo_data_clean_wizard,base.group_system,1,1,1,1

jikimo_test_assistant/static/src/js/data_clean_confirm.js

@@ -0,0 +1,50 @@
+odoo.define('jikimo_test_assistant.action_clean_data_confirm', function (require) {
+    const core = require('web.core');
+    const ajax = require('web.ajax');
+    const Dialog = require('web.Dialog');
+    var rpc = require('web.rpc');
+    var _t = core._t;
+
+    async function action_clean_data_confirm(parent, {params}) {
+        let message = "确认清理数据？<br/>"
+        message += "日期："+ params.date + "以前<br/>"
+        message += "模型：" + params.model_names.join('，') 
+        const dialog = new Dialog(parent, {
+            title: "确认",
+            $content: $('<div>').append(message),
+            buttons: [
+                { text: "确认", classes: 'btn-primary jikimo_button_confirm', close: true, click: () => actionCleanDataConfirm(parent, params) },
+                { text: "取消", close: true },
+            ],
+        });
+        dialog.open();
+
+
+        async function actionCleanDataConfirm(parent, params) {
+            rpc.query({
+                model: 'jikimo.data.clean.wizard',
+                method: 'action_clean_data',
+                args: [params.active_id],
+                kwargs: {
+                    context: params.context,
+                }
+            }).then(res => {
+                parent.services.action.doAction({
+                     'type': 'ir.actions.client',
+                     'tag': 'display_notification',
+                     'target': 'new',
+                     'params': {
+                         'message': '数据清理成功！',
+                         'type': 'success',
+                         'sticky': false,
+                         'next': {'type': 'ir.actions.act_window_close'},
+                     }
+                 });
+            })
+
+        }
+    }
+
+    core.action_registry.add('action_clean_data_confirm', action_clean_data_confirm);
+    return action_clean_data_confirm;
+});

jikimo_test_assistant/wizards/__init__.py

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import jikimo_data_clean_wizard

jikimo_test_assistant/wizards/jikimo_data_clean_wizard.py

@@ -0,0 +1,99 @@
+from odoo import models, fields, api
+from datetime import datetime
+
+import logging
+
+_logger = logging.getLogger(__name__)
+
+class JikimoDataCleanWizard(models.TransientModel):
+    _name = 'jikimo.data.clean.wizard'
+    _description = '业务数据清理'
+
+    date = fields.Date(string='截止日期', required=True, default=fields.Date.context_today)
+    model_ids = fields.Many2many('ir.model', string='业务模型', domain=[
+        ('model', 'in', [
+            'sale.order',           # 销售订单
+            'purchase.order',       # 采购订单 
+            'mrp.production',       # 生产订单
+            'stock.picking',        # 库存调拨
+            'account.move',         # 会计凭证
+        ])
+    ])
+
+    def action_clean_data(self):
+        self.ensure_one()
+        model_list = self.model_ids.mapped('model')
+        
+        # 销售订单清理（排除已交付，已锁定，已取消）
+        if 'sale.order' in model_list:
+            self.model_cancel('sale.order', except_states=['delivered', 'done', 'cancel'])
+
+        # 采购订单清理（排除采购订单，已锁定，已取消）
+        if 'purchase.order' in model_list:
+            self.model_cancel('purchase.order', except_states=['purchase', 'done', 'cancel'])
+
+        # 生产订单清理（排除返工，报废，完成，已取消）
+        if 'mrp.production' in model_list:
+            self.model_cancel('mrp.production', except_states=['rework', 'scrap', 'done', 'cancel'])
+
+        # 工单清理 （排除返工，完成，已取消）
+        if 'mrp.workorder' in model_list:
+            self.model_cancel('mrp.production', except_states=['rework', 'done', 'cancel'])
+        
+        # 排程单清理 （排除已完成，已取消）
+        if 'mrp.workorder' in model_list:
+            self.model_cancel('mrp.production', except_states=['finished', 'cancel'])
+
+        # 工单库存移动 （排除完成，已取消）
+        if 'stock.move' in model_list:
+            self.model_cancel('stock.move')
+
+        # 库存调拨清理 （排除完成，已取消）
+        if 'stock.picking' in model_list:
+            self.model_cancel('stock.picking')
+
+        # 会计凭证清理 （排除已过账，已取消）
+        if 'account.move' in model_list:
+            self.model_cancel('account.move', except_states=['posted', 'cancel'])
+
+        return True
+    
+    def model_cancel(self, model_name, state_field='state', to_state='cancel',except_states=('done', 'cancel')):
+        table = self.env[model_name]._table
+        if isinstance(except_states, list):
+            except_states = tuple(except_states)
+        sql = """
+                UPDATE 
+                    %s SET %s = '%s'
+                WHERE 
+                    create_date < '%s'
+                AND state NOT IN %s
+""" % (table, state_field, to_state, self.date.strftime('%Y-%m-%d'), except_states)
+        self.env.cr.execute(sql)
+        self.env.cr.commit()
+
+    @api.model
+    def get_confirm_message(self):
+        date_str = self.date.strftime('%Y-%m-%d') if self.date else ''
+        model_names = ', '.join([model.name for model in self.model_ids])
+        return {
+            'date': date_str,
+            'model_names': model_names
+        }
+    
+    def action_clean_data_confirm(self):
+        model_names = self.model_ids.mapped('display_name')
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'action_clean_data_confirm',
+            'params': {
+                'model_names': model_names,
+                'date': self.date,
+                'active_id': self.id,
+                'context': self.env.context
+            }
+        }
+
+            
+
+

jikimo_test_assistant/wizards/jikimo_data_clean_wizard.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- Form View -->
+    <record id="view_jikimo_data_clean_form" model="ir.ui.view">
+        <field name="name">jikimo.data.clean.wizard.form</field>
+        <field name="model">jikimo.data.clean.wizard</field>
+        <field name="arch" type="xml">
+            <form string="业务数据清理">
+                <sheet>
+                    <group>
+                        <field name="date"/>
+                        <field name="model_ids" widget="many2many_tags"/>
+                    </group>
+                </sheet>
+                <footer>
+                    <button name="action_clean_data_confirm" 
+                            string="确认清理" 
+                            type="object" 
+                            class="btn-primary"/>
+                    <button special="cancel" 
+                            string="取消" 
+                            class="btn-secondary"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <!-- Action -->
+    <record id="action_jikimo_data_clean" model="ir.actions.act_window">
+        <field name="name">业务数据清理</field>
+        <field name="res_model">jikimo.data.clean.wizard</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+
+    <!-- Menu -->
+    <menuitem id="menu_test_root"
+              name="测试"
+              parent="base.menu_custom"
+              sequence="100"/>
+
+    <menuitem id="menu_jikimo_data_clean"
+              name="业务数据清理"
+              parent="menu_test_root"
+              action="action_jikimo_data_clean"
+              sequence="10"/>
+</odoo> 

jikimo_workorder_exception/views/mrp_workorder_views.xml

@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//notebook/page[last()]" position="after">
                     <field name="routing_type" invisible="1"/>
-                    <page string="异常记录" name="workorder_exception" attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}">
+                    <page string="异常记录" name="workorder_exception" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "ER")]}'>
                         <field name="exception_ids" nolabel="1" readonly="1">
                             <tree create="false" delete="false" edit="false">
                                 <field name="exception_content" string="反馈的异常/问题信息"/>

quality_control/__init__.py

@@ -4,3 +4,4 @@
 from . import models
 from . import wizard
 from . import report
+from . import controllers

quality_control/__manifest__.py

@@ -8,7 +8,7 @@
     'sequence': 120,
     'summary': 'Control the quality of your products',
     'website': 'https://www.odoo.com/app/quality',
-    'depends': ['quality', 'sf_manufacturing'],
+    'depends': ['quality', 'sf_manufacturing', 'base_import'],
     'description': """
 Quality Control
 ===============
@@ -20,12 +20,15 @@ Quality Control
 """,
     'data': [
         'data/quality_control_data.xml',
+        'wizard/import_complex_model.xml',
+        'wizard/quality_wizard_view.xml',
         'report/worksheet_custom_reports.xml',
         'report/worksheet_custom_report_templates.xml',
         'views/quality_views.xml',
         'views/product_views.xml',
         'views/stock_move_views.xml',
         'views/stock_picking_views.xml',
+        'views/quality.check.measures.line.xml',
         'wizard/quality_check_wizard_views.xml',
         'security/ir.model.access.csv',
     ],

quality_control/controllers/__init__.py

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

quality_control/controllers/main.py

@@ -0,0 +1,120 @@
+# -*- coding: utf-8 -*-
+
+from odoo import http
+from odoo.http import request, Response
+import base64
+import json
+
+
+class QualityController(http.Controller):
+
+    @http.route(['/api/quality/report/download'], type='http', auth='public', csrf=False, website=False)  # 移除 cors="*"
+    def get_quality_report(self, retrospect_ref=None, **kwargs):
+        """获取质检报告的下载接口
+        
+        Args:
+            retrospect_ref: 追溯码
+            
+        Returns:
+            直接返回文件下载响应
+        """
+        try:
+            # 如果retrospect_ref为None，尝试从查询参数获取
+            if not retrospect_ref:
+                retrospect_ref = kwargs.get('retrospect_ref')
+
+            # 参数验证
+            if not retrospect_ref:
+                return self._json_response({
+                    'status': 'error',
+                    'message': '追溯码不能为空'
+                })
+
+            # 查找对应的质检单
+            quality_check = request.env['quality.check'].sudo().search([
+                ('picking_id.retrospect_ref', '=', retrospect_ref),
+                ('publish_status', '=', 'published')  # 只返回已发布的报告
+            ], limit=1)
+
+            if not quality_check:
+                return self._json_response({
+                    'status': 'error',
+                    'message': '未找到对应的质检报告或报告未发布'
+                })
+
+            if not quality_check.report_number_id:
+                return self._json_response({
+                    'status': 'error',
+                    'message': '质检报告文件不存在'
+                })
+
+            # 获取文件内容
+            document = quality_check.report_number_id
+            if not document.raw:  # 检查文件内容是否存在
+                return self._json_response({
+                    'status': 'error',
+                    'message': '文件内容不存在'
+                })
+
+            # 构建文件名(确保有.pdf后缀)
+            filename = document.name
+            if not filename.lower().endswith('.pdf'):
+                filename = f"{filename}.pdf"
+
+            # 返回文件下载响应
+            return Response(
+                document.raw,
+                headers=[
+                    ('Content-Type', 'application/pdf'),
+                    ('Content-Disposition', f'attachment; filename="{filename}"'),
+                    ('Access-Control-Allow-Origin', '*'),
+                    ('Access-Control-Allow-Methods', 'GET, OPTIONS'),
+                    ('Access-Control-Allow-Headers', 'Content-Type, Authorization')
+                ]
+            )
+
+        except Exception as e:
+            return self._json_response({
+                'status': 'error',
+                'message': f'系统错误: {str(e)}'
+            })
+
+    def _json_response(self, data):
+        """返回JSON格式的响应"""
+        return Response(
+            json.dumps(data, ensure_ascii=False),
+            mimetype='application/json;charset=utf-8',
+            headers=[
+                ('Access-Control-Allow-Origin', '*'),
+                ('Access-Control-Allow-Methods', 'GET, OPTIONS'),
+                ('Access-Control-Allow-Headers', 'Content-Type, Authorization')
+            ]
+        )
+
+
+class QualityReportController(http.Controller):
+    @http.route('/quality/report/<int:document_id>', type='http', auth='public')
+    def get_public_report(self, document_id, **kw):
+        """提供公开访问PDF报告的控制器"""
+        document = request.env['documents.document'].sudo().browse(int(document_id))
+
+        # 安全检查：确保只有质检报告文档可以被访问
+        if document.exists() and document.res_model == 'quality.check':
+            # 获取PDF内容
+            pdf_content = document.raw
+
+            # 返回PDF内容
+            return request.make_response(
+                pdf_content,
+                headers=[
+                    ('Content-Type', 'application/pdf'),
+                    ('Content-Disposition', f'inline; filename={document.name}.pdf')
+                ]
+            )
+        return request.not_found()
+
+    @http.route('/quality/report/not_published', type='http', auth='public')
+    def get_not_published_report(self, **kw):
+        """提供未发布报告的控制器"""
+        return "报告尚未发布"
+

quality_control/models/quality.py

@@ -10,6 +10,12 @@ from odoo import api, models, fields, _
 from odoo.api import depends
 from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT, float_round
 from odoo.osv.expression import OR
+from odoo.exceptions import UserError
+from odoo.tools import image_data_uri
+from base64 import b64encode
+import requests
+import json
+import base64
 
 
 class QualityPoint(models.Model):
@@ -34,7 +40,8 @@ class QualityPoint(models.Model):
         ('day', 'Days'),
         ('week', 'Weeks'),
         ('month', 'Months')], default="day")  # TDE RENAME ?
-    is_lot_tested_fractionally = fields.Boolean(string="Lot Tested Fractionally", help="Determines if only a fraction of the lot should be tested")
+    is_lot_tested_fractionally = fields.Boolean(string="Lot Tested Fractionally",
+                                                help="Determines if only a fraction of the lot should be tested")
     testing_percentage_within_lot = fields.Float(help="Defines the percentage within a lot that should be tested")
     norm = fields.Float('Norm', digits='Quality Tests')  # TDE RENAME ?
     tolerance_min = fields.Float('Min Tolerance', digits='Quality Tests')
@@ -63,7 +70,7 @@ class QualityPoint(models.Model):
 
             if n > 1:
                 point.average = mean
-                point.standard_deviation = sqrt( s / ( n - 1))
+                point.standard_deviation = sqrt(s / (n - 1))
             elif n == 1:
                 point.average = mean
                 point.standard_deviation = 0.0
@@ -94,7 +101,7 @@ class QualityPoint(models.Model):
             checks = self.env['quality.check'].search([
                 ('point_id', '=', self.id),
                 ('create_date', '>=', date_previous.strftime(DEFAULT_SERVER_DATETIME_FORMAT))], limit=1)
-            return not(bool(checks))
+            return not (bool(checks))
         return super(QualityPoint, self).check_execute_now()
 
     def _get_type_default_domain(self):
@@ -123,13 +130,491 @@ class QualityPoint(models.Model):
 
 class QualityCheck(models.Model):
     _inherit = "quality.check"
-    part_name = fields.Char('零件名称',  compute='_compute_part_name_number', readonly=True)
-    part_number = fields.Char('零件图号', compute='_compute_part_name_number', readonly=True)
-    @depends('product_id')
-    def _compute_part_name_number(self):
+    part_name = fields.Char('零件名称', related='product_id.part_name', readonly=False, store=True)
+    part_number = fields.Char('零件图号', related='product_id.part_number', readonly=False, store=True)
+    material_name = fields.Char('材料名称', compute='_compute_material_name')
+
+    # # 总数量，值为调拨单_产品明细_数量
+    # total_qty = fields.Float('总数量', compute='_compute_total_qty', readonly=True)
+    # # 检验数
+    # check_qty = fields.Float('检验数', compute='_compute_check_qty', readonly=True)
+    # # 出厂检验报告编号
+    # report_number = fields.Char('出厂检验报告编号', compute='_compute_report_number', readonly=True)
+    # 总数量，值为调拨单_产品明细_数量
+    total_qty = fields.Char('总数量', compute='_compute_total_qty')
+
+    column_nums = fields.Integer('测量值列数', default=1)
+
+    @api.depends('picking_id')
+    def _compute_total_qty(self):
         for record in self:
-            record.part_number = record.product_id.part_number
-            record.part_name = record.product_id.part_name
+            if record.picking_id:
+                total_qty = 0
+                for move in record.picking_id.move_ids_without_package:
+                    if move.product_id == record.product_id:
+                        total_qty = int(move.product_uom_qty)
+                record.total_qty = total_qty if total_qty > 0 else ''
+            else:
+                record.total_qty = ''
+
+    # 检验数
+    check_qty = fields.Integer('检验数', default=lambda self: self._get_default_check_qty())
+
+    def _get_default_check_qty(self):
+        """根据条件设置检验数的默认值"""
+        # 这里需要使用_origin来获取已存储的记录，因为新记录在创建时可能还没有这些值
+        if self._origin:
+            if self._origin.measure_on == 'product' and self._origin.test_type_id.name == '出厂检验报告':
+                return ''
+            elif self._origin.measure_on == 'product':
+                return '1'
+        return ''
+
+    @api.onchange('test_type_id', 'measure_on')
+    def _onchange_check_qty(self):
+        """当测试类型或测量对象变化时，更新检验数"""
+        if self.measure_on == 'product' and self.test_type_id.name == '出厂检验报告':
+            self.check_qty = 0
+        elif self.measure_on == 'product':
+            self.check_qty = 1
+
+    # 出厂检验报告编号
+    report_number_id = fields.Many2one('documents.document', string='出厂检验报告编号', readonly=True)
+    report_number_name = fields.Char('出厂检验报告编号名称', compute='_compute_report_number_name')
+
+    old_report_name = fields.Char('旧出厂检验报告编号', default='')
+
+    @api.depends('serial_number', 'part_number')
+    def _compute_report_number_name(self):
+        for record in self:
+            str_serial_number = '0' + str(record.serial_number) if record.serial_number < 10 else str(
+                record.serial_number)
+            str_part_number = record.part_number if record.part_number else ''
+            record.report_number_name = f'FQC{str_part_number}{str_serial_number}'
+
+    # 出厂检验报告、关联文档的数据
+    report_content = fields.Binary(string='出厂检验报告', related='report_number_id.datas')
+
+    is_out_check = fields.Boolean(string='是否出库检验', compute='_compute_is_out_check', readonly=True)
+
+    measure_line_ids = fields.One2many('quality.check.measure.line', 'check_id', string='测量明细')
+
+    categ_type = fields.Selection(string='产品的类别', related='product_id.categ_id.type', store=True)
+
+    report_result = fields.Selection([
+        ('OK', 'OK'),
+        ('NG', 'NG')
+    ], string='出厂检验报告结果', default='OK')
+    measure_operator = fields.Many2one('res.users', string='操机员')
+    quality_manager = fields.Many2one('res.users', string='质检员', compute='_compute_quality_manager')
+
+    @api.depends('measure_line_ids')
+    def _compute_quality_manager(self):
+        for record in self:
+            if record.measure_line_ids:
+                record.quality_manager = record.env.user.id
+            else:
+                record.quality_manager = False
+
+    # 流水号(从1开始，最大99)
+    serial_number = fields.Integer('流水号', default=1, readonly=True)
+
+    # 发布历史
+    report_history_ids = fields.One2many('quality.check.report.history', 'check_id', string='发布历史')
+
+    # 发布状态
+    publish_status = fields.Selection([
+        ('draft', '草稿'),
+        ('published', '已发布'),
+        ('canceled', '已撤销')
+    ], string='发布状态', default='draft')
+
+    # 出厂检验报告是否已上传
+    is_factory_report_uploaded = fields.Boolean(string='出厂检验报告是否已上传', default=False)
+
+    def add_measure_line(self):
+        """
+        新增测量值,如果测量值有5列了，则提示“最多只能有5列测量值”
+        """
+        if self.column_nums >= 5:
+            raise UserError(_('最多只能有5列测量值'))
+        else:
+            for line in self.measure_line_ids:
+                field_name = f'measure_value{self.column_nums + 1}'
+                if hasattr(line, field_name):
+                    line[field_name] = False
+            self.column_nums = self.column_nums + 1
+
+    def remove_measure_line(self):
+        """
+        删除测量值
+        """
+        if self.column_nums <= 1:
+            raise UserError(_('最少要有1列测量值'))
+        else:
+            for line in self.measure_line_ids:
+                field_name = f'measure_value{self.column_nums}'
+                if hasattr(line, field_name):
+                    line[field_name] = False
+            self.column_nums = self.column_nums - 1
+
+    def do_preview(self):
+        """
+        预览出厂检验报告
+        """
+        pass
+
+    def do_publish(self):
+        """发布出厂检验报告"""
+        self.ensure_one()
+        self._check_part_number()
+        self._check_measure_line()
+        self._check_check_qty_and_total_qty()
+
+        # 打开确认向导而不是直接发布
+        return {
+            'name': _('发布确认'),
+            'type': 'ir.actions.act_window',
+            'res_model': 'quality.check.publish.wizard',
+            'view_mode': 'form',
+            'target': 'new',
+            'context': {
+                'default_check_id': self.id,
+                'default_product_name': self.product_id.name,
+                'default_total_qty': self.total_qty,
+                'default_check_qty': self.check_qty,
+                'default_measure_count': self.column_nums,
+                'default_item_count': len(self.measure_line_ids),
+                'default_old_report_name': self.old_report_name,
+                'default_publish_status': self.publish_status,
+            }
+        }
+
+    def _do_publish_implementation(self):
+        """实际执行发布操作的方法"""
+        self.ensure_one()
+
+        # 1. 获取已发布的文档文件夹
+        workspace = self.env['documents.folder'].search(
+            [('parent_folder_id', '=', self.env.ref('sf_quality.documents_purchase_contracts_folder').id),
+             ('name', '=', '已发布')], limit=1)
+
+        if self.serial_number > 99:
+            raise UserError(_('流水号不能大于99'))
+
+        # 2. 先创建空文档记录
+        doc_vals = {
+            'name': self.report_number_name,
+            'mimetype': 'application/pdf',
+            'res_id': self.id,
+            'folder_id': workspace.id,
+            'res_model': self._name,
+        }
+
+        doc = self.env['documents.document'].create(doc_vals)
+
+        # 3. 关联文档到质检记录
+        self.write({
+            'report_number_id': doc.id,
+            'quality_state': 'pass'
+        })
+
+        # 4. 获取报告动作并生成PDF（此时二维码将包含正确的文档ID）
+        report_action = self.env.ref('sf_quality.action_report_quality_inspection')
+        pdf_content, _ = report_action._render_qweb_pdf(
+            report_ref=report_action.report_name,
+            res_ids=self.ids
+        )
+
+        # 5. 更新文档内容
+        doc.write({
+            'raw': pdf_content
+        })
+
+        # 6. 记录发布历史
+        self.env['quality.check.report.history'].create({
+            'check_id': self.id,
+            'report_number_id': doc.id,
+            'action': 'publish',
+            'operator': self.env.user.name,
+            'operation_time': datetime.now(),
+            'document_status': 'published',
+            'sequence': len(self.report_history_ids) + 1
+        })
+
+        # 7. 更新其他信息
+        self.serial_number += 1
+
+        if self.publish_status == 'canceled' and self.picking_id.state == 'done':
+            self.upload_factory_report()
+
+        self.write({
+            'publish_status': 'published',
+        })
+
+        return True
+
+    # 发布前检验零件图号、操机员、质检员
+    def _check_part_number(self):
+        if not self.part_number:
+            raise UserError(_('零件图号不能为空'))
+        if not self.measure_operator:
+            raise UserError(_('操机员不能为空'))
+
+    # 发布前校验明细行列均非空
+    def _check_measure_line(self):
+        for record in self:
+            if not record.measure_line_ids:
+                raise UserError(_('请先添加测量明细'))
+            for line in record.measure_line_ids:
+                if not line.measure_item:
+                    raise UserError(_('有检测项目值为空'))
+                for i in range(1, record.column_nums + 1):
+                    if not getattr(line, f'measure_value{i}'):
+                        raise UserError(_('有测量值为空'))
+
+    # 发布前校验检验数与总数量、检验数与测量件数（即测量列数）
+    def _check_check_qty_and_total_qty(self):
+        for record in self:
+            if not record.check_qty:
+                raise UserError(_('请先输入检验数'))
+            if not record.total_qty:
+                raise UserError(_('总数量不能为空'))
+            if record.check_qty > int(record.total_qty):
+                raise UserError(_('检验数不可超过总数量'))
+            if record.column_nums > record.check_qty:
+                raise UserError(_('测量件数不可超过检验数'))
+
+    def do_cancel_publish(self):
+        """
+        取消发布出厂检验报告(将当前质检单关联的出厂检验报告文档位置移动到废弃文件夹), 并记录发布历史
+        """
+        self.ensure_one()
+        # 1. 获取已发布的文档文件夹
+        workspace = self.env['documents.folder'].search(
+            [('parent_folder_id', '=', self.env.ref('sf_quality.documents_purchase_contracts_folder').id),
+             ('name', '=', '已发布')], limit=1)
+        # 2. 将当前质检单关联的出厂检验报告文档位置移动到废弃文件夹
+        self.report_number_id.write({
+            'folder_id': self.env.ref('sf_quality.documents_purchase_contracts_folder_canceled').id,
+        })
+
+        # 3. 记录发布历史
+        self.env['quality.check.report.history'].create({
+            'check_id': self.id,
+            'report_number_id': self.report_number_id.id,
+            'action': 'cancel_publish',
+            'operator': self.env.user.name,
+            'operation_time': datetime.now(),
+            'document_status': 'canceled',
+            'sequence': len(self.report_history_ids) + 1
+        })
+
+        self.write({
+            'old_report_name': self.report_number_id.name
+        })
+
+        # 3. 更新发布状态
+        self.write({
+            'publish_status': 'canceled',
+            'report_number_id': False,
+            'quality_state': 'none'
+        })
+
+        if self.is_factory_report_uploaded:
+            # 4. 删除加工订单明细中的出厂检验报告
+            self.delete_factory_report()
+
+        return True
+
+    def do_re_publish(self):
+        """
+        重新发布出厂检验报告,参考发布规则
+        """
+        return self.do_publish()
+
+    def generate_qr_code(self):
+        """生成二维码URL"""
+        self.ensure_one()
+        base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+        return image_data_uri(
+            b64encode(self.env['ir.actions.report'].barcode(
+                'QR', base_url + '/#/index/publicPay?order_id=' + str(self.id) + '&source=%2Findex%2Fmyorder',
+                width=140, height=140)
+            )
+        )
+
+    def get_latest_report_attachment(self, check_id):
+        """获取指定质检记录的最新报告附件，并删除旧的报告附件"""
+        # 查找特定质检记录的所有附件
+        attachments = self.env['ir.attachment'].search([
+            ('res_model', '=', 'quality.check'),
+            ('res_id', '=', check_id),
+            ('name', 'like', 'QC-QC')  # 根据您的命名规则调整
+        ], order='create_date DESC')  # 按创建日期降序排序
+
+        # # 如果附件数量大于1，则删除除最新报告外的其他报告附件
+        # if len(attachments) > 1:
+        #     for attachment in attachments[1:]:
+        #         attachment.unlink()
+
+        # 返回最新的附件（如果存在）
+        return attachments and attachments[0] or False
+
+    def get_report_url(self):
+        """生成报告访问URL"""
+        self.ensure_one()
+        base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+        if self.report_number_id:
+            print(f"{base_url}/quality/report/{self.report_number_id.id}")
+            return f"{base_url}/quality/report/{self.report_number_id.id}"
+        else:
+            return f"{base_url}/quality/report/not_published"
+
+    def upload_factory_report(self):
+        """
+        上传出厂检验报告到加工订单明细中
+        将当前质检单的出厂检验报告上传到对应的加工订单明细中
+        """
+        self.ensure_one()
+        if not self.report_content:
+            raise UserError(_('当前质检单没有出厂检验报告，请先发布报告'))
+
+        if not self.product_id.model_name:
+            raise UserError(_('产品模型名称为空'))
+
+        if not self.picking_id or not self.picking_id.origin:
+            raise UserError(_('无法找到相关的调拨单或来源单据'))
+
+        # 获取订单号（从调拨单的来源字段获取）
+        order_ref = self.picking_id.retrospect_ref
+
+        try:
+            # 准备请求数据
+            payload = {
+                "order_ref": order_ref,
+                "model_name": self.product_id.model_name,
+                "report_file": self.report_content.decode('utf-8') if isinstance(self.report_content,
+                                                                                 bytes) else self.report_content
+            }
+
+            # 将Python字典转换为JSON字符串
+            json_data = json.dumps(payload)
+
+            # 获取服务器URL
+            base_url = self.env['ir.config_parameter'].sudo().get_param('bfm_url_new')
+            api_url = f"{base_url}/api/report/create"
+
+            # 设置请求头
+            headers = {
+                'Content-Type': 'application/json',
+            }
+
+            # 发送POST请求
+            response = requests.post(api_url, data=json_data, headers=headers)
+
+            # 处理响应
+            if response.status_code == 200:
+                result = response.json()
+                if result.get('success'):
+                    # 上传成功，显示成功消息
+                    self.is_factory_report_uploaded = True
+                    return {
+                        'type': 'ir.actions.client',
+                        'tag': 'display_notification',
+                        'params': {
+                            'title': _('上传成功'),
+                            'message': _('出厂检验报告已成功上传到加工订单明细'),
+                            'type': 'success',
+                            'sticky': False,
+                        }
+                    }
+                else:
+                    # API返回失败信息
+                    raise UserError(_('上传失败: %s') % result.get('message', '未知错误'))
+            else:
+                # HTTP请求失败
+                raise UserError(_('请求失败，状态码: %s') % response.status_code)
+
+        except Exception as e:
+            raise UserError(_('上传过程中发生错误: %s') % str(e))
+
+    def delete_factory_report(self):
+        """
+        删除加工订单明细中的出厂检验报告
+        """
+        # 获取订单号（从调拨单的来源字段获取）
+        order_ref = self.picking_id.retrospect_ref
+
+        if not order_ref:
+            raise UserError(_('无法找到相关的调拨单或来源单据'))
+
+        if not self.product_id.model_name:
+            raise UserError(_('产品模型名称为空'))
+
+        try:
+            # 准备请求数据
+            payload = {
+                "order_ref": order_ref,
+                "model_name": self.product_id.model_name
+            }
+
+            # 将Python字典转换为JSON字符串
+            json_data = json.dumps(payload)
+
+            # 获取服务器URL
+            base_url = self.env['ir.config_parameter'].sudo().get_param('bfm_url_new')
+            api_url = f"{base_url}/api/report/delete"
+
+            # 设置请求头
+            headers = {
+                'Content-Type': 'application/json',
+            }
+
+            # 发送POST请求
+            response = requests.post(api_url, data=json_data, headers=headers)
+
+            # 处理响应
+            if response.status_code == 200:
+                result = response.json()
+                if result.get('success'):
+                    # 删除成功，显示成功消息
+                    self.is_factory_report_uploaded = False
+                    return {
+                        'type': 'ir.actions.client',
+                        'tag': 'display_notification',
+                        'params': {
+                            'title': _('删除成功'),
+                            'message': _('出厂检验报告已成功删除'),
+                            'type': 'success',
+                            'sticky': False,
+                        }
+                    }
+                else:
+                    # API返回失败信息
+                    raise UserError(_('删除失败: %s') % result.get('message', '未知错误'))
+            else:
+                # HTTP请求失败
+                raise UserError(_('请求失败，状态码: %s') % response.status_code)
+
+        except Exception as e:
+            raise UserError(_('删除过程中发生错误: %s') % str(e))
+
+    @depends('product_id')
+    def _compute_material_name(self):
+        for record in self:
+            materials_id_name = record.product_id.materials_id.name if record.product_id.materials_id else ''
+            materials_type_name = record.product_id.materials_type_id.name if record.product_id.materials_type_id else ''
+            record.material_name = materials_id_name + ' ' + materials_type_name
+
+    @depends('test_type_id')
+    def _compute_is_out_check(self):
+        for record in self:
+            if record.test_type_id.name == '出厂检验报告':
+                record.is_out_check = True
+            else:
+                record.is_out_check = False
+
     failure_message = fields.Html(related='point_id.failure_message', readonly=True)
     measure = fields.Float('Measure', default=0.0, digits='Quality Tests', tracking=True)
     measure_success = fields.Selection([
@@ -141,7 +626,8 @@ class QualityCheck(models.Model):
     tolerance_max = fields.Float('Max Tolerance', related='point_id.tolerance_max', readonly=True)
     warning_message = fields.Text(compute='_compute_warning_message')
     norm_unit = fields.Char(related='point_id.norm_unit', readonly=True)
-    qty_to_test = fields.Float(compute="_compute_qty_to_test", string="Quantity to Test", help="Quantity of product to test within the lot")
+    qty_to_test = fields.Float(compute="_compute_qty_to_test", string="Quantity to Test",
+                               help="Quantity of product to test within the lot")
     qty_tested = fields.Float(string="Quantity Tested", help="Quantity of product tested within the lot")
     measure_on = fields.Selection([
         ('operation', 'Operation'),
@@ -150,7 +636,8 @@ class QualityCheck(models.Model):
         help="""Operation = One quality check is requested at the operation level.
                   Product = A quality check is requested per product.
                  Quantity = A quality check is requested for each new product quantity registered, with partial quantity checks also possible.""")
-    move_line_id = fields.Many2one('stock.move.line', 'Stock Move Line', check_company=True, help="In case of Quality Check by Quantity, Move Line on which the Quality Check applies")
+    move_line_id = fields.Many2one('stock.move.line', 'Stock Move Line', check_company=True,
+                                   help="In case of Quality Check by Quantity, Move Line on which the Quality Check applies")
     lot_name = fields.Char('Lot/Serial Number Name')
     lot_line_id = fields.Many2one('stock.lot', store=True, compute='_compute_lot_line_id')
     qty_line = fields.Float(compute='_compute_qty_line', string="Quantity")
@@ -231,7 +718,8 @@ class QualityCheck(models.Model):
     def _compute_qty_to_test(self):
         for qc in self:
             if qc.is_lot_tested_fractionally:
-                qc.qty_to_test = float_round(qc.qty_line * qc.testing_percentage_within_lot / 100, precision_rounding=self.product_id.uom_id.rounding, rounding_method="UP")
+                qc.qty_to_test = float_round(qc.qty_line * qc.testing_percentage_within_lot / 100,
+                                             precision_rounding=self.product_id.uom_id.rounding, rounding_method="UP")
             else:
                 qc.qty_to_test = qc.qty_line
 
@@ -386,7 +874,8 @@ class QualityAlert(models.Model):
 class ProductTemplate(models.Model):
     _inherit = "product.template"
 
-    quality_control_point_qty = fields.Integer(compute='_compute_quality_check_qty', groups='quality.group_quality_user')
+    quality_control_point_qty = fields.Integer(compute='_compute_quality_check_qty',
+                                               groups='quality.group_quality_user')
     quality_pass_qty = fields.Integer(compute='_compute_quality_check_qty', groups='quality.group_quality_user')
     quality_fail_qty = fields.Integer(compute='_compute_quality_check_qty', groups='quality.group_quality_user')
 
@@ -394,14 +883,16 @@ class ProductTemplate(models.Model):
     def _compute_quality_check_qty(self):
         for product_tmpl in self:
             product_tmpl.quality_fail_qty, product_tmpl.quality_pass_qty = product_tmpl.product_variant_ids._count_quality_checks()
-            product_tmpl.quality_control_point_qty = product_tmpl.with_context(active_test=product_tmpl.active).product_variant_ids._count_quality_points()
+            product_tmpl.quality_control_point_qty = product_tmpl.with_context(
+                active_test=product_tmpl.active).product_variant_ids._count_quality_points()
 
     def action_see_quality_control_points(self):
         self.ensure_one()
         action = self.env["ir.actions.actions"]._for_xml_id("quality_control.quality_point_action")
         action['context'] = dict(self.env.context, default_product_ids=self.product_variant_ids.ids)
 
-        domain_in_products_or_categs = ['|', ('product_ids', 'in', self.product_variant_ids.ids), ('product_category_ids', 'parent_of', self.categ_id.ids)]
+        domain_in_products_or_categs = ['|', ('product_ids', 'in', self.product_variant_ids.ids),
+                                        ('product_category_ids', 'parent_of', self.categ_id.ids)]
         domain_no_products_and_categs = [('product_ids', '=', False), ('product_category_ids', '=', False)]
         action['domain'] = OR([domain_in_products_or_categs, domain_no_products_and_categs])
         return action
@@ -412,10 +903,10 @@ class ProductTemplate(models.Model):
         action['context'] = dict(self.env.context, default_product_id=self.product_variant_id.id, create=False)
         action['domain'] = [
             '|',
-                ('product_id', 'in', self.product_variant_ids.ids),
-                '&',
-                    ('measure_on', '=', 'operation'),
-                    ('picking_id.move_ids.product_tmpl_id', '=', self.id),
+            ('product_id', 'in', self.product_variant_ids.ids),
+            '&',
+            ('measure_on', '=', 'operation'),
+            ('picking_id.move_ids.product_tmpl_id', '=', self.id),
         ]
         return action
 
@@ -423,7 +914,8 @@ class ProductTemplate(models.Model):
 class ProductProduct(models.Model):
     _inherit = "product.product"
 
-    quality_control_point_qty = fields.Integer(compute='_compute_quality_check_qty', groups='quality.group_quality_user')
+    quality_control_point_qty = fields.Integer(compute='_compute_quality_check_qty',
+                                               groups='quality.group_quality_user')
     quality_pass_qty = fields.Integer(compute='_compute_quality_check_qty', groups='quality.group_quality_user')
     quality_fail_qty = fields.Integer(compute='_compute_quality_check_qty', groups='quality.group_quality_user')
 
@@ -437,10 +929,10 @@ class ProductProduct(models.Model):
         quality_pass_qty = 0
         domain = [
             '|',
-                ('product_id', 'in', self.ids),
-                '&',
-                    ('measure_on', '=', 'operation'),
-                    ('picking_id.move_ids.product_id', 'in', self.ids),
+            ('product_id', 'in', self.ids),
+            '&',
+            ('measure_on', '=', 'operation'),
+            ('picking_id.move_ids.product_id', 'in', self.ids),
             ('company_id', '=', self.env.company.id),
             ('quality_state', '!=', 'none')
         ]
@@ -464,7 +956,8 @@ class ProductProduct(models.Model):
         _, where_clause, where_clause_args = query.get_sql()
         additional_where_clause = self._additional_quality_point_where_clause()
         where_clause += additional_where_clause
-        parent_category_ids = [int(parent_id) for parent_id in self.categ_id.parent_path.split('/')[:-1]] if self.categ_id else []
+        parent_category_ids = [int(parent_id) for parent_id in
+                               self.categ_id.parent_path.split('/')[:-1]] if self.categ_id else []
 
         self.env.cr.execute("""
             SELECT COUNT(*)
@@ -485,7 +978,7 @@ class ProductProduct(models.Model):
                     )
                 )
         """ % (where_clause,), where_clause_args + [self.ids, parent_category_ids]
-        )
+                            )
         return self.env.cr.fetchone()[0]
 
     def action_see_quality_control_points(self):
@@ -493,7 +986,8 @@ class ProductProduct(models.Model):
         action = self.product_tmpl_id.action_see_quality_control_points()
         action['context'].update(default_product_ids=self.ids)
 
-        domain_in_products_or_categs = ['|', ('product_ids', 'in', self.ids), ('product_category_ids', 'parent_of', self.categ_id.ids)]
+        domain_in_products_or_categs = ['|', ('product_ids', 'in', self.ids),
+                                        ('product_category_ids', 'parent_of', self.categ_id.ids)]
         domain_no_products_and_categs = [('product_ids', '=', False), ('product_category_ids', '=', False)]
         action['domain'] = OR([domain_in_products_or_categs, domain_no_products_and_categs])
         return action
@@ -504,12 +998,75 @@ class ProductProduct(models.Model):
         action['context'] = dict(self.env.context, default_product_id=self.id, create=False)
         action['domain'] = [
             '|',
-                ('product_id', '=', self.id),
-                '&',
-                    ('measure_on', '=', 'operation'),
-                    ('picking_id.move_ids.product_id', '=', self.id),
+            ('product_id', '=', self.id),
+            '&',
+            ('measure_on', '=', 'operation'),
+            ('picking_id.move_ids.product_id', '=', self.id),
         ]
         return action
 
     def _additional_quality_point_where_clause(self):
         return ""
+
+
+class QualityCheckMeasureLine(models.Model):
+    _name = 'quality.check.measure.line'
+    _description = '质检测量明细'
+    _order = 'sequence, id'
+
+    sequence = fields.Integer('序号')
+
+    check_id = fields.Many2one('quality.check', string='质检单', required=True, ondelete='cascade')
+
+    # 基本信息
+    product_name = fields.Char('产品名称', related='check_id.product_id.name', readonly=True)
+    drawing_no = fields.Char('图号')
+    measure_item = fields.Char('检测项目')
+
+    # 测量值
+    measure_value1 = fields.Char('测量值1')
+    measure_value2 = fields.Char('测量值2')
+    measure_value3 = fields.Char('测量值3')
+    measure_value4 = fields.Char('测量值4')
+    measure_value5 = fields.Char('测量值5')
+
+    # # 展示列数
+    # column_nums = fields.Integer('列数', related='check_id.column_nums')
+
+    # 判定结果
+    measure_result = fields.Selection([
+        ('OK', '合格'),
+        ('NG', '不合格')
+    ], string='判定', default='OK')
+
+    remark = fields.Char('备注')
+
+    def del_measure_value(self):
+        self.ensure_one()
+        self.sudo().unlink()
+
+
+# 增加出厂检验报告发布历史
+class QualityCheckReportHistory(models.Model):
+    _name = 'quality.check.report.history'
+    _description = '出厂检验报告发布历史'
+
+    check_id = fields.Many2one('quality.check', string='质检单', required=True, ondelete='cascade')
+    report_number_id = fields.Many2one('documents.document', string='报告编号', readonly=True)
+
+    sequence = fields.Integer('序号')
+    # 操作(发布、撤销发布、重新发布)
+    action = fields.Selection([
+        ('publish', '发布'),
+        ('cancel_publish', '撤销发布'),
+        ('re_publish', '重新发布')
+    ], string='操作')
+    # 操作人
+    operator = fields.Char('操作人')
+    # 操作时间
+    operation_time = fields.Datetime('操作时间')
+    # 文档状态（已发布、废弃）
+    document_status = fields.Selection([
+        ('published', '已发布'),
+        ('canceled', '废弃')
+    ], string='操作后文档状态')

quality_control/models/stock_picking.py

@@ -81,18 +81,38 @@ class StockPicking(models.Model):
         return quality_pickings
 
     def action_cancel(self):
+        """
+        调拨单取消后，关联取消质量检查单
+        """
+        context = self.env.context
+        if not context.get('cancel_check_picking') and self.sudo().mapped('check_ids').filtered(
+                lambda x: x.quality_state in ['pass', 'fail']):
+            self.env.cr.rollback()
+            return {
+                'type': 'ir.actions.act_window',
+                'res_model': 'picking.check.cancel.wizard',
+                'name': '取消质检单',
+                'view_mode': 'form',
+                'target': 'new',
+                'context': {
+                    'default_picking_id': self.id,
+                    'cancel_check_picking': True}
+            }
+        elif self.check_ids.filtered(lambda x: x.quality_state != 'cancel'):
+            self.sudo().mapped('check_ids').filtered(lambda x: x.quality_state != 'cancel').write({
+                'quality_state': 'cancel'
+            })
         res = super(StockPicking, self).action_cancel()
-        self.sudo().mapped('check_ids').filtered(lambda x: x.quality_state == 'none').unlink()
+        # self.sudo().mapped('check_ids').filtered(lambda x: x.quality_state == 'none').unlink()
         return res
 
     def action_open_quality_check_picking(self):
         action = self.env["ir.actions.actions"]._for_xml_id("quality_control.quality_check_action_picking")
-        action['context'] = self.env.context.copy()
-        action['context'].update({
+        action['context'] = {
             'search_default_picking_id': [self.id],
             'default_picking_id': self.id,
             'show_lots_text': self.show_lots_text,
-        })
+        }
         return action
 
     def button_quality_alert(self):

quality_control/security/ir.model.access.csv

@@ -1,2 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_quality_check_wizard,access.quality_check_wizard,model_quality_check_wizard,quality.group_quality_user,1,1,1,0
+access_quality_check_measure_line,quality.check.measure.line,model_quality_check_measure_line,base.group_user,1,1,1,0
+access_quality_check_import_complex_model_wizard,quality.check.import.complex.model.wizard,model_quality_check_import_complex_model_wizard,quality.group_quality_user,1,1,1,0
+access_quality_check_report_history,quality.check.report.history,model_quality_check_report_history,quality.group_quality_user,1,1,1,0
+access_quality_check_publish_wizard,quality.check.publish.wizard,model_quality_check_publish_wizard,quality.group_quality_user,1,1,1,0
+access_picking_check_cancel_wizard,access.picking_check_cancel_wizard,model_picking_check_cancel_wizard,quality.group_quality_user,1,1,1,0

quality_control/static/src/scss/quality_dashboard.scss

@@ -4,3 +4,11 @@
         min-height: 250px;
     }
 }
+
+.measureTableSequence {
+    width: 58px;
+}
+
+.measureTable .o_list_table_ungrouped {
+    min-width: auto;
+}

quality_control/views/quality.check.measures.line.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="quality_check_measure_line_tree" model="ir.ui.view">
+        <field name="name">quality.check.measure.line.tree</field>
+        <field name="model">quality.check.measure.line</field>
+        <field name="arch" type="xml">
+            <tree editable="bottom"  class="measureTable">
+<!--                 <field name="sequence" class="measureTableSequence"/> -->
+                <!-- <field name="column_nums"/> -->
+                <field name="measure_item"/>
+                <field name="measure_value1" attrs="{ 'column_invisible': [('parent.column_nums', '&lt;', 1)] }"/>
+                <field name="measure_value2" attrs="{ 'column_invisible': [('parent.column_nums', '&lt;', 2)] }"/>
+                <field name="measure_value3" attrs="{ 'column_invisible': [('parent.column_nums', '&lt;', 3)] }"/>
+                <field name="measure_value4" attrs="{ 'column_invisible': [('parent.column_nums', '&lt;', 4)] }"/>
+                <field name="measure_value5" attrs="{ 'column_invisible': [('parent.column_nums', '&lt;', 5)] }"/>
+                <field name="measure_result"/>
+                <field name="remark"/>
+                <button name="del_measure_value" type="object" string="删除" class="btn-danger" attrs="{'invisible': [('parent.publish_status', '=', 'published')]}"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="quality_check_measure_line_form" model="ir.ui.view">
+        <field name="name">quality.check.measure.line.form</field>
+        <field name="model">quality.check.measure.line</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="measure_item"/>
+
+                            <field name="remark"/>
+                        </group>
+                        <group>
+                            <field name="measure_result"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+</odoo>

quality_control/views/quality_views.xml

@@ -255,6 +255,7 @@
                     <field name="quality_state" widget="statusbar"/>
                 </header>
                 <sheet>
+                    <field name="is_out_check" invisible="1"/>
                     <div class="oe_button_box" name="button_box">
                         <button name="action_see_alerts" icon="fa-bell" type="object" class="oe_stat_button"
                                 attrs="{'invisible': [('alert_count', '=', 0)]}">
@@ -264,10 +265,17 @@
                     <group>
                         <group>
                             <field name="company_id" invisible="1"/>
+                            <field name="categ_type" invisible="1"/>
                             <field name="product_id" attrs="{'invisible' : [('measure_on', '=', 'operation')]}"/>
-                            <field name="measure_on" attrs="{'readonly': [('point_id', '!=', False)]}"/>
-                            <field name="part_name"/>
-                            <field name="part_number"/>
+                            <field name="part_name" attrs="{'invisible': [('categ_type', '!=', '成品')], 'readonly': [('publish_status', '=', 'published')]}"/>
+                            <field name="part_number" attrs="{'invisible': [('categ_type', '!=', '成品')], 'readonly': [('publish_status', '=', 'published')]}"/>
+                            <field name="material_name" attrs="{'invisible': [('categ_type', '!=', '成品')]}"/>
+                            <field name="total_qty" attrs="{'invisible': ['|', ('measure_on', '!=', 'product'), ('is_out_check', '=', False)]}"/>
+                            <field name="check_qty" attrs="{'invisible': ['|', ('measure_on', '!=', 'product'), ('is_out_check', '=', False)], 'readonly': [('publish_status', '=', 'published')]}"/>
+<!--                             <field name="categ_type"/> -->
+                            <field name="report_number_id" attrs="{'invisible': ['|', ('measure_on', '!=', 'product'), ('is_out_check', '=', False)]}"/>
+                            <field name="column_nums" invisible="1"/>
+                            <field name="publish_status" invisible="1"/>
                             <field name="show_lot_text" invisible="1"/>
                             <field name="move_line_id" invisible="1"/>
                             <field name="product_tracking" invisible="1"/>
@@ -300,23 +308,47 @@
                             <field name="alert_ids" invisible="1"/>
                         </group>
                         <group>
-                            <field name="picking_id"
-                                   attrs="{'invisible': [('quality_state', 'in', ('pass', 'fail')), ('picking_id', '=', False)]}"/>
                             <field name="point_id"/>
+                            <field name="measure_on" attrs="{'readonly': [('point_id', '!=', False)]}"/>
                             <field string="Type" name="test_type_id" options="{'no_open': True, 'no_create': True}"
                                    attrs="{'readonly': [('point_id', '!=', False)]}"/>
+                            <field name="picking_id"
+                                   attrs="{'invisible': [('quality_state', 'in', ('pass', 'fail')), ('picking_id', '=', False)]}"/>
                             <field name="control_date" invisible="1"/>
+                            <field name="partner_id" string="Partner"
+                                   attrs="{'invisible': [('partner_id', '=', False)]}"/>
                             <field name="team_id"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                             <field name="user_id" string="Control Person" invisible="1"/>
-                            <field name="partner_id" string="Partner"
-                                   attrs="{'invisible': [('partner_id', '=', False)]}"/>
+                            <field name="measure_operator" string="操机员" attrs="{'invisible': ['|', ('measure_on', '!=', 'product'), ('is_out_check', '=', False)], 'readonly': [('publish_status', '=', 'published')]}"/>
+
                         </group>
                     </group>
                     <group attrs="{'invisible': [('test_type', '!=', 'picture')]}">
                         <field name="picture" widget="image"/>
                     </group>
                     <notebook>
+                        <!-- 增加page页：测量、出厂检验报告、2D加工图纸、质检标准、发布历史，它们均在is_out_check为True时显示 -->
+                        <!-- 测量page内有一个添加测量值按钮，点击可以新增一行测量值，新增的行在tree视图中显示，显示的列有：序号、检测项目、测量值1、测量值2、测量值3、测量值4、测量值5、判定、备注。其中检测项目、测量值1、测量值2、测量值3、测量值4、测量值5为必填项，判定为下拉框，默认选中合格，备注为文本框。 -->
+                        <page string="测量" name="measure" attrs="{'invisible': [('is_out_check', '=', False)]}">
+                            <div class="o_row">
+                            <button name="add_measure_line" type="object" class="btn-primary" string="添加测量值" attrs="{'invisible': [('publish_status', '=', 'published')]}"/>
+                            <button name="remove_measure_line" type="object" class="btn-primary" string="删除测量值" attrs="{'invisible': [('publish_status', '=', 'published')]}"/>
+                            <button name="%(quality_control.import_complex_model_wizard)d" string="上传"
+                                type="action"
+                                class="btn-primary"
+                                attrs="{'force_show':1, 'invisible': [('publish_status', '=', 'published')]}"
+                                context="{'default_model_name': 'quality.check.measure.line', 'default_check_id': id}"/>
+                            </div>
+                            <br/>
+                            <div class="o_row">
+                            <field name="measure_line_ids" widget="tree" attrs="{'readonly': [('publish_status', '=', 'published')]}"/>
+                            </div>
+                        </page>
+                        <page string="出厂检验报告" name="out_check" attrs="{'invisible': [('is_out_check', '=', False)]}">
+                            <field name="report_content" widget="adaptive_viewer"/>
+                        </page>
+
                         <page string="Notes" name="notes">
                             <group>
                                 <field name="report_result"/>
@@ -326,6 +358,18 @@
 
                             </group>
                         </page>
+                        <page string="发布历史" name="release_history" attrs="{'invisible': [('is_out_check', '=', False)]}">
+                            <field name="report_history_ids">
+                                <tree>
+                                    <field name="sequence"/>
+                                    <field name="report_number_id"/>
+                                    <field name="action"/>
+                                    <field name="document_status"/>
+                                    <field name="operation_time"/>
+                                    <field name="operator"/>
+                                </tree>
+                            </field>
+                        </page>
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">

quality_control/wizard/__init__.py

@@ -2,3 +2,5 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import quality_check_wizard
+from . import import_complex_model
+from . import quality_wizard

quality_control/wizard/import_complex_model.py

@@ -0,0 +1,439 @@
+# -*- coding: utf-8 -*-
+import base64
+import logging
+import os
+import traceback
+from datetime import datetime
+from io import BytesIO
+from openpyxl import load_workbook
+import pandas as pd
+import xlrd
+
+from odoo import fields, models, api, Command, _
+# from odoo.exceptions import ValidationError
+from odoo.exceptions import UserError
+from datetime import datetime, timedelta
+
+from odoo.http import request
+
+_logger = logging.getLogger(__name__)
+
+
+class ImportComplexModelWizard(models.TransientModel):
+    _name = 'quality.check.import.complex.model.wizard'
+    file_data = fields.Binary("数据文件")
+    model_name = fields.Char(string='Model Name')
+    field_basis = fields.Char(string='Field Basis')
+    check_id = fields.Many2one(string='质检单', comodel_name='quality.check')
+
+    def get_model_column_name_labels(self, model):
+        fields_info = model.fields_get()
+        # 提取字段名称和展示名称
+        field_labels = {field_info.get('string'): field_info for field_name, field_info in fields_info.items()}
+
+        return field_labels
+
+    def field_name_mapping(selfcolumn, column, field_data):
+        return {}
+
+    @api.model
+    def page_to_field(self, field_data):
+        return {}
+
+    def count_continuous_none(self, df):
+        # 用于存储间断的连续空值的区间
+        none_intervals = []
+        # if pd.isna(val):
+        # 遍历数据并查找连续的 None
+        start = 0
+        num = 0
+        for index, row in df.iterrows():
+            if pd.isna(row[0]):
+                continue
+            else:
+                # 记录区间
+                if num == 0:
+                    start = index
+                    num = 1
+                else:
+                    end = index
+                    none_intervals.append({'start': start, 'end': index})
+                    start = end
+                # start = None  # 重置
+
+        # 检查最后一个区间
+        if len(df) - start >= 1:
+            none_intervals.append({'start': start, 'end': len(df)})
+
+        return none_intervals
+
+    def find_repeated_ranges(self, data):
+        # 判断内联列表范围，有column列的为内联列表字段
+        if not data:
+            return []
+
+        repeats = []
+        start_index = 0
+        current_value = data[0]
+
+        for i in range(1, len(data)):
+            if data[i] == current_value:
+                continue
+            else:
+                if i - start_index > 1:  # 有重复
+                    repeats.append({'start': start_index, 'end': i, 'column': data[i - 1]})
+                    # repeats.append((current_value, start_index, i - 1))
+                current_value = data[i]
+                start_index = i
+
+        # 检查最后一段
+        if len(data) - start_index > 1:
+            repeats.append({'start': start_index, 'end': i, 'column': data[i - 1]})
+            # repeats.append((current_value, start_index, len(data) - 1))
+
+        return repeats
+
+    def import_data(self):
+        """导入Excel数据"""
+        if not self.file_data:
+            raise UserError(_('请先上传Excel文件'))
+        
+        if self.check_id.measure_line_ids:
+            self.sudo().check_id.measure_line_ids.unlink()
+
+        # 解码文件数据
+        file_content = base64.b64decode(self.file_data)
+
+        try:
+            # 使用xlrd读取Excel文件
+            workbook = xlrd.open_workbook(file_contents=file_content)
+            sheet = workbook.sheet_by_index(0)
+
+            # 检查表头是否符合预期（忽略星号）
+            expected_headers = ['产品名称', '图号', '检测项目', '测量值1', '测量值2', '测量值3', '测量值4', '测量值5', '判定', '备注']
+            actual_headers = sheet.row_values(0)
+
+            # 处理合并单元格的情况
+            # 获取所有合并单元格
+            merged_cells = []
+            for crange in sheet.merged_cells:
+                rlo, rhi, clo, chi = crange
+                if rlo == 0:  # 只关注第一行（表头）的合并单元格
+                    merged_cells.append((clo, chi))
+
+            # 清理表头（移除星号和处理空值）
+            actual_headers_clean = []
+            for i, header in enumerate(actual_headers):
+                # 检查当前列是否在合并单元格范围内但不是合并单元格的起始列
+                is_merged_not_first = any(clo < i < chi for clo, chi in merged_cells)
+
+                if is_merged_not_first:
+                    # 如果是合并单元格的非起始列，跳过
+                    continue
+
+                # 处理表头文本
+                if isinstance(header, str):
+                    header = header.replace('*', '').strip()
+
+                if header:  # 只添加非空表头
+                    actual_headers_clean.append(header)
+
+            # 检查表头数量
+            if len(actual_headers_clean) < len(expected_headers):
+                raise UserError(_('表头列数不足，请使用正确的模板文件'))
+
+            # 检查表头顺序（忽略星号）
+            for i, header in enumerate(expected_headers):
+                if i >= len(actual_headers_clean) or header != actual_headers_clean[i]:
+                    actual_header = actual_headers_clean[i] if i < len(actual_headers_clean) else "缺失"
+                    raise UserError(_('表头顺序不正确，第%s列应为"%s"，但实际为"%s"') %
+                                    (i + 1, header, actual_header))
+
+            # 获取当前活动的quality.check记录
+            active_id = self.env.context.get('active_id')
+            quality_check = self.env['quality.check'].browse(active_id)
+
+            if not quality_check:
+                raise UserError(_('未找到相关的质检记录'))
+
+            # 记录是否有有效数据被导入
+            valid_data_imported = False
+
+            # 从第二行开始读取数据（跳过表头）
+            max_columns = 1
+            for row_index in range(1, sheet.nrows):
+                row = sheet.row_values(row_index)
+
+                # 检查行是否有数据
+                if not any(row):
+                    continue
+
+                if row[2] == '':
+                    continue
+
+                # 创建quality.check.measure.line记录
+                measure_line_vals = {
+                    'check_id': quality_check.id,
+                    'sequence': len(quality_check.measure_line_ids) + 1,
+                    'product_name': str(row[0]) if row[0] else '',  # 产品名称列
+                    'drawing_no': str(row[1]) if row[1] else '',  # 图号列
+                    'measure_item': row[2] or '',  # 检测项目列
+                    'measure_value1': str(row[4]) if row[4] else '',  # 测量值1
+                    'measure_value2': str(row[5]) if row[5] else '',  # 测量值2
+                    'measure_value3': str(row[6]) if len(row) > 6 and row[6] else '',  # 测量值3
+                    'measure_value4': str(row[7]) if len(row) > 7 and row[7] else '',  # 测量值4
+                    'measure_value5': str(row[8]) if len(row) > 8 and row[8] else '',  # 测量值5
+                    'measure_result': 'NG' if row[9] == 'NG' else 'OK',  # 判定列
+                    'remark': row[10] if len(row) > 10 and row[10] else '',  # 备注列
+                }
+
+                for i in range(1, 6):
+                    if measure_line_vals.get(f'measure_value{i}'):
+                        if i > max_columns:
+                            max_columns = i
+
+                self.env['quality.check.measure.line'].create(measure_line_vals)
+                valid_data_imported = True
+            
+            quality_check.column_nums = max_columns
+
+            # 检查是否有有效数据被导入
+            if not valid_data_imported:
+                raise UserError(_('表格中没有有效数据行可导入，请检查表格内容'))
+
+            # 返回关闭弹窗的动作
+            return {
+                'type': 'ir.actions.act_window_close'
+            }
+
+        except Exception as e:
+            _logger.error("导入Excel数据时出错: %s", str(e))
+            _logger.error(traceback.format_exc())
+            raise UserError(_('导入失败: %s') % str(e))
+
+    def process_first_line(self, df_columns, column_labels, field_data):
+        columns = []
+        last_column_name = None
+        for index, column in enumerate(df_columns):
+            if not column_labels.get(column):
+                if 'Unnamed' in column:
+                    columns.append(last_column_name)
+                else:
+                    field_name_map = self.page_to_field(field_data)
+                    field_name = field_name_map.get(column)
+                    if field_name:
+                        columns.append(field_name)
+                        last_column_name = field_name
+                    else:
+                        columns.append(column)
+                        last_column_name = column
+            else:
+                columns.append(column)
+                last_column_name = column
+        return columns
+
+    def process_inline_list_column(self, columns, first_row, repeat_list):
+        for index, repeat_map in enumerate(repeat_list):
+            start = repeat_map.get('start')
+            end = int(repeat_map.get('end'))
+            if len(repeat_list) - 1 == index:
+                end = end + 1
+            for i in range(start, end):
+                field_name = columns[i]
+                embedded_fields = first_row[i]
+                if pd.isna(embedded_fields):
+                    columns[i] = field_name
+                else:
+                    columns[i] = field_name + '?' + embedded_fields
+
+    def process_data_list(self, model, data_list, column_labels, sheet):
+        try:
+            for index, data in enumerate(data_list):
+                # 转换每行数据到模型data = {dict: 11} {'刀具物料': '刀片', '刀尖特征': '刀尖倒角', '刀片形状': '五边形', '刀片物料参数': [{'刀片物料参数?内接圆直径IC/D(mm)': 23, '刀片物料参数?刀尖圆弧半径RE(mm)': 2, '刀片物料参数?刀片牙型': '石油管螺纹刀片', '刀片物料参数?切削刃长(mm)': 3, '刀片物料参数?厚度(mm)': 12, '刀片物料参数?后角(mm)': 4, '刀片物料参数?安装孔直径D1(mm)': 2, '刀片物料参数?有无断屑槽': '无', '刀片物料参数?物…视图
+                self.import_model_record(model, data, column_labels, sheet)
+        except Exception as e:
+            traceback_error = traceback.format_exc()
+            logging.error('批量导入失败sheet %s' % sheet)
+            logging.error('批量导入失败 : %s' % traceback_error)
+            raise UserError(e)
+
+    @api.model
+    def process_model_record_data(self, model, data, column_labels, sheet):
+        pass
+
+    def import_model_record(self, model, data, column_labels, sheet):
+        self.process_model_record_data(model, data, column_labels, sheet)
+        model_data = self.convert_column_name(data, column_labels)
+        logging.info('批量导入模型{}  数据: {}'.format(model, model_data))
+        new_model = model.create(model_data)
+        self.model_subsequent_processing(new_model, data)
+
+    @api.model
+    def model_subsequent_processing(self, model, data):
+        pass
+
+    def convert_column_name(self, data, column_labels):
+        tmp_map = {}
+        for key, value in data.items():
+            if not column_labels.get(key):
+                continue
+            if key == "执行标准":
+                print('fqwioiqwfo ', value, column_labels)
+            field_info = column_labels.get(key)
+            tmp_map[field_info.get('name')] = self.process_field_data(value, field_info)
+        return tmp_map
+
+    def process_field_data(self, value, field_info):
+        relation_field_types = ['many2one', 'one2many', 'many2many']
+        field_type = field_info.get('type')
+        if field_type not in relation_field_types:
+            return value
+        if field_type == 'Boolean':
+            if value == '是' or value == '有':
+                return True
+            else:
+                return False
+        if field_type == 'many2one':
+            relation_info = self.env[field_info.get('relation')].sudo().search([('name', '=', value)], limit=1)
+            if relation_info:
+                return int(relation_info)
+
+        if isinstance(value, list):
+            return self.process_basic_data_list(value, field_info)
+        else:
+            relation_info = self.env[field_info.get('relation')].sudo().search([('name', '=', value)], limit=1)
+            if relation_info:
+                return [Command.link(int(relation_info))]
+
+    def process_basic_data_list(self, value, field_info):
+        if self.is_basic_data_list(value):
+            return [
+                Command.link(
+                    int(self.env[field_info.get('relation')].sudo().search([('name', '=', element)], limit=1)))
+                for element in value
+            ]
+        else:
+            association_column_labels = self.get_model_column_name_labels(
+                self.env[field_info.get('relation')].sudo())
+            data_list = [
+                {column_name.split('?')[1]: column_value
+                 for column_name, column_value in association_column_data.items()
+                 if
+                 len(column_name.split('?')) == 2 and association_column_labels.get(column_name.split('?')[1])}
+                for association_column_data in value
+            ]
+            data_list = [self.convert_column_name(element, association_column_labels) for element in data_list]
+            return [
+                Command.create(
+                    column_map
+                ) for column_map in data_list
+            ]
+
+    def get_remaining_ranges(self, ranges, full_list_length):
+        # 创建一个集合用于存储被覆盖的索引
+        covered_indices = set()
+
+        # 遍历范围集合，标记覆盖的索引
+        for r in ranges:
+            start = r['start']
+            end = r['end']
+            # 将该范围内的索引加入集合
+            covered_indices.update(range(start, end + 1))
+
+        # 计算未覆盖的范围
+        remaining_ranges = []
+        start = None
+
+        for i in range(full_list_length):
+            if i not in covered_indices:
+                if start is None:
+                    start = i  # 开始新的未覆盖范围
+            else:
+                if start is not None:
+                    # 记录当前未覆盖范围
+                    remaining_ranges.append({'start': start, 'end': i - 1})
+                    start = None  # 重置
+
+        # 处理最后一个范围
+        if start is not None:
+            remaining_ranges.append({'start': start, 'end': full_list_length - 1})
+
+        return remaining_ranges
+
+    def is_basic_data_list(self, lst):
+        basic_types = (int, float, str, bool)
+        lst_len = len(lst)
+        if lst_len < 1:
+            return False
+        if isinstance(lst[0], basic_types):
+            return True
+        return False
+
+    def index_retrieve_data(self, df, range_map, i, data_map):
+        for remaining_map in range_map:
+            relation_column_data_map = {}
+            for j in range(remaining_map.get('start'), int(remaining_map.get('end')) + 1):
+                value = df.iat[i, j]
+                if pd.isna(value):
+                    continue
+                if remaining_map.get('column'):
+                    relation_column_data_map.update({df.columns[j]: value})
+                else:
+                    if not data_map.get(df.columns[j]):
+                        data_map.update({df.columns[j]: value})
+                    elif isinstance(data_map.get(df.columns[j]), list):
+                        data_map.get(df.columns[j]).append(value)
+                    else:
+                        lst = [data_map.get(df.columns[j]), value]
+                        data_map.update({df.columns[j]: lst})
+            if relation_column_data_map and len(relation_column_data_map) > 0:
+                data_map.setdefault(remaining_map.get('column'), []).append(relation_column_data_map)
+
+    def parse_excel_data_matrix(self, df, repeat_list):
+        row_interval_list = self.count_continuous_none(df)
+        remaining_ranges = self.get_remaining_ranges(repeat_list, len(df.columns))
+        data_list = []
+        for row_interval_map in row_interval_list:
+            data_map = {}
+            for index in range(row_interval_map.get('start'), int(row_interval_map.get('end'))):
+                if index == 0:
+                    self.index_retrieve_data(df, remaining_ranges, index, data_map)
+                else:
+                    self.index_retrieve_data(df, remaining_ranges, index, data_map)
+                    self.index_retrieve_data(df, repeat_list, index, data_map)
+            if len(data_map) > 0:
+                data_list.append(data_map)
+        return data_list
+
+    def saadqw(self):
+
+        excel_template = self.env['excel.template'].sudo().search([('model_id.model', '=', self.model_name)], limit=1)
+        file_content = base64.b64decode(excel_template.file_data)
+        return {
+            'type': 'ir.actions.act_url',
+            'url': 'data:application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;base64,{file_content}',
+            'target': 'self',
+            'download': excel_template.file_name,
+        }
+        # return request.make_response(
+        #     file_content,
+        #     headers=[
+        #         ('Content-Disposition', f'attachment; filename="{excel_template.file_name}"'),
+        #         ('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'),
+        #     ]
+        # )
+
+    def download_excel_template(self):
+        base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url') + '/quality_control/static/src/binary/出厂检验报告上传模版.xlsx'
+
+        # 只有当原始 URL 使用 http 时才替换为 https
+        if base_url.startswith("http://"):
+            excel_url = base_url.replace("http://", "https://")
+        else:
+            excel_url = base_url
+        value = dict(
+            type='ir.actions.act_url',
+            target='self',
+            url=excel_url,
+        )
+        return value

quality_control/wizard/import_complex_model.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="quality_check_import_complex_model_wizard_form" model="ir.ui.view">
+            <field name="name">请导入数据文件</field>
+            <field name="model">quality.check.import.complex.model.wizard</field>
+            <field name="arch" type="xml">
+                 <form>
+                     <group>
+                        <field name="file_data" widget="binary" options="{'accepted_file_extensions': '.xlsx'}"/>
+                     </group>
+                     <footer>
+                         <button string="确认导入" name="import_data" type="object" class="btn-primary"/>
+                         <button string="取消" class="btn-primary" special="cancel"/>
+                         <button string="模板文件下载" name="download_excel_template" type="object" class="btn-primary"/>
+                     </footer>
+                 </form>
+            </field>
+    </record>
+    <record id="import_complex_model_wizard" model="ir.actions.act_window">
+        <field name="name">导入模型数据</field>
+        <field name="type">ir.actions.act_window</field>
+<!--        <field name="res_model">up.select.wizard</field>-->
+        <field name="res_model">quality.check.import.complex.model.wizard</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="quality_check_import_complex_model_wizard_form"/>
+        <field name="target">new</field>
+<!--        <field name="context"></field>-->
+    </record>
+
+
+
+
+</odoo>

quality_control/wizard/quality_check_wizard.py

@@ -62,7 +62,8 @@ class QualityCheckWizard(models.TransientModel):
 
     def do_pass(self):
         if self.test_type == 'picture' and not self.picture:
-            raise UserError('You must provide a picture before validating')
+            raise UserError('请先上传照片')
+            # raise UserError('You must provide a picture before validating')
         self.current_check_id.do_pass()
         return self.action_generate_next_window()
 
@@ -112,3 +113,25 @@ class QualityCheckWizard(models.TransientModel):
             default_current_check_id=self.current_check_id.id,
         )
         return action
+    
+    # 对于成品出库的出厂检验报告，增加发布按钮
+    def publish(self): 
+        self.current_check_id._check_part_number()
+        self.current_check_id._check_measure_line()
+        self.current_check_id._check_check_qty_and_total_qty()
+        self.current_check_id._do_publish_implementation()
+
+
+class PickingCheckCancelWizard(models.TransientModel):
+    _name = 'picking.check.cancel.wizard'
+    _description = 'picking check cancel wizard'
+
+    picking_id = fields.Many2one('stock.picking', 'stock picking')
+
+    def confirm_picking_check(self):
+        res = self.picking_id.action_cancel()
+        return res
+
+    def cancel_picking_check(self):
+        # 这里是取消后的逻辑
+        return {'type': 'ir.actions.act_window_close'}

quality_control/wizard/quality_check_wizard_views.xml

@@ -79,7 +79,10 @@
                         attrs="{'invisible': ['|', ('quality_state', '!=', 'none'), ('test_type', '!=', 'passfail')]}" data-hotkey="x"/>
                     <button name="action_generate_previous_window" type="object" class="btn-secondary" string="Previous" attrs="{'invisible': [('position_current_check', '=', 1)]}"/>
                     <button name="action_generate_next_window" type="object" class="btn-secondary" string="Next" attrs="{'invisible': [('is_last_check', '=', True)]}"/>
+                    <button string="发布" name="publish" type="object" class="btn-primary"
+                        attrs="{'invisible': ['|', ('quality_state', '!=', 'none'), ('test_type', '!=', 'factory_inspection')]}" data-hotkey="p"/>
                     <button string="Cancel" class="btn btn-secondary" special="cancel" data-hotkey="z" />
+
                 </footer>
             </form>
         </field>
@@ -118,4 +121,21 @@
         <field name="context">{}</field>
         <field name="target">new</field>
     </record>
+
+
+    <!--  ==================================================================================================  -->
+    <record id="picking_check_cancel_wizard_form" model="ir.ui.view">
+        <field name="name">picking.check.cancel.wizard</field>
+        <field name="model">picking.check.cancel.wizard</field>
+        <field name="arch" type="xml">
+            <form string="Quality Check Failed">
+                <div>质量检查单已完成，继续取消吗？</div>
+                <div class="'color': 'red'">注意：关联质量检查单也将被取消。</div>
+                <footer>
+                    <button name="confirm_picking_check" type="object" class="btn-primary" string="确认"/>
+                    <button name="cancel_picking_check" type="object" string="取消"/>
+                </footer>
+            </form>
+        </field>
+    </record>
 </odoo>

quality_control/wizard/quality_wizard.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, _
+
+class QualityCheckPublishWizard(models.TransientModel):
+    _name = 'quality.check.publish.wizard'
+    _description = '质检报告发布确认'
+
+    check_id = fields.Many2one('quality.check', string='质检单', required=True)
+    product_name = fields.Char('产品名称', readonly=True)
+    total_qty = fields.Char('总数量', readonly=True)
+    check_qty = fields.Char('检验数', readonly=True)
+    measure_count = fields.Integer('测量件数', readonly=True)
+    item_count = fields.Integer('检验项目数', readonly=True)
+    old_report_name = fields.Char('旧出厂检验报告编号', readonly=True)
+    publish_status = fields.Selection([('draft', '草稿'), ('published', '已发布'), ('canceled', '已撤销')], string='发布状态', readonly=True)
+    
+    def action_confirm_publish(self):
+        """确认发布"""
+        self.ensure_one()
+        return self.check_id._do_publish_implementation()

quality_control/wizard/quality_wizard_view.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_quality_check_publish_wizard_form" model="ir.ui.view">
+        <field name="name">quality.check.publish.wizard.form</field>
+        <field name="model">quality.check.publish.wizard</field>
+        <field name="arch" type="xml">
+            <form string="发布确认">
+                <div class="alert alert-info" role="alert" style="margin-bottom:0px;">
+                    <p>您即将发布出厂检验报告：产品<strong><field name="product_name" class="oe_inline"/></strong>，总数量<strong><field name="total_qty" class="oe_inline"/></strong>，检验数<strong><field name="check_qty" class="oe_inline"/></strong>，测量<strong><field name="measure_count" class="oe_inline"/></strong>件，检验项目<strong><field name="item_count" class="oe_inline"/></strong>项。</p>
+                    <field name="publish_status" invisible="1"/>
+                    <!-- 状态为draft时显示 -->
+                    <div attrs="{'invisible': [('publish_status', '!=', 'draft')]}">
+                        <span style="font-weight:bold;">
+                            注意：发布后所有用户可扫描下载本报告
+                        </span>
+                    </div>
+                    <!-- 状态不为draft时显示 -->
+                    <div attrs="{'invisible': [('publish_status', '=', 'draft')]}">
+                        <span style="font-weight:bold;">
+                            注意：已发布的报告
+                            <field name="old_report_name" readonly="1" 
+                                  style="color:red;" 
+                                  attrs="{'invisible': [('old_report_name', '=', False)]}"/>
+                            <span style="color:red;" 
+                                 attrs="{'invisible': [('old_report_name', '!=', False)]}">(未知报告编号)</span>
+                            可能已被客户下载
+                        </span>
+                    </div>
+                </div>
+                <footer>
+                    <button name="action_confirm_publish" string="发布" type="object" class="btn-primary"/>
+                    <button string="取消" class="btn-secondary" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+</odoo>

quality_mrp_workorder/views/quality_views.xml

@@ -65,7 +65,7 @@
             <field name="lot_id" position="after">
                 <field name="workorder_id" invisible="1"/>
                 <field name="production_id" invisible="1"/>
-                <field name="finished_lot_id" attrs="{'invisible': [('finished_lot_id', '=', False)]}" groups="stock.group_production_lot"/>
+<!--                 <field name="finished_lot_id" attrs="{'invisible': [('finished_lot_id', '=', False)]}" groups="stock.group_production_lot"/> -->
             </field>
             <xpath expr="//field[@name='lot_id']" position="after">
                 <field name="lot_id" attrs="{'invisible': [('workorder_id', '=', False)]}" groups="stock.group_production_lot" string="Component Lot/Serial"/>

sf_base/models/base.py

@@ -421,3 +421,4 @@ class EmbryoRedundancy(models.Model):
     width = fields.Float('宽度(mm)', required=True)
     height = fields.Float('高度(mm)', required=True)
     active = fields.Boolean('有效', default=True)
+    remark = fields.Char('描述')

sf_base/models/common.py

@@ -57,15 +57,42 @@ class MrsMaterialModel(models.Model):
     remark = fields.Text("备注")
     gain_way = fields.Selection(
         [("自加工", "自加工"), ("外协", "委外加工"), ("采购", "采购")],
-        default="", string="获取方式")
+        default="采购", string="获取方式")
     supplier_ids = fields.One2many('sf.supplier.sort', 'materials_model_id', string='供应商')
     active = fields.Boolean('有效', default=True)
 
-    @api.constrains("gain_way")
-    def _check_supplier_ids(self):
-        for item in self:
-            if item.gain_way in ('外协', '采购') and not item.supplier_ids:
-                raise UserError("请添加供应商")
+    def write(self, vals):
+        res = super(MrsMaterialModel, self).write(vals)
+        if not self.gain_way:
+            self.gain_way = '采购'
+        if not self.supplier_ids:
+            supplier_id = self.env['res.partner'].search([('name', 'like', '%傲派%')], limit=1)
+            if not supplier_id:
+                supplier_id = self.env['res.partner'].create({
+                    'name': '湖南傲派自动化设备有限公司',
+                    'supplier_rank':1,
+                })
+            self.supplier_ids = [(0, 0, {'materials_model_id': self.id, 'partner_id': supplier_id.id or False})]
+        return res
+    @api.model
+    def create(self, vals):
+        res = super(MrsMaterialModel, self).create(vals)
+        if not vals.get('supplier_ids'):
+            supplier_id = self.env['res.partner'].search([('name', 'like', '%傲派%')], limit=1)
+            if not supplier_id:
+                supplier_id = self.env['res.partner'].create({
+                    'name': '湖南傲派自动化设备有限公司',
+                    'supplier_rank': 1,
+                })
+            res.supplier_ids = [(0, 0, {'materials_model_id': res.id, 'partner_id': supplier_id.id or False})]
+            return res
+        else:
+            return res
+    # @api.constrains("gain_way")
+    # def _check_supplier_ids(self):
+    #     for item in self:
+    #         if item.gain_way in ('外协', '采购') and not item.supplier_ids:
+    #             raise UserError("请添加供应商")
 
 
 class MrsProductionProcessCategory(models.Model):

sf_base/models/fixture.py

@@ -32,6 +32,7 @@ class FixtureModel(models.Model):
     multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型")
     brand_id = fields.Many2one('sf.machine.brand', string="品牌")
     model_file = fields.Binary(string="图片")
+    glb_url = fields.Char(string="图片")
     status = fields.Boolean('状态')
     active = fields.Boolean('有效', default=False)
 

sf_base/models/tool_base_new.py

@@ -187,7 +187,7 @@ class CuttingToolModel(models.Model):
     def _get_ids(self, cutting_tool_type_code, factory_short_name):
         cutting_tool_type_ids = []
         for item in cutting_tool_type_code:
-            cutting_tool_type = self.search([('code', '=', item.replace("JKM", factory_short_name))])
+            cutting_tool_type = self.search([('code', '=', item)])
             if cutting_tool_type:
                 cutting_tool_type_ids.append(cutting_tool_type.id)
         return [(6, 0, cutting_tool_type_ids)]

sf_base/static/js/updateTable.js

@@ -9,6 +9,7 @@ function getDomData() {
     table.hide()
     const thead = customTable.children('thead')
     const tbody = customTable.children('tbody')
+    const tfooter = customTable.children('tfoot')
     const tableData = []
     const tbody_child = tbody.children()
 
@@ -16,30 +17,29 @@ function getDomData() {
 
     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})
+        tableData.push({ index, deep, name, Φ, value })
     }
-    const ΦList = [...new Set(tableData.map(_ => _.name))] // ΦList去重
+    const ΦList = [...new Set(tableData.map(_ => _.Φ))] // ΦList去重
     const newTableData = {}
     tableData.forEach(_ => {
-        const key = _.deep + '|' + _.Φ
-        !newTableData[key] ? newTableData[key] = {i: _.index} : '';
+        const key = _.deep + '|' + _.name
+        !newTableData[key] ? newTableData[key] = { i: _.index } : '';
         if (_.Φ) { // 去除没有Φ的脏数据
             newTableData[key]['Φ' + _.Φ] = _.value
             newTableData[key]['Φ' + _.Φ + 'i'] = _.index
         }
     })
-    // console.log('qwdh',tableData, ΦList, newTableData);
+    // console.log(tableData, ΦList, newTableData);
 
     if (ΦList.filter(_ => _).length == 0) return;
-    handleThead(thead, ΦList)
+    handleThead(thead, ΦList, tfooter)
 
-    handleTbody(tbody, newTableData, ΦList, table)
+    handleTbody(tbody, newTableData, ΦList, table )
 }
 
 // 重新设置表头、
-function handleThead(thead, ΦList) {
+function handleThead(thead, ΦList, tfooter) {
     const dom = thead.children().eq(0).children()
     const len = dom.length
     dom.eq(0).attr('rowspan', 2)
@@ -47,7 +47,11 @@ function handleThead(thead, ΦList) {
     len == 5 ? dom.eq(2).attr('rowspan', 2) : ''
     dom.eq(-2).attr('colspan', ΦList.length)
     dom.eq(-1).remove()
-
+    if(tfooter && tfooter.length) {
+        tfooter.children().each(function () {
+            $(this).children().eq(-1).remove()
+        })
+    }
     const tr = document.createElement('tr')
     for (let v = 0; v < ΦList.length; v++) {
         const th = document.createElement('th')
@@ -68,7 +72,6 @@ function handleTbody(tbody, newTableData, ΦList, table) {
     //     b = b.split('=')[1].split('%')[0]
     //     return a - b
     // })
-    // console.log('wqoqw ',ΦList)
     data.forEach(_ => {
         i++
         const tr = $('<tr class="o_data_row"></tr>')
@@ -98,61 +101,6 @@ function handleTbody(tbody, newTableData, ΦList, table) {
         //                 // }
         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);
-// });
 
 }
 

sf_base/static/src/scss/format_img.scss

@@ -25,3 +25,17 @@
 .o_search_panel.account_root {
   flex: unset !important;
 }
+
+.multi-line {
+  display: flex;
+  flex-wrap: nowrap;
+  > label.o_form_label {
+    width: 52px;
+  }
+  > span {
+    flex: 1;
+  }
+  > div {
+    flex: 2
+  }
+}

sf_base/views/base_view.xml

@@ -645,6 +645,7 @@
                 <field name="long"/>
                 <field name="width"/>
                 <field name="height"/>
+                <field name="remark"/>
             </tree>
         </field>
     </record>

sf_base/views/common_view.xml

@@ -262,13 +262,13 @@
                             <group>
                                 <field name="materials_no" readonly="1" force_save="1"/>
                                 <field name="gain_way" required="0"/>
-                                <field name="tensile_strength" required="1"/>
-                                <field name="hardness" required="1"/>
-                                <field name="density" readonly="1"/>
+                                <field name="density" readonly="1" required="1"  class="custom_required"/>
                             </group>
                             <group>
                                 <field name="rough_machining" required="1"/>
                                 <field name="finish_machining" required="1"/>
+                                <field name="tensile_strength" required="1"/>
+                                <field name="hardness" required="1"/>
                                 <field name="need_h" default="false" readonly="1"/>
                                 <field name="mf_materia_post" attrs="{'invisible':[('need_h','=',False)]} "
                                        readonly="1"/>
@@ -297,7 +297,7 @@
         <record model="ir.ui.view" id="sf_materials_model_tree">
             <field name="model">sf.materials.model</field>
             <field name="arch" type="xml">
-                <tree string="材料型号" delete="0">
+                <tree string="材料型号" delete="0" create="0">
                     <field name="materials_no"/>
                     <field name="materials_code"/>
                     <field name="name"/>

sf_base/views/fixture_view.xml

@@ -158,6 +158,8 @@
                             <!--                            <field name="upload_model_file" widget="many2many_binary"/>-->
                             <field name="model_file" widget="Viewer3D" string="模型" readonly="1" force_save="1"
                                    attrs="{'invisible': [('model_file', '=', False)]}"/>
+                            <field name="glb_url" widget="Viewer3D" string="模型" readonly="1" force_save="1"
+                                   attrs="{'invisible': [('glb_url', '=', False)]}"/>
                         </group>
                     </group>
                     <notebook>

sf_base/views/tool_views.xml

@@ -112,6 +112,8 @@
                     <field name="cutting_tool_material_id"/>
                     <field name="cutting_tool_type_id"/>
                     <field name="brand_id"/>
+                    <field name="create_date" optional="hide"/>
+                    <field name="write_date" string="修改时间" optional="hide"/>
                 </tree>
             </field>
         </record>
@@ -138,7 +140,7 @@
                                 <field name="brand_id" required="1"/>
                                 <label for="integral_run_out_accuracy_min" string="端跳精度"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <div class="o_address_format"
+                                <div class="o_address_format multi-line"
                                      attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
                                     <label for="integral_run_out_accuracy_min" string="最小"/>
                                     <field name="integral_run_out_accuracy_min" class="o_address_zip"
@@ -177,33 +179,33 @@
                         </group>
                         <group string="适配刀片形状"
                                attrs="{'invisible': [('cutting_tool_type', 'in', ('刀柄','夹头','整体式刀具',False))]}">
-                            <field name="fit_blade_shape_id" string="" widget="many2one_radio"/>
+                            <field name="fit_blade_shape_id" string="" widget="many2one_radio" attrs="{'showExpand': True}"/>
                         </group>
                         <group string="适合加工方式"
                                attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
                             <field name="suitable_machining_method_ids" string=""
-                                   widget="custom_many2many_checkboxes"/>
+                                   widget="custom_many2many_checkboxes" attrs="{'showExpand': True}"/>
                         </group>
                         <group string="刀尖特征"
                                attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
                             <field name="blade_tip_characteristics_id" string=""
-                                   widget="many2one_radio"/>
+                                   widget="many2one_radio" attrs="{'showExpand': True}"/>
                         </group>
                         <group attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
                             <group string="柄部类型" attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
-                                <field name="handle_type_id" string="" widget="many2one_radio"/>
+                                <field name="handle_type_id" string="" widget="many2one_radio" attrs="{'showExpand': True}"/>
                             </group>
                             <group string="压紧方式"
                                    attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}">
-                                <field name="compaction_way_id" string="" widget="many2one_radio"/>
+                                <field name="compaction_way_id" string="" widget="many2one_radio" attrs="{'showExpand': True}"/>
                             </group>
                         </group>
                         <group attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
                             <group string="走刀方向">
-                                <field name="cutting_direction_ids" string="" widget="custom_many2many_checkboxes"/>
+                                <field name="cutting_direction_ids" string="" widget="custom_many2many_checkboxes" attrs="{'showExpand': True}"/>
                             </group>
                             <group string="适合冷却方式">
-                                <field name="suitable_coolant_ids" string="" widget="custom_many2many_checkboxes"/>
+                                <field name="suitable_coolant_ids" string="" widget="custom_many2many_checkboxes" attrs="{'showExpand': True}"  />
                             </group>
                         </group>
                         <notebook>
@@ -317,28 +319,28 @@
 
                                 <field name="knife_handle_basic_parameters_ids"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}">
-                                    <tree editable="bottom" class="center" delete="1">
+                                    <tree editable="bottom" delete="1">
                                         <field name="cutting_tool_type" invisible="1"/>
                                         <field name="name"/>
                                         <field name="taper_shank_model"/>
                                         <field name="total_length"/>
                                         <field name="shank_length"/>
                                         <field name="shank_diameter" class="diameter"/>
-                                        <field name="flange_shank_length"/>
-                                        <field name="flange_diameter"/>
-                                        <field name="diameter_slip_accuracy"/>
-                                        <field name="dynamic_balance_class"/>
+                                        <field name="flange_shank_length"  optional="hide"/>
+                                        <field name="flange_diameter" optional="hide"/>
+                                        <field name="diameter_slip_accuracy" optional="hide"/>
+                                        <field name="dynamic_balance_class" optional="hide"/>
                                         <field name="min_clamping_diameter" class="diameter"/>
                                         <field name="max_clamping_diameter" class="diameter"/>
-                                        <field name="max_rotate_speed"/>
+                                        <field name="max_rotate_speed" optional="hide"/>
                                         <field name="fit_chuck_size"/>
-                                        <field name="nut"/>
-                                        <field name="spanner" string="适配锁紧扳手型号"/>
-                                        <field name="clamping_mode"/>
-                                        <field name="tool_changing_time"/>
-                                        <field name="cooling_model"/>
-                                        <field name="is_quick_cutting"/>
-                                        <field name="is_safe_lock"/>
+                                        <field name="nut" optional="hide"/>
+                                        <field name="spanner" string="适配锁紧扳手型号" optional="hide"/>
+                                        <field name="clamping_mode" optional="hide"/>
+                                        <field name="tool_changing_time" optional="hide"/>
+                                        <field name="cooling_model" optional="hide"/>
+                                        <field name="is_quick_cutting" optional="hide"/>
+                                        <field name="is_safe_lock" optional="hide"/>
                                     </tree>
                                 </field>
                                 <field name="chuck_basic_parameters_ids"

sf_bf_connect/controllers/controllers.py

@@ -29,7 +29,7 @@ class Sf_Bf_Connect(http.Controller):
             bfm_process_order_list = json.loads(kw['bfm_process_order_list'])
             order_id = request.env['sale.order'].with_user(request.env.ref("base.user_admin")).sale_order_create(
                 company_id, kw['delivery_name'], kw['delivery_telephone'], kw['delivery_address'],
-                kw['delivery_end_date'], kw['payments_way'], kw['pay_way'])
+                kw['delivery_end_date'], kw['payments_way'], kw['pay_way'], model_display_version=kw.get('model_display_version'))
             i = 1
             # 给sale_order的default_code字段赋值
             aa = request.env['sale.order'].sudo().search([('name', '=', order_id.name)])

sf_bf_connect/models/process_status.py

@@ -72,7 +72,7 @@ class StatusChange(models.Model):
         logging.info('函数已经执行=============')
 
         # 使用super()来调用原始方法（在本例中为'sale.order'模型的'action_cancel'方法）
-        res = super(StatusChange, self).action_cancel()
+        res = super(StatusChange, self.with_context(disable_cancel_warning=True)).action_cancel()
 
         # 原有方法执行后，进行额外的操作（如调用外部API）
         logging.info('函数已经执行=============2')

sf_bf_connect/views/view.xml

@@ -32,7 +32,7 @@
                 <field name="is_bill" invisible="True"/>
                 <field name="logistics_status" invisible="True"/>
                 <field name="logistics_way" invisible="True"/>
-                <button string="物流下单" name="create_order" type="object" confirm="是否确认物流下单" class="btn-primary"
+                <!-- <button string="物流下单" name="create_order" type="object" confirm="是否确认物流下单" class="btn-primary" -->
                 attrs="{'invisible': ['|', '|', '|', ('check_out', '!=', 'OUT'), ('state', '!=', 'assigned'), ('is_bill', '=', True), ('logistics_way', '=', '自提')]}"/>
                 <button string="获取物流面单" name="get_bill" type="object" confirm="是否获取物流面单" class="btn-primary"
                 attrs="{'invisible': ['|', '|', '|', '|', ('check_out', '!=', 'OUT'), ('state', '!=', 'assigned'), ('logistics_status', '=', '2'), ('is_bill', '=', False), ('logistics_way', '=', '自提')]}"/>

sf_dlm/models/product_template.py

@@ -44,7 +44,7 @@ class ResProductTemplate(models.Model):
         else:
             return self.env.ref('sf_dlm.product_uom_cubic_millimeter')
 
-    # model_file = fields.Binary('模型文件')
+    model_file = fields.Binary('模型文件')
 
     # 胚料的库存路线设置
     # def _get_routes(self, route_type):

sf_dlm/views/product_workorder.xml

@@ -6,7 +6,7 @@
         <field name="inherit_id" ref="sf_manufacturing.view_mrp_production_workorder_tray_form_inherit_sf"/>
         <field name="arch" type="xml">
             <xpath expr="//page[1]" position="before">
-                <page string="开料要求" attrs='{"invisible": [("routing_type","!=","切割")]}'>
+                <page string="开料要求" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "CMR")]}'>
                     <group>
                         <group>
                             <field name="product_tmpl_id_materials_id" widget="many2one"/>

sf_dlm_management/views/product_template_management_view.xml

@@ -16,15 +16,21 @@
                     <field name='categ_id' class="custom_required" attrs="{'readonly': [('id', '!=', False)]}"/>
                     <field name='is_bfm' invisible="1"/>
                     <field name='categ_type' invisible="1"/>
+                    <field name='glb_url' invisible="1"/>
                     <field name='part_name' attrs="{'invisible': [('categ_type', '!=', '成品')]}"/>
                     <field name='part_number' attrs="{'invisible': [('categ_type', '!=', '成品')]}"/>
-                    <field name='manual_quotation' attrs="{'invisible':[('upload_model_file', '=', [])]}"/>
+                    <field name='manual_quotation' attrs="{'invisible':[('glb_url', '=', False)]}"/>
                     <field name="is_customer_provided" attrs="{'invisible': [('categ_type', 'not in', ['成品', '坯料'])], 'readonly': True}" />
-                    <field name="upload_model_file"
-                           widget="many2many_binary"
-                           attrs="{'invisible': ['|', '|',('categ_type', '!=', '成品'),('categ_type', '=', False),('is_bfm','=', True)]}"/>
+                    <field name="model_name" invisible="1"/>
+                    <field name="upload_model_file" widget="many2many_binary" attrs="{'invisible': [('upload_model_file', '=', False)]}"/>
+                    <field name="model_url"
+                           widget="binary_download"
+                           filename_field="model_name"
+                           attrs="{'invisible': ['|', '|',('categ_type', '!=', '成品'),('categ_type', '=', False),('model_url', '=', False)]}"/>
                     <field name="model_file" widget="Viewer3D" string="模型" readonly="1" force_save="1"
                            attrs="{'invisible': ['|','|', ('categ_type', '!=', '成品'),('categ_type', '=', False),('model_file', '=', False)]}"/>
+                     <field name="glb_url" widget="Viewer3D" string="模型" readonly="1" force_save="1"
+                           attrs="{'invisible': ['|','|', ('categ_type', '!=', '成品'),('categ_type', '=', False),('glb_url', '=', False)]}"/>
                     <field name='cutting_tool_type' invisible="1"/>
                     <field name="fixture_material_type" invisible="1"/>
                     <field name="embryo_model_type_id" string="模型类型" options="{'no_create': True}"
@@ -68,6 +74,7 @@
                 </field>
                 <xpath expr="//field[@name='uom_id']" position="before">
                     <field name="is_manual_processing" attrs="{'invisible': [('categ_type', 'not in', ['成品', '坯料'])], 'readonly': True}" />
+                    <field name="auto_machining" attrs="{'invisible': [('categ_type', 'not in', ['成品', '坯料'])], 'readonly': True}" />
                 </xpath>
                 <xpath expr="//label[@for='volume']" position="before">
                     <label for="length" string="尺寸"

sf_machine_connect/controllers/controllers.py

@@ -5,7 +5,7 @@ import json
 import base64
 import logging
 import psycopg2
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from odoo import http, fields
 from odoo.http import request
 
@@ -414,7 +414,7 @@ class Sf_Dashboard_Connect(http.Controller):
 
                 # 工单计划量切换为CNC工单
                 plan_data_total_counts = work_order_obj.search_count(
-                    [('production_id.production_line_id.name', '=', line),
+                    [('production_line_id.name', '=', line), ('id', '!=', 8061),
                      ('state', 'in', ['ready', 'progress', 'done']), ('routing_type', '=', 'CNC加工')])
 
                 # # 工单完成量
@@ -423,13 +423,13 @@ class Sf_Dashboard_Connect(http.Controller):
 
                 # 工单完成量切换为CNC工单
                 plan_data_finish_counts = work_order_obj.search_count(
-                    [('production_id.production_line_id.name', '=', line),
+                    [('production_line_id.name', '=', line),
                      ('state', 'in', ['done']), ('routing_type', '=', 'CNC加工')])
 
                 # 超期完成量
                 # 搜索所有已经完成的工单
                 plan_data_overtime = work_order_obj.search([
-                    ('production_id.production_line_id.name', '=', line),
+                    ('production_line_id.name', '=', line),
                     ('state', 'in', ['done']),
                     ('routing_type', '=', 'CNC加工')
                 ])
@@ -448,9 +448,14 @@ class Sf_Dashboard_Connect(http.Controller):
                 ])
 
                 # 过滤出那些检测结果状态为 '返工' 或 '报废' 的记录
-                faulty_plans = plan_data.filtered(lambda p: any(
-                    result.test_results in ['返工', '报废'] for result in p.production_id.detection_result_ids
-                ))
+                # faulty_plans = plan_data.filtered(lambda p: any(
+                #     result.test_results in ['返工', '报废'] for result in p.production_id.detection_result_ids
+                # ))
+
+                faulty_plans = request.env['quality.check'].sudo().search([
+                    ('operation_id.name', '=', 'CNC加工'),
+                    ('quality_state', 'in', ['fail'])
+                ])
 
                 # 查找制造订单取消与归档的数量
                 cancel_order_count = production_obj.search_count(
@@ -566,7 +571,8 @@ class Sf_Dashboard_Connect(http.Controller):
         :return:
         """
         res = {'status': 1, 'message': '成功', 'data': {}}
-        plan_obj = request.env['sf.production.plan'].sudo()
+        # plan_obj = request.env['sf.production.plan'].sudo()
+        # plan_obj = request.env['mrp.workorder'].sudo().search([('routing_type', '=', 'CNC加工')])
         line_list = ast.literal_eval(kw['line_list'])
         begin_time_str = kw['begin_time'].strip('"')
         end_time_str = kw['end_time'].strip('"')
@@ -604,7 +610,7 @@ class Sf_Dashboard_Connect(http.Controller):
             return date_list
 
         for line in line_list:
-            date_field_name = 'actual_end_time'  # 替换为你模型中的实际字段名
+            date_field_name = 'date_finished'  # 替换为你模型中的实际字段名
             order_counts = []
 
             if time_unit == 'hour':
@@ -616,11 +622,19 @@ class Sf_Dashboard_Connect(http.Controller):
                 for time_interval in time_intervals:
                     start_time, end_time = time_interval
 
-                    orders = plan_obj.search([
+                    # orders = plan_obj.search([
+                    #     ('production_line_id.name', '=', line),
+                    #     ('state', 'in', ['done']),
+                    #     (date_field_name, '>=', start_time.strftime('%Y-%m-%d %H:%M:%S')),
+                    #     (date_field_name, '<=', end_time.strftime('%Y-%m-%d %H:%M:%S'))  # 包括结束时间
+                    # ])
+
+                    orders = request.env['mrp.workorder'].sudo().search([
+                        ('routing_type', '=', 'CNC加工'),  # 将第一个条件合并进来
                         ('production_line_id.name', '=', line),
-                        ('state', 'in', ['finished']),
+                        ('state', 'in', ['done']),
                         (date_field_name, '>=', start_time.strftime('%Y-%m-%d %H:%M:%S')),
-                        (date_field_name, '<=', end_time.strftime('%Y-%m-%d %H:%M:%S'))  # 包括结束时间
+                        (date_field_name, '<=', end_time.strftime('%Y-%m-%d %H:%M:%S'))
                     ])
 
                     # 使用小时和分钟作为键，确保每个小时的数据有独立的键
@@ -637,18 +651,22 @@ class Sf_Dashboard_Connect(http.Controller):
 
             for date in date_list:
                 next_day = date + timedelta(days=1)
-                orders = plan_obj.search([('production_line_id.name', '=', line), ('state', 'in', ['finished']),
-                                          (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
-                                          (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
-                                          ])
-
-                rework_orders = plan_obj.search(
-                    [('production_line_id.name', '=', line), ('production_id.state', 'in', ['rework']),
+                orders = request.env['mrp.workorder'].sudo().search(
+                    [('production_id.production_line_id.name', '=', line), ('state', 'in', ['done']),
+                     ('routing_type', '=', 'CNC加工'),
                      (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
                      (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
                      ])
-                not_passed_orders = plan_obj.search(
-                    [('production_line_id.name', '=', line), ('production_id.state', 'in', ['scrap', 'cancel']),
+
+                rework_orders = request.env['mrp.workorder'].sudo().search(
+                    [('production_id.production_line_id.name', '=', line), ('state', 'in', ['rework']),
+                     ('routing_type', '=', 'CNC加工'),
+                     (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
+                     (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
+                     ])
+                not_passed_orders = request.env['mrp.workorder'].sudo().search(
+                    [('production_id.production_line_id.name', '=', line), ('state', 'in', ['scrap', 'cancel']),
+                     ('routing_type', '=', 'CNC加工'),
                      (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
                      (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
                      ])
@@ -750,11 +768,14 @@ class Sf_Dashboard_Connect(http.Controller):
 
         for line in line_list:
             # 未完成订单
-            not_done_orders = plan_obj.search(
-                [('production_line_id.name', '=', line), ('state', 'not in', ['finished']),
-                 ('production_id.state', 'not in', ['cancel', 'done']), ('active', '=', True)
+            # not_done_orders = plan_obj.search(
+            #     [('production_line_id.name', '=', line), ('state', 'not in', ['finished']),
+            #      ('production_id.state', 'not in', ['cancel', 'done']), ('active', '=', True)
+            #      ])
+            not_done_orders = request.env['mrp.workorder'].sudo().search(
+                [('production_line_id.name', '=', line), ('state', 'in', ['ready', 'progress']),
+                 ('routing_type', '=', 'CNC加工')
                  ])
-            # print(not_done_orders)
 
             # 完成订单
             # 获取当前时间，并计算24小时前的时间
@@ -806,16 +827,18 @@ class Sf_Dashboard_Connect(http.Controller):
                     'draft': '待排程',
                     'done': '已排程',
                     'processing': '生产中',
-                    'finished': '已完成'
+                    'finished': '已完成',
+                    'ready': '待加工',
+                    'progress': '生产中',
                 }
 
                 line_dict = {
                     'sequence': id_to_sequence[order.id],
-                    'workorder_name': order.name,
+                    'workorder_name': order.production_id.name,
                     'blank_name': blank_name,
                     'material': material,
                     'dimensions': dimensions,
-                    'order_qty': order.product_qty,
+                    'order_qty': 1,
                     'state': state_dict[order.state],
 
                 }
@@ -896,15 +919,17 @@ class Sf_Dashboard_Connect(http.Controller):
 
                 cur.execute(sql2, (item,))
                 result2 = cur.fetchall()
-                # print('result2========', result2)
-                #
+
                 for row in result:
                     res['data'][item] = {'idle_count': row[0]}
                 alarm_count = []
                 for row in result2:
                     alarm_count.append(row[1])
                     if row[0]:
-                        total_alarm_time += abs(float(row[0]))
+                        if float(row[0]) >= 28800:
+                            continue
+                        # total_alarm_time += abs(float(row[0]))
+                        total_alarm_time += float(row[0])
                     else:
                         total_alarm_time += 0.0
                 if len(list(set(alarm_count))) == 1:
@@ -914,6 +939,7 @@ class Sf_Dashboard_Connect(http.Controller):
                         alarm_count_num = 1
                 else:
                     alarm_count_num = len(list(set(alarm_count)))
+
                 res['data'][item]['total_alarm_time'] = total_alarm_time / 3600
                 res['data'][item]['alarm_count_num'] = alarm_count_num
 
@@ -941,7 +967,7 @@ class Sf_Dashboard_Connect(http.Controller):
             # machine_list = ast.literal_eval(kw['machine_list'])
             # for item in machine_list:
             #     machine_data = equipment_obj.search([('code', '=', item)])
-            for log in maintenance_logs_obj.search([]):
+            for log in maintenance_logs_obj.search([], order='id desc', limit=30):
                 res['data'].append({
                     'name': log.name,
                     'alarm_time': log.alarm_time.strftime('%Y-%m-%d %H:%M:%S'),
@@ -1129,8 +1155,9 @@ class Sf_Dashboard_Connect(http.Controller):
                 cur.execute("""
                     SELECT * FROM device_data
                     WHERE device_name = %s
-                    AND time::date = CURRENT_DATE
-                    AND device_state != '离线'
+                    AND time >= CURRENT_DATE          -- 今日 00:00:00
+                    AND time < CURRENT_DATE + 1      -- 明日 00:00:00
+                    AND device_state in ('待机', '警告', '运行中')
                     ORDER BY time ASC
                     LIMIT 1;
                 """, (item,))
@@ -1142,8 +1169,9 @@ class Sf_Dashboard_Connect(http.Controller):
                 cur.execute("""
                     SELECT * FROM device_data
                     WHERE device_name = %s
-                    AND time::date = CURRENT_DATE
-                    AND device_state != '离线'
+                    AND time >= CURRENT_DATE          -- 今日 00:00:00
+                    AND time < CURRENT_DATE + 1      -- 明日 00:00:00
+                    AND device_state in ('待机', '警告', '运行中')
                     ORDER BY time DESC
                     LIMIT 1;
                 """, (item,))
@@ -1163,23 +1191,23 @@ class Sf_Dashboard_Connect(http.Controller):
                 cur.execute("""
                     SELECT * FROM device_data
                     WHERE device_name = %s
-                    AND EXTRACT(YEAR FROM time) = EXTRACT(YEAR FROM CURRENT_DATE)
-                    AND EXTRACT(MONTH FROM time) = EXTRACT(MONTH FROM CURRENT_DATE)
-                    AND device_state != '离线'
+                    AND time >= DATE_TRUNC('MONTH', CURRENT_DATE)
+                    AND time < DATE_TRUNC('MONTH', CURRENT_DATE) + INTERVAL '1 MONTH'
+                    AND device_state in ('待机', '警告', '运行中')
                     ORDER BY time ASC
                     LIMIT 1;
                 """, (item,))
                 first_month = fetch_result_as_dict(cur)
-                # print("当月第一条记录（非离线）:", first_month)
+                # print("当月第一条记录:", first_month)
 
-            # 获取当月最新一条记录（排除device_state等于‘离线’的记录）
+            # 获取当月最新一条记录
             with conn.cursor() as cur:
                 cur.execute("""
                     SELECT * FROM device_data
                     WHERE device_name = %s
-                    AND EXTRACT(YEAR FROM time) = EXTRACT(YEAR FROM CURRENT_DATE)
-                    AND EXTRACT(MONTH FROM time) = EXTRACT(MONTH FROM CURRENT_DATE)
-                    AND device_state != '离线'
+                    AND time >= DATE_TRUNC('MONTH', CURRENT_DATE)
+                    AND time < DATE_TRUNC('MONTH', CURRENT_DATE) + INTERVAL '1 MONTH'
+                    AND device_state in ('待机', '警告', '运行中')
                     ORDER BY time DESC
                     LIMIT 1;
                 """, (item,))
@@ -1200,7 +1228,7 @@ class Sf_Dashboard_Connect(http.Controller):
                 cur.execute("""
                     SELECT * FROM device_data
                     WHERE device_name = %s
-                    AND device_state != '离线'
+                    AND device_state in ('待机', '警告', '运行中')
                     ORDER BY time ASC
                     LIMIT 1;
                 """, (item,))
@@ -1212,7 +1240,7 @@ class Sf_Dashboard_Connect(http.Controller):
                 cur.execute("""
                     SELECT * FROM device_data
                     WHERE device_name = %s
-                    AND device_state != '离线'
+                    AND device_state in ('待机', '警告', '运行中')
                     ORDER BY time DESC
                     LIMIT 1;
                 """, (item,))
@@ -1290,7 +1318,7 @@ class Sf_Dashboard_Connect(http.Controller):
                 cur.execute("""
                             SELECT * FROM device_data
                             WHERE device_name = %s
-                            AND device_state != '离线' AND process_time IS NOT NULL
+                            AND device_state in ('待机', '警告', '运行中') AND process_time IS NOT NULL
                             ORDER BY time DESC
                             LIMIT 1;
                         """, (item,))
@@ -1299,7 +1327,7 @@ class Sf_Dashboard_Connect(http.Controller):
                 cur.execute("""
                             SELECT * FROM device_data
                             WHERE device_name = %s
-                            AND device_state != '离线' AND time >= %s AND process_time IS NOT NULL
+                            AND device_state in ('待机', '警告', '运行中') AND time >= %s AND process_time IS NOT NULL
                             ORDER BY time ASC
                             LIMIT 1;
                         """, (item, time_threshold))
@@ -1329,7 +1357,7 @@ class Sf_Dashboard_Connect(http.Controller):
                 for result in results:
                     alarm_last_24_nums.append(result[1])
                     if result[0]:
-                        if float(result[0]) >= 1000:
+                        if float(result[0]) >= 28800:
                             continue
                         alarm_last_24_time += float(result[0])
                     else:
@@ -1347,7 +1375,7 @@ class Sf_Dashboard_Connect(http.Controller):
                 for result in results:
                     alarm_all_nums.append(result[1])
                     if result[0]:
-                        if float(result[0]) >= 1000:
+                        if float(result[0]) >= 28800:
                             continue
                         alarm_all_time += float(result[0])
                     else:
@@ -1382,3 +1410,207 @@ class Sf_Dashboard_Connect(http.Controller):
         conn.close()
 
         return json.dumps(res)
+
+    @http.route('/api/utilization/rate', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
+    def UtilizationRate(self, **kw):
+        """
+        获取稼动率
+        """
+        logging.info("kw=:%s" % kw)
+        res = {'status': 1, 'message': '成功', 'data': {}}
+        # 获取请求的机床数据
+        machine_list = ast.literal_eval(kw['machine_list'])
+        line = kw['line']
+        orders = request.env['mrp.workorder'].sudo().search([
+            ('routing_type', '=', 'CNC加工'),  # 将第一个条件合并进来
+            ('production_line_id.name', '=', line),
+            ('state', 'in', ['done'])
+        ])
+
+        faulty_plans = request.env['quality.check'].sudo().search([
+            ('operation_id.name', '=', 'CNC加工'),
+            ('quality_state', 'in', ['fail'])
+        ])
+
+        # 计算时间范围
+        now = datetime.now()
+        today_start = now.replace(hour=0, minute=0, second=0, microsecond=0)
+        month_start = now.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
+
+        total_power_on_time = 0
+        month_power_on_time = 0
+        today_power_on_time = 0
+        today_power_on_dict = {}
+
+        today_data = []
+        month_data = []
+        today_check_ng = []
+        month_check_ng = []
+
+        total_alarm_time = 0
+        today_alarm_time = 0
+        month_alarm_time = 0
+
+        for order in orders:
+            time = datetime.strptime(order.date_finished, "%Y-%m-%d %H:%M:%S")
+            if time >= today_start:
+                today_data.append(order)
+            if time >= month_start:
+                month_data.append(order)
+
+        for faulty_plan in faulty_plans:
+            time = faulty_plan.write_date
+            if time >= today_start:
+                today_check_ng.append(faulty_plan)
+            if time >= month_start:
+                month_check_ng.append(faulty_plan)
+
+        # 连接数据库
+        conn = psycopg2.connect(**db_config)
+        for item in machine_list:
+            with conn.cursor() as cur:
+                cur.execute("""
+                (
+                    SELECT power_on_time, 'latest' AS record_type
+                    FROM device_data
+                    WHERE device_name = %s
+                        AND power_on_time IS NOT NULL
+                    ORDER BY time DESC
+                    LIMIT 1
+                )
+                UNION ALL
+                (
+                    SELECT power_on_time, 'month_first' AS record_type
+                    FROM device_data
+                    WHERE device_name = %s
+                        AND power_on_time IS NOT NULL
+                        AND time >= date_trunc('month', CURRENT_DATE)  -- ✅ 修复日期函数
+                        AND time < (date_trunc('month', CURRENT_DATE) + INTERVAL '1 month')::date
+                    ORDER BY time ASC
+                    LIMIT 1
+                )
+                UNION ALL
+                (
+                    SELECT power_on_time, 'day_first' AS record_type
+                    FROM device_data
+                    WHERE device_name = %s
+                        AND power_on_time IS NOT NULL
+                        AND time::date = CURRENT_DATE  -- ✅ 更高效的写法
+                    ORDER BY time ASC
+                    LIMIT 1
+                );
+                        """, (item, item, item))
+                results = cur.fetchall()
+                print(results)
+                if len(results) >= 1:
+                    total_power_on_time += convert_to_seconds(results[0][0])
+                else:
+                    total_power_on_time += 0
+                if len(results) >= 2:
+                    month_power_on_time += convert_to_seconds(results[1][0])
+                else:
+                    month_power_on_time += 0
+                if len(results) >= 3:
+                    today_power_on_time += convert_to_seconds(results[2][0])
+                    today_power_on_dict[item] = today_power_on_time
+                else:
+                    today_power_on_time += 0
+                print(total_power_on_time, month_power_on_time, today_power_on_time)
+
+            with conn.cursor() as cur:
+                cur.execute("""
+                             SELECT DISTINCT ON (alarm_start_time) alarm_time, alarm_start_time
+                    FROM device_data
+                    WHERE device_name = %s AND alarm_start_time IS NOT NULL
+                    ORDER BY alarm_start_time, time;
+                                        """, (item,))
+                results = cur.fetchall()
+                today_data = []
+                month_data = []
+
+                for record in results:
+                    if record[0]:
+                        if float(record[0]) >= 28800:
+                            continue
+                        total_alarm_time += float(record[0])
+                    else:
+                        total_alarm_time += 0.0
+                    alarm_start = datetime.strptime(record[1], "%Y-%m-%d %H:%M:%S")
+                    if alarm_start >= today_start:
+                        today_data.append(record)
+                    if alarm_start >= month_start:
+                        month_data.append(record)
+                for today in today_data:
+                    if today[0]:
+                        if float(today[0]) >= 28800:
+                            continue
+                        today_alarm_time += float(today[0])
+                    else:
+                        today_alarm_time += 0.0
+                for month in month_data:
+                    if month[0]:
+                        if float(month[0]) >= 28800:
+                            continue
+                        month_alarm_time += float(month[0])
+                    else:
+                        month_alarm_time += 0.0
+
+        conn.close()
+
+        print('报警时间=============', total_alarm_time, month_alarm_time, today_alarm_time)
+        logging.info("报警时间=%s" % total_alarm_time)
+        logging.info("报警时间=%s" % month_alarm_time)
+        logging.info("报警时间=%s" % today_alarm_time)
+        # 计算时间开动率（累计、月、日）
+        if total_power_on_time:
+            total_power_on_rate = (total_power_on_time - total_alarm_time) / total_power_on_time
+        else:
+            total_power_on_rate = 0
+        if month_power_on_time:
+            month_power_on_rate = (total_power_on_time - month_power_on_time - month_alarm_time) / month_power_on_time
+        else:
+            month_power_on_rate = 0
+        if today_power_on_time:
+            today_power_on_rate = (total_power_on_time - today_power_on_time - today_alarm_time) / today_power_on_time
+        else:
+            today_power_on_rate = 0
+        print("总开动率: %s" % total_power_on_rate)
+        print("月开动率: %s" % month_power_on_rate)
+        print("日开动率: %s" % today_power_on_rate)
+
+        # 计算性能开动率（累计、月、日）
+        print('===========',orders)
+        print(len(orders))
+        total_performance_rate = len(orders) * 30 * 60 / (total_power_on_time - total_alarm_time)
+        month_performance_rate = len(month_data) * 30 * 60 / (month_power_on_time - month_alarm_time)
+        today_performance_rate = len(today_data) * 30 * 60 / (today_power_on_time - today_alarm_time) if today_power_on_time != 0 else 0
+        print("总性能率: %s" % total_performance_rate)
+        print("月性能率: %s" % month_performance_rate)
+        print("日性能率: %s" % today_performance_rate)
+
+        # 计算累计合格率
+        total_pass_rate = (len(orders) - len(today_check_ng)) / len(orders) if len(orders) != 0 else 0
+        month_pass_rate = (len(month_data) - len(month_check_ng)) / len(month_data) if len(month_data) != 0 else 0
+        today_pass_rate = (len(today_data) - len(today_check_ng)) / len(today_data) if len(today_data) != 0 else 0
+        print("总合格率: %s" % total_pass_rate)
+        print("月合格率: %s" % month_pass_rate)
+        print("日合格率: %s" % today_pass_rate)
+
+        # # 返回数据
+        # res['data'][item] = {
+        #     'total_utilization_rate': total_power_on_rate * total_performance_rate * total_pass_rate,
+        #     'month_utilization_rate': month_power_on_rate * month_performance_rate * month_pass_rate,
+        #     'today_utilization_rate': today_power_on_rate * today_performance_rate * today_pass_rate,
+        # }
+        res['data'] = {
+            'total_utilization_rate': total_power_on_rate * total_performance_rate * total_pass_rate,
+            'month_utilization_rate': month_power_on_rate * month_performance_rate * month_pass_rate,
+            'today_utilization_rate': today_power_on_rate * today_performance_rate * today_pass_rate,
+        }
+
+        return json.dumps(res)
+
+
+
+
+

sf_machine_connect/views/delivery_record.xml

@@ -7,7 +7,7 @@
         <field name="arch" type="xml">
             <xpath expr="//page[last()-3]" position="before">
 <!--                <page string="下发记录" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>-->
-                <page string="下发记录" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
+                <page string="下发记录" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "HDR")]}'>
                     <field name="delivery_records">
                         <tree create="false">
                             <field name="delivery_type"/>

sf_machine_connect/views/machine_info_present.xml

@@ -6,7 +6,7 @@
         <field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/>
         <field name="arch" type="xml">
             <xpath expr="//page[last()-3]" position="before">
-                <page string="机床信息" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
+                <page string="机床信息" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "MTI")]}'>
                     <group string="机床信息">
                         <group>
                             <field name="machine_tool_name"/>

sf_manufacturing/__manifest__.py

@@ -27,6 +27,7 @@
         'wizard/production_technology_re_adjust_wizard_views.xml',
         'wizard/mrp_workorder_batch_replan_wizard_views.xml',
         'wizard/sf_programming_reason_views.xml',
+        'wizard/sale_order_cancel_views.xml',
         'views/mrp_views_menus.xml',
         'views/agv_scheduling_views.xml',
         'views/stock_lot_views.xml',

sf_manufacturing/controllers/main.py

@@ -27,7 +27,8 @@ class JikimoSaleRoutePicking(Sf_Bf_Connect):
             bfm_process_order_list = json.loads(kw['bfm_process_order_list'])
             order_id = request.env['sale.order'].with_user(request.env.ref("base.user_admin")).sale_order_create(
                 company_id, kw['delivery_name'], kw['delivery_telephone'], kw['delivery_address'],
-                kw['delivery_end_date'], kw['payments_way'], kw['pay_way'], kw['order_number'], state='draft')
+                kw['delivery_end_date'], kw['payments_way'], kw['pay_way'], kw['order_number'], state='draft',
+                model_display_version=kw.get('model_display_version'))
             i = 1
             # 给sale_order的default_code字段赋值
             # aa = request.env['sale.order'].sudo().search([('name', '=', order_id.name)])
@@ -45,6 +46,7 @@ class JikimoSaleRoutePicking(Sf_Bf_Connect):
                 order_id.with_user(request.env.ref("base.user_admin")).sale_order_create_line(product, item)
                 i += 1
             res['factory_order_no'] = order_id.name
+            order_id.confirm_to_supply_method()
         except Exception as e:
             traceback_error = traceback.format_exc()
             logging.error('get_bfm_process_order_list error: %s' % traceback_error)

sf_manufacturing/data/sf_work_individuation_page.xml

@@ -4,5 +4,63 @@
             <field name="code">PTD</field>
             <field name="name">后置三元检测</field>
         </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_2">
+            <field name="code">WCP</field>
+            <field name="name">工件装夹</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_3">
+            <field name="code">ITD_PP</field>
+            <field name="name">前置三元检测定位参数</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_4">
+            <field name="code">2D_MD</field>
+            <field name="name">2D加工图纸</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_5">
+            <field name="code">QIS</field>
+            <field name="name">质检标准</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_6">
+            <field name="code">WD</field>
+            <field name="name">工件配送</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_9">
+            <field name="code">CNC_P</field>
+            <field name="name">CNC程序</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_10">
+            <field name="code">CMM_P</field>
+            <field name="name">CMM程序</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_11">
+            <field name="code">MTI</field>
+            <field name="name">机床信息</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_12">
+            <field name="code">HDR</field>
+            <field name="name">下发记录</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_13">
+            <field name="code">ER</field>
+            <field name="name">异常记录</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_14">
+            <field name="code">DCP</field>
+            <field name="name">解除装夹</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_15">
+            <field name="code">CMR</field>
+            <field name="name">开料要求</field>
+        </record>
+
+            <!--   原生页签先不进行配置     -->
+<!--        <record model="sf.work.individuation.page" id="sf_work_individuation_page_7">-->
+<!--            <field name="code">ML</field>-->
+<!--            <field name="name">物料</field>-->
+<!--        </record>-->
+<!--        <record model="sf.work.individuation.page" id="sf_work_individuation_page_8">-->
+<!--            <field name="code">TT</field>-->
+<!--            <field name="name">时间跟踪</field>-->
+<!--        </record>-->
     </data>
 </odoo>

sf_manufacturing/models/agv_scheduling.py

@@ -19,12 +19,10 @@ class AgvScheduling(models.Model):
     _order = 'id desc'
 
     name = fields.Char('任务单号', index=True, copy=False)
-
+    agv_route_id = fields.Many2one('sf.agv.task.route', '任务路线')
     def _get_agv_route_type_selection(self):
         return self.env['sf.agv.task.route'].fields_get(['route_type'])['route_type']['selection']
-
     agv_route_type = fields.Selection(selection=_get_agv_route_type_selection, string='任务类型', required=True)
-    agv_route_id = fields.Many2one('sf.agv.task.route', '任务路线')
     start_site_id = fields.Many2one('sf.agv.site', '起点接驳站', required=True)
     end_site_id = fields.Many2one('sf.agv.site', '终点接驳站', tracking=True)
     site_state = fields.Selection([
@@ -89,11 +87,12 @@ class AgvScheduling(models.Model):
                 agv_route_type: AGV任务类型
                 workorders: 工单
         """
+        scheduling = None
         _logger.info('创建AGV调度任务\r\n起点为【%s】，任务类型为【%s】，工单为【%s】' % (agv_start_site_name, agv_route_type, workorders))
         if not workorders:
             raise UserError(_('工单不能为空'))
-        agv_start_site = self.env['sf.agv.site'].sudo().search([('name', '=', agv_start_site_name)], limit=1)
-        if not agv_start_site:
+        agv_start_sites = self.env['sf.agv.site'].sudo().search([('name', '=', agv_start_site_name)])
+        if not agv_start_sites:
             raise UserError(_('不存在名称为【%s】的接驳站，请先创建！' % agv_start_site_name))
         # 如果存在相同任务类型工单的AGV调度任务，则提示错误
         agv_scheduling = self.sudo().search([
@@ -109,24 +108,32 @@ class AgvScheduling(models.Model):
                 (','.join(repetitive_workorders.mapped('production_id.name')), agv_scheduling.name)
             )
 
+        # 如果只有唯一任务路线，则自动赋予终点接驳站跟任务名称
+        agv_routes = self.env['sf.agv.task.route'].sudo().search([
+            ('route_type', '=', agv_route_type),
+            ('start_site_id', 'in', agv_start_sites.ids)
+        ])
         vals = {
-            'start_site_id': agv_start_site.id,
             'agv_route_type': agv_route_type,
             'workorder_ids': workorders.ids,
             # 'workpiece_delivery_ids': deliveries.mapped('id') if deliveries else [],
             'task_create_time': fields.Datetime.now()
         }
-        # 如果只有唯一任务路线，则自动赋予终点接驳站跟任务名称
-        agv_routes = self.env['sf.agv.task.route'].sudo().search([
-            ('route_type', '=', agv_route_type),
-            ('start_site_id', '=', agv_start_site.id)
-        ])
         if not agv_routes:
             raise UserError(_('不存在起点为【%s】的【%s】任务路线，请先创建！' % (agv_start_site_name, agv_route_type)))
+        # 如果路线中包含起点与终点相同的接驳站，则不创建AGV调度任务
+        if agv_routes.filtered(lambda r: r.start_site_id.name == r.end_site_id.name):
+            return True
+        # 配送类型相同的接驳站为同一个，取第一个即可
+        vals.update({
+            'start_site_id': agv_routes[0].start_site_id.id,
+        })
         idle_route = None
         if len(agv_routes) == 1:
             idle_route = agv_routes[0]
-            vals.update({'end_site_id': idle_route.end_site_id.id, 'agv_route_id': idle_route.id})
+            vals.update({
+                'end_site_id': idle_route.end_site_id.id, 'agv_route_id': idle_route.id
+            })
         else:
             # 判断终点接驳站是否为空闲
             idle_routes = agv_routes.filtered(lambda r: r.end_site_id.state == '空闲')
@@ -134,7 +141,10 @@ class AgvScheduling(models.Model):
                 # 将空闲的路线按照终点接驳站名称排序
                 idle_routes = sorted(idle_routes, key=lambda r: r.end_site_id.name)
                 idle_route = idle_routes[0]
-                vals.update({'end_site_id': idle_route.end_site_id.id, 'agv_route_id': idle_route.id})
+                vals.update({
+                    'end_site_id': idle_route.end_site_id.id, 'agv_route_id': idle_route.id
+                })
+
         try:
             scheduling = self.env['sf.agv.scheduling'].sudo().create(vals)
             # 触发空闲接驳站状态更新，触发新任务下发

sf_manufacturing/models/agv_setting.py

@@ -24,7 +24,7 @@ class AgvSetting(models.Model):
 
     # name必须唯一
     _sql_constraints = [
-        ('name_uniq', 'unique (name)', '站点编号必须唯一!'),
+        ('name_uniq', 'unique (name, workcenter_id)', '同一工作中心的站点编号必须唯一!'),
     ]
 
     # def update_site_state(self):
@@ -68,11 +68,12 @@ class AgvSetting(models.Model):
         """
         if isinstance(agv_site_state_arr, dict):
             for agv_site_name, is_occupy in agv_site_state_arr.items():
-                agv_site = self.env['sf.agv.site'].sudo().search([('name', '=', agv_site_name)])
-                if agv_site:
-                    agv_site.state = is_occupy
+                agv_sites = self.env['sf.agv.site'].sudo().search([('name', '=', agv_site_name)])
+                if agv_sites:
+                    agv_sites.state = is_occupy
                     if notify:
-                        self.env['sf.agv.scheduling'].on_site_state_change(agv_site.id, agv_site.state)
+                        for agv_site in agv_sites:
+                            self.env['sf.agv.scheduling'].on_site_state_change(agv_site.id, agv_site.state)
                 else:
                     _logger.error("更新失败：接驳站站点错误！%s" % agv_site_name)
                     raise UserError("更新失败：接驳站站点错误！")

sf_manufacturing/models/mrp_production.py

@@ -5,6 +5,8 @@ import logging
 import json
 import os
 import re
+import traceback
+
 import requests
 from itertools import groupby
 from collections import defaultdict, namedtuple
@@ -25,6 +27,7 @@ class MrpProduction(models.Model):
     maintenance_count = fields.Integer(compute='_compute_maintenance_count', string="Number of maintenance requests")
     request_ids = fields.One2many('maintenance.request', 'production_id')
     model_file = fields.Binary('模型文件', related='product_id.model_file')
+    glb_url = fields.Char('模型文件', related='product_id.glb_url')
     schedule_state = fields.Selection([('未排', '未排'), ('已排', '已排'), ('已完成', '已完成')],
                                       string='排程状态', default='未排')
     work_order_state = fields.Selection([('未排', '未排'), ('已排', '已排'), ('已完成', '已完成')],
@@ -235,7 +238,7 @@ class MrpProduction(models.Model):
     programming_no = fields.Char('编程单号')
     work_state = fields.Char('业务状态')
     programming_state = fields.Selection(
-        [('编程中', '编程中'), ('已编程', '已编程'), ('已编程未下发', '已编程未下发'), ('已下发', '已下发')],
+        [('编程中', '编程中'), ('已编程', '已编程'), ('已编程未下发', '已编程未下发'), ('已下发', '已下发'), ('已取消', '已取消')],
         string='编程状态',
         tracking=True)
     glb_file = fields.Binary("glb模型文件")
@@ -256,14 +259,63 @@ class MrpProduction(models.Model):
     ], string='工序状态', default='待装夹')
 
     # 零件图号
-    part_number = fields.Char('零件图号', related='product_id.part_number', readonly=True)
+    part_number = fields.Char('零件图号', compute='_compute_part_info', store=True)
 
     # 上传零件图纸
     part_drawing = fields.Binary('零件图纸', related='product_id.machining_drawings', readonly=True)
 
     quality_standard = fields.Binary('质检标准', related='product_id.quality_standard', readonly=True)
 
-    part_name = fields.Char(string='零件名称', related='product_id.part_name', readonly=True)
+    part_name = fields.Char(string='零件名称', compute='_compute_part_info', store=True)
+    @api.depends('product_id')
+    def _compute_part_info(self):
+        try:
+            for production_id in self:
+                if production_id.product_id.categ_id.type == '成品':
+                    production_id.part_number = production_id.product_id.part_number
+                    production_id.part_name = production_id.product_id.part_name
+                elif production_id.product_id.categ_id.type == '坯料':
+                    product_name = ''
+                    match = re.search(r'(S\d{5}-\d)', production_id.product_id.name)
+                    # 如果匹配成功，提取结果
+                    if match:
+                        product_name = match.group(0)
+                    if production_id.sale_order_id:
+                        sale_order = production_id.sale_order_id
+                    else:
+                        sale_order_name = ''
+                        match = re.search(r'(S\d+)', production_id.product_id.name)
+                        if match:
+                            sale_order_name = match.group(0)
+                        sale_order = self.env['sale.order'].sudo().search(
+                            [('name', '=', sale_order_name)])
+                    logging.info("product_name is :%s" % product_name)
+                    filtered_order_line = sale_order.order_line.filtered(
+                        lambda production: re.search(f'{product_name}$', production.product_id.name)
+                    )
+                    if filtered_order_line:
+                        production_id.part_number = filtered_order_line.part_number
+                        production_id.part_name = filtered_order_line.part_name
+        except Exception as e:
+            traceback_error = traceback.format_exc()
+            logging.error("制造订单零件图号 零件名称获取失败:%s" % traceback_error)
+
+    # 判断制造的产品类型
+    production_product_type = fields.Selection([
+        ('成品', '成品'),
+        ('坯料', '坯料'),
+        ('其他', '其他')
+    ], string='产品类型', compute='_compute_production_product_type')
+
+    @api.depends('product_id')
+    def _compute_production_product_type(self):
+        for record in self:
+            if record.product_id.categ_id.name == '成品':
+                record.production_product_type = '成品'
+            elif record.product_id.categ_id.name == '坯料':
+                record.production_product_type = '坯料'
+            else:
+                record.production_product_type = '其他'
 
     @api.depends('product_id.manual_quotation')
     def _compute_manual_quotation(self):
@@ -348,7 +400,7 @@ class MrpProduction(models.Model):
                     and production.schedule_state == '已排' and production.is_rework is False):
                 production.state = 'pending_cam'
             if any((wo.test_results == '返工' and wo.state == 'done' and
-                    (production.programming_state in ['已编程'] or wo.individuation_page_PTD is True))
+                    (production.programming_state in ['已编程'] or(wo.individuation_page_list and 'PTD' in wo.individuation_page_list)))
                    or (wo.is_rework is True and wo.state == 'done' and production.programming_state in ['编程中', '已编程'])
                    for wo in production.workorder_ids) or production.is_rework is True:
                 production.state = 'rework'
@@ -646,6 +698,27 @@ class MrpProduction(models.Model):
             logging.info('update_programming_state error:%s' % e)
             raise UserError("更新编程单状态失败,请联系管理员")
 
+    # 修改编程单状态
+    def _change_programming_state(self):
+        try:
+            res = {"programming_no": self.programming_no, "state": "已取消"}
+            logging.info('res=%s:' % res)
+            configsettings = self.env['res.config.settings'].get_values()
+            config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
+            url = '/api/intelligent_programming/set_state'
+            config_url = configsettings['sf_url'] + url
+            ret = requests.post(config_url, json=res, data=None, headers=config_header)
+            ret = ret.json()
+            result = json.loads(ret['result'])
+            logging.info('change_programming_state-ret:%s' % result)
+            if result['status'] == 1:
+                self.write({'programming_state': '已取消'})
+            else:
+                raise UserError(ret['message'])
+        except Exception as e:
+            logging.info('change_programming_state error:%s' % e)
+            raise UserError("修改编程单状态失败,请联系管理员")
+
     # cnc程序获取
     def fetchCNC(self, production_names):
         cnc = self.env['mrp.production'].search([('id', '=', self.id)])
@@ -675,21 +748,23 @@ class MrpProduction(models.Model):
                     [('id', '=', cnc.product_id.materials_type_id.id)]).materials_no,
                 'machining_processing_panel': cnc.product_id.model_processing_panel,
                 'machining_precision': '',
-                'embryo_long': cnc.product_id.bom_ids.bom_line_ids.product_id.length,
-                'embryo_height': cnc.product_id.bom_ids.bom_line_ids.product_id.height,
-                'embryo_width': cnc.product_id.bom_ids.bom_line_ids.product_id.width,
+                'embryo_long': cnc.product_id.bom_ids[0].bom_line_ids.product_id.length,
+                'embryo_height': cnc.product_id.bom_ids[0].bom_line_ids.product_id.height,
+                'embryo_width': cnc.product_id.bom_ids[0].bom_line_ids.product_id.width,
                 'order_no': cnc.origin,
                 'model_order_no': cnc.product_id.default_code,
                 'user': cnc.env.user.name,
                 'programme_way': programme_way,
-                'model_file': '' if not cnc.product_id.model_file else base64.b64encode(
-                    cnc.product_id.model_file).decode('utf-8'),
+                # 'model_file': '' if not cnc.product_id.model_file else base64.b64encode(
+                #     cnc.product_id.model_file).decode('utf-8'),
+                # 'glb_url': cnc.product_id.glb_url,
                 'part_name': cnc.product_id.part_name,
                 'part_number': cnc.product_id.part_number,
                 'machining_drawings': base64.b64encode(cnc.product_id.machining_drawings).decode(
                     'utf-8') if cnc.product_id.machining_drawings else '',
                 'machining_drawings_name': cnc.product_id.machining_drawings_name,
                 'machining_drawings_mimetype': cnc.product_id.machining_drawings_mimetype,
+                # 'model_id': cnc.product_id.model_id,
             }
             # 打印出除了 model_file 之外的所有键值对
             for key, value in res.items():
@@ -752,11 +827,11 @@ class MrpProduction(models.Model):
         self.ensure_one()
         iot_code = self.env['stock.lot']._get_next_serial(self.company_id, self.product_id) or self.env[
             'ir.sequence'].next_by_code('stock.lot.serial')
-        iot_code_name = re.sub('[\u4e00-\u9fa5]', "", iot_code)
+        # iot_code_name = re.sub('[\u4e00-\u9fa5]', "", iot_code)
         self.lot_producing_id = self.env['stock.lot'].create({
             'product_id': self.product_id.id,
             'company_id': self.company_id.id,
-            'name': iot_code_name,
+            'name': iot_code,
         })
         if self.move_finished_ids.filtered(lambda m: m.product_id == self.product_id).move_line_ids:
             self.move_finished_ids.filtered(
@@ -1259,11 +1334,14 @@ class MrpProduction(models.Model):
             'target': 'new',
             'context': {
                 'default_production_id': self.id,
+                'default_is_clamping': True if self.workorder_ids.filtered(
+                    lambda wk: wk.routing_type == '装夹预调') else False,
                 'default_workorder_ids': workorder_ids.ids if workorder_ids.ids != [] else self.workorder_ids.ids,
                 'default_hidden_workorder_ids': ','.join(map(str, work_id_list)) if work_id_list != [] else '',
                 'default_reprogramming_num': cloud_programming.get('reprogramming_num') if cloud_programming else '',
                 'default_programming_state': cloud_programming.get('programming_state') if cloud_programming else '',
-                'default_is_reprogramming': True if cloud_programming and (cloud_programming.get('programming_state') in ['已下发']) else False
+                'default_is_reprogramming': True if cloud_programming and (
+                            cloud_programming.get('programming_state') in ['已下发']) else False
             }
         }
 
@@ -1297,7 +1375,8 @@ class MrpProduction(models.Model):
                     for rework_item in rework_workorder:
                         pending_workorder = production.workorder_ids.filtered(
                             lambda m1: m1.state in [
-                                'pending'] and m1.processing_panel == rework_item.processing_panel and m1.routing_type in ['CNC加工', '人工线下加工'])
+                                'pending'] and m1.processing_panel == rework_item.processing_panel and m1.routing_type in [
+                                           'CNC加工', '人工线下加工'])
                         if not pending_workorder.cnc_ids:
                             production.get_new_program(rework_item.processing_panel)
                             # production.write({'state': 'progress', 'programming_state': '已编程', 'is_rework': False})
@@ -1340,8 +1419,9 @@ class MrpProduction(models.Model):
                 if productions:
                     for production in productions:
                         panel_workorder = production.workorder_ids.filtered(lambda
-                                                                                pw: pw.processing_panel == processing_panel and pw.routing_type in ['CNC加工', '人工线下加工'] and pw.state not in (
-                            'rework', 'done'))
+                                                                                pw: pw.processing_panel == processing_panel and pw.routing_type in [
+                            'CNC加工', '人工线下加工'] and pw.state not in (
+                                                                                        'rework', 'done'))
                         if panel_workorder:
                             if panel_workorder.cmm_ids:
                                 panel_workorder.cmm_ids.sudo().unlink()
@@ -1366,8 +1446,9 @@ class MrpProduction(models.Model):
                                  'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
                             logging.info('len(cnc_worksheet):%s' % len(panel_workorder.cnc_worksheet))
                             pre_workorder = production.workorder_ids.filtered(lambda
-                                                                                  ap: ap.routing_type in ['装夹预调', '人工线下加工'] and ap.processing_panel == processing_panel and ap.state not in (
-                                'rework', 'done'))
+                                                                                  ap: ap.routing_type in ['装夹预调',
+                                                                                                          '人工线下加工'] and ap.processing_panel == processing_panel and ap.state not in (
+                                                                                          'rework', 'done'))
                             if pre_workorder:
                                 pre_workorder.write(
                                     {'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())})
@@ -1530,7 +1611,7 @@ class MrpProduction(models.Model):
                     vals['picking_type_id'] = picking_type_id
                 vals['name'] = self.env['stock.picking.type'].browse(picking_type_id).sequence_id.next_by_id()
             product_id = self.env['product.product'].browse(vals['product_id'])
-            is_self_process = product_id.materials_type_id and product_id.materials_type_id.gain_way and product_id.materials_type_id.gain_way != '自加工'
+            is_self_process = product_id.materials_type_id.gain_way if product_id.materials_type_id else None
             is_customer_provided = product_id.is_customer_provided
             key = f"{is_self_process}_{is_customer_provided}"
             if not is_custemer_group_id.get(key):
@@ -1704,7 +1785,7 @@ class sf_programming_record(models.Model):
     programming_method = fields.Selection([
         ('auto', '自动'),
         ('manual operation', '人工')], string="编程方式")
-    current_programming_count = fields.Integer('当前编程次数')
+    current_programming_count = fields.Integer('重新编程次数')
     target_production_id = fields.Char('目标制造单号')
     apply_time = fields.Datetime('申请时间')
     send_time = fields.Datetime('下发时间')

sf_manufacturing/models/mrp_workorder.py

@@ -17,10 +17,10 @@ from odoo.exceptions import UserError, ValidationError
 from odoo.addons.sf_mrs_connect.models.ftp_operate import FtpController
 
 
-
 class ResMrpWorkOrder(models.Model):
     _inherit = 'mrp.workorder'
     _order = 'sequence asc'
+    _description = '工单'
 
     product_tmpl_name = fields.Char('坯料产品名称', related='production_bom_id.bom_line_ids.product_id.name')
 
@@ -69,6 +69,68 @@ class ResMrpWorkOrder(models.Model):
 
     delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效',
                                         tracking=True)
+    back_button_display = fields.Boolean(default=False, compute='_compute_back_button_display', store=True)
+
+    @api.depends('state')
+    def _compute_back_button_display(self):
+        for record in self:
+            sorted_workorders = record.production_id.workorder_ids.filtered(lambda w: w.state != 'cancel').sorted(
+                key=lambda w: w.sequence)
+            if not sorted_workorders:
+                continue
+            position = next((idx for idx, workorder in enumerate(sorted_workorders) if workorder.id == record.id), -1)
+            cur_workorder = sorted_workorders[position]
+            if position == len(sorted_workorders) - 1:
+                picking_ids = cur_workorder.production_id.sale_order_id.picking_ids
+                finished_product_area = picking_ids.filtered(
+                    lambda picking: picking.location_dest_id.name == '成品存货区' and picking.state == 'done'
+                )
+                if finished_product_area:
+                    moves = self.env['stock.move'].search([
+                        ('name', '=', cur_workorder.production_id.name),
+                        ('state', '!=', 'cancel')
+                    ])
+                    finish_move = next((move for move in moves if move.location_dest_id.name == '制造后'), None)
+                    if not finish_move and not cur_workorder.is_subcontract and not cur_workorder.routing_type == '解除装夹':
+                        record.back_button_display = True
+                    else:
+                        record.back_button_display = any(
+                            finish_move.move_dest_ids.ids not in move.ids and record.state == 'done'
+                            for picking in finished_product_area
+                            for move in picking.move_ids
+                        )
+                else:
+                    if record.state == 'done':
+                        record.back_button_display = True
+                    else:
+                        record.back_button_display = False
+                # tag_type
+                if cur_workorder.is_subcontract or cur_workorder.routing_type == '解除装夹' or cur_workorder.routing_type == '切割' or any(
+                    detection_result.processing_panel == cur_workorder.processing_panel and
+                    detection_result.routing_type == cur_workorder.routing_type and
+                    cur_workorder.tag_type !='重新加工' and
+                    detection_result.test_results != '合格'
+                    for detection_result in cur_workorder.production_id.detection_result_ids
+                ):
+                    record.back_button_display = False
+            else:
+                next_workorder = sorted_workorders[position + 1]
+                next_state = next_workorder.state
+                if (next_state == 'ready' or (
+                        next_workorder.state == 'waiting' and next_workorder.is_subcontract)) and cur_workorder.state == 'done':
+                    record.back_button_display = True
+                else:
+                    record.back_button_display = False
+                if cur_workorder.is_subcontract or cur_workorder.routing_type == '解除装夹' or cur_workorder.routing_type == '切割' or any(
+                    detection_result.processing_panel == cur_workorder.processing_panel and
+                    detection_result.routing_type == cur_workorder.routing_type and
+                    cur_workorder.tag_type !='重新加工' and
+                    detection_result.test_results != '合格'
+                    for detection_result in cur_workorder.production_id.detection_result_ids
+                ):
+                    record.back_button_display = False
+
+    date_planned_start = fields.Datetime(tracking=True)
 
     @api.depends('processing_panel')
     def _compute_processing_panel_selection(self):
@@ -85,6 +147,82 @@ class ResMrpWorkOrder(models.Model):
 
     manual_quotation = fields.Boolean('人工编程', default=False, compute=_compute_manual_quotation, store=True)
 
+    def button_back(self):
+        if self.production_id.state == 'rework':
+            raise UserError('制造订单为返工时不能进行工单回退')
+        sorted_workorders = self.production_id.workorder_ids.filtered(lambda w: w.state != 'cancel').sorted(
+            key=lambda w: w.sequence)
+        position = next((idx for idx, workorder in enumerate(sorted_workorders) if workorder.id == self.id), -1)
+        cur_workorder = sorted_workorders[position]
+        if position == len(sorted_workorders) - 1:
+            # 末工序
+            picking_ids = cur_workorder.production_id.sale_order_id.picking_ids
+            finished_product_area = picking_ids.filtered(
+                lambda picking: picking.location_dest_id.name == '成品存货区' and picking.state == 'done'
+            )
+            moves = self.env['stock.move'].search([
+                ('name', '=', cur_workorder.production_id.name),
+                ('state', '!=', 'cancel')
+            ])
+            finish_move = next((move for move in moves if move.location_dest_id.name == '制造后'), None) or []
+            if any(
+                    finish_move.move_dest_ids.ids in move.ids
+                    for picking in finished_product_area
+                    for move in picking.move_ids
+            ):
+                raise UserError('已入库，无法回退')
+            else:
+                moves = self.env['stock.move'].search([
+                    ('name', '=', cur_workorder.production_id.name),
+                    ('state', '!=', 'cancel')
+                ])
+                move_lines = self.env['stock.move.line'].search([
+                    ('reference', '=', cur_workorder.production_id.name),
+                    ('state', '!=', 'cancel')
+                ])
+                moves.state = 'assigned'
+                external_assistance = move_lines.filtered(
+                    lambda picking: picking.location_id.name != '外协线边仓'
+                )
+                external_assistance.state = 'assigned'
+                # move_lines.state = 'assigned'
+                self.time_ids.date_end = None
+                cur_workorder.state = 'progress'
+                cur_workorder.production_id.state = 'progress'
+                quality_check = self.env['quality.check'].search(
+                    [('workorder_id', '=', self.id)])
+                for check_order in quality_check:
+                    if check_order.point_id.is_inspect:
+                        check_order.quality_state = 'waiting'
+                    else:
+                        check_order.quality_state = 'none'
+                    # move_dest_ids
+                finished_quants = moves.mapped('move_line_ids.lot_id.quant_ids')
+                finished_quants.quantity = 0
+                finish_move = next((move for move in moves if move.location_dest_id.name == '制造后'), None)
+                finish_move.move_dest_ids.reserved_availability = 0
+                finish_move.move_dest_ids.move_line_ids.state = 'draft'
+                finish_move.move_dest_ids.move_line_ids.unlink()
+                # finish_move.move_dest_ids.move_line_ids.reserved_uom_qty = 0
+        else:
+            next_workorder = sorted_workorders[position + 1]
+            next_state = next_workorder.state
+            if next_state not in ['pending', 'waiting', 'ready']:
+                raise UserError('下工序已经开始，无法回退')
+            if next_workorder.is_subcontract:
+                next_workorder.picking_ids.write({'state': 'waiting'})
+            next_workorder.state = 'pending'
+            self.time_ids.date_end = None
+            cur_workorder.state = 'progress'
+            cur_workorder.production_id.state = 'progress'
+            quality_check = self.env['quality.check'].search(
+                [('workorder_id', '=', self.id)])
+            for check_order in quality_check:
+                if check_order.point_id.is_inspect:
+                    check_order.quality_state = 'waiting'
+                else:
+                    check_order.quality_state = 'none'
+
     def _compute_working_users(self):
         super()._compute_working_users()
         for item in self:
@@ -151,11 +289,12 @@ class ResMrpWorkOrder(models.Model):
     cmm_ids = fields.One2many("sf.cmm.program", 'workorder_id', string="CMM程序")
     tray_code = fields.Char(string="托盘编码")
     glb_file = fields.Binary("glb模型文件", related='production_id.model_file')
+    glb_url = fields.Char("glb模型文件", related='production_id.glb_url')
     is_subcontract = fields.Boolean(string='是否外协')
     surface_technics_parameters_id = fields.Many2one('sf.production.process.parameter', string="表面工艺可选参数")
 
     picking_ids = fields.Many2many('stock.picking', string='外协出入库单',
-                                   compute='_compute_surface_technics_picking_ids')
+                                   compute='_compute_surface_technics_picking_ids', store=True)
 
     purchase_id = fields.Many2many('purchase.order', string='外协采购单')
     surface_technics_picking_count = fields.Integer("外协出入库", compute='_compute_surface_technics_picking_ids')
@@ -455,6 +594,7 @@ class ResMrpWorkOrder(models.Model):
          ("technology", "工艺"), ("customer redrawing", "客户改图")], string="原因", tracking=True)
     detailed_reason = fields.Text('详细原因')
     is_rework = fields.Boolean(string='是否返工', default=False)
+
     # rework_flag = fields.Boolean(string='返工标志', compute='_compute_rework_flag')
     #
     # @api.depends('state', 'production_line_state')
@@ -596,7 +736,8 @@ class ResMrpWorkOrder(models.Model):
         local_filename = self.save_name + '.xls'
         local_file_path = os.path.join(local_dir_path, local_filename)
         logging.info('local_file_path:%s' % local_file_path)
-        remote_path = '/home/ftp/ftp_root/ThreeTest/XT/Before/' + local_filename
+        # remote_path = '/home/ftp/ftp_root/ThreeTest/XT/Before/' + local_filename
+        remote_path = '/ThreeTest/XT/Before/' + local_filename
         logging.info('remote_path:%s' % remote_path)
         is_get_detection_file = self.env['ir.config_parameter'].sudo().get_param('is_get_detection_file')
         if not is_get_detection_file:
@@ -1059,11 +1200,7 @@ class ResMrpWorkOrder(models.Model):
             'cmm_ids': production.workorder_ids.filtered(lambda t: t.routing_type == 'CNC加工').cmm_ids,
         }]
         return workorders_values_str
-
-    @api.depends('production_availability', 'blocked_by_workorder_ids', 'blocked_by_workorder_ids.state',
-                 'production_id.tool_state', 'production_id.schedule_state', 'sequence',
-                 'production_id.programming_state')
-    def _compute_state(self):
+    def _process_compute_state(self):
         for workorder in self:
             # 如果工单的工序没有进行排序则跳出循环
             if workorder.production_id.workorder_ids.filtered(lambda wk: wk.sequence == 0):
@@ -1087,7 +1224,11 @@ class ResMrpWorkOrder(models.Model):
                     and workorder.production_id.schedule_state == '已排'
                     and len(workorder.production_id.picking_ids.filtered(
                         lambda w: w.state not in ['done', 'cancel'])) == 0):
+                    # and workorder.production_id.programming_state == '已编程'
                 if workorder.is_subcontract is True:
+                    if workorder.production_id.state == 'rework':
+                        workorder.state = 'waiting'
+                        continue
                     purchase_orders_id = self._get_surface_technics_purchase_ids()
                     if purchase_orders_id.state == 'purchase':
                         workorder.state = 'ready'
@@ -1102,6 +1243,9 @@ class ResMrpWorkOrder(models.Model):
                     else:
                         workorder.state = 'waiting'
                         continue
+                elif workorder.routing_type == '人工线下加工':
+                    if workorder.production_id.programming_state == '已编程':
+                        workorder.state = 'ready'
                 else:
                     workorder.state = 'ready'
                     continue
@@ -1143,6 +1287,20 @@ class ResMrpWorkOrder(models.Model):
                                                 mo.get_move_line(workorder.production_id, workorder))
                             else:
                                 workorder.state = 'waiting'
+    @api.depends('production_availability', 'blocked_by_workorder_ids', 'blocked_by_workorder_ids.state',
+                 'production_id.tool_state', 'production_id.schedule_state', 'sequence',
+                 'production_id.programming_state')
+    def _compute_state(self):
+        self._process_compute_state()
+        for workorder in self:
+            if workorder.state == 'waiting' or workorder.state == 'pending':
+                for check_id in workorder.check_ids:
+                    if not check_id.is_inspect:
+                        check_id.quality_state = 'waiting'
+            if workorder.state == 'ready':
+                for check_id in workorder.check_ids:
+                    if not check_id.is_inspect:
+                        check_id.quality_state = 'none'
     # 重写工单开始按钮方法
     def button_start(self):
         # 判断工单状态是否为等待组件
@@ -1295,7 +1453,8 @@ class ResMrpWorkOrder(models.Model):
                 record.production_id.process_state = '待加工'
                 # 生成工件配送单
                 record.workpiece_delivery_ids = record._json_workpiece_delivery_list()
-            if record.routing_type == 'CNC加工' or record.individuation_page_PTD is True:
+            if (record.routing_type == 'CNC加工' or
+                    (record.individuation_page_list and 'PTD' in record.individuation_page_list)):
                 if record.routing_type == 'CNC加工':
                     record.process_state = '待解除装夹'
                     # record.write({'process_state': '待加工'})
@@ -1309,7 +1468,8 @@ class ResMrpWorkOrder(models.Model):
                     'detailed_reason': record.detailed_reason,
                     'processing_panel': record.processing_panel,
                     'routing_type': record.routing_type,
-                    'handle_result': '待处理' if record.test_results in ['返工', '报废'] or record.is_rework is True else '',
+                    'handle_result': '待处理' if record.test_results in ['返工',
+                                                                         '报废'] or record.is_rework is True else '',
                     'test_results': record.test_results,
                     'test_report': record.detection_report})],
                                             'is_scrap': True if record.test_results == '报废' else False
@@ -1326,7 +1486,8 @@ class ResMrpWorkOrder(models.Model):
                         raise UserError('请先完成该工单的工艺外协再进行操作')
                 # 表面工艺外协，最后一张工单
                 workorders = self.production_id.workorder_ids
-                subcontract_workorders = workorders.filtered(lambda wo: wo.is_subcontract == True and wo.state != 'cancel').sorted('sequence')
+                subcontract_workorders = workorders.filtered(
+                    lambda wo: wo.is_subcontract == True and wo.state != 'cancel').sorted('sequence')
                 if self == subcontract_workorders[-1]:
                     # 给下一个库存移动就绪
                     self.move_subcontract_workorder_ids[0].move_dest_ids._action_done()
@@ -1360,8 +1521,12 @@ class ResMrpWorkOrder(models.Model):
                 for workorder in record.production_id.workorder_ids:
                     if workorder.processing_panel == record.processing_panel:
                         rfid_code = workorder.rfid_code
-                        workorder.write({'rfid_code_old': rfid_code,
-                                         'rfid_code': False})
+                        if record.is_rework is not True:
+                            workorder.write({'rfid_code_old': rfid_code, 'rfid_code': False})
+                        elif workorder.routing_type != '装夹预调' and workorder.state != 'rework':
+                            workorder.write({'rfid_code_old': False, 'rfid_code': False})
+                        elif workorder.routing_type == '装夹预调' and workorder.state != 'rework':
+                            workorder.write({'rfid_code_old': rfid_code, 'rfid_code': False})
                         self.env['stock.lot'].sudo().search([('rfid', '=', rfid_code)]).write(
                             {'tool_material_status': '可用'})
                         if workorder.rfid_code:
@@ -1369,7 +1534,7 @@ class ResMrpWorkOrder(models.Model):
                         # workorder.rfid_code_old = rfid_code
                         # workorder.rfid_code = False
                         logging.info('workorder.rfid_code:%s' % workorder.rfid_code)
-            # if is_production_id is True and record.routing_type in ['解除装夹', '表面工艺', '切割']:
+            
             if is_production_id is True:
                 logging.info('product_qty:%s' % record.production_id.product_qty)
                 for move_raw_id in record.production_id.move_raw_ids:
@@ -1383,7 +1548,19 @@ class ResMrpWorkOrder(models.Model):
                 #          ('state', '!=', 'done')])
                 #     if raw_move:
                 #         raw_move.write({'state': 'done'})
-                record.production_id.button_mark_done1()
+                if record.production_id.state != 'rework':
+                    # 如果工单包含了外协工序，需要预留数量
+                    if self.move_raw_ids.move_orig_ids.subcontract_workorder_id:
+                        location_id = self.move_raw_ids.location_id
+                        quant = self.move_raw_ids.lot_ids.quant_ids.filtered(lambda q: q.location_id.id == location_id.id)
+                        if quant.reserved_quantity == 0:
+                            self.env['stock.quant']._update_reserved_quantity(
+                                self.move_raw_ids.product_id,
+                                location_id,
+                                quant.quantity,
+                                lot_id=quant.lot_id,
+                            )
+                    record.production_id.button_mark_done1()
                 # record.production_id.state = 'done'
 
             # ============工单完成,修改对应[质检单]的值=====================
@@ -1525,30 +1702,31 @@ class ResMrpWorkOrder(models.Model):
     move_subcontract_workorder_ids = fields.One2many('stock.move', 'subcontract_workorder_id', string='组件')
 
     # ==============================配置化页签--个性化记录===================================
-    routing_workcenter_id = fields.Many2one('mrp.routing.workcenter', compute='_compute_routing_workcenter_id',
-                                            store=True)
-    individuation_page_ids = fields.Many2many('sf.work.individuation.page', string='个性化记录', store=True,
-                                              compute='_compute_individuation_page_ids')
-    individuation_page_PTD = fields.Boolean('个性化记录(是否显示后置三元检测[PTD]页签)', default=False)
+    routing_work_center_id = fields.Many2one('mrp.routing.workcenter', compute='_compute_routing_work_center_id',
+                                             store=True, string='工序作业')
+    individuation_page_ids = fields.Many2many('sf.work.individuation.page', string='个性化记录',
+                                              related='routing_work_center_id.individuation_page_ids')
+    individuation_page_list = fields.Char('个性化记录', default='', compute='_compute_individuation_page_ids', store=True)
 
     @api.depends('name')
-    def _compute_routing_workcenter_id(self):
+    def _compute_routing_work_center_id(self):
         for mw in self:
-            routing_workcenter_id = self.env['mrp.routing.workcenter'].sudo().search(
-                [('name', '=', mw.name), ('routing_type', '=', mw.routing_type)])
-            if routing_workcenter_id:
-                mw.routing_workcenter_id = routing_workcenter_id.id
+            if not mw.routing_work_center_id and mw.name:
+                routing_work_center_id = self.env['mrp.routing.workcenter'].sudo().search(
+                    [('name', 'in', mw.name.split('-')), ('routing_type', '=', mw.routing_type)])
+                if routing_work_center_id:
+                    mw.routing_work_center_id = routing_work_center_id.id
 
-    @api.depends('routing_workcenter_id.individuation_page_ids')
+    @api.depends('individuation_page_ids')
     def _compute_individuation_page_ids(self):
         for mw in self:
-            if mw.routing_workcenter_id:
-                mw.individuation_page_ids = mw.routing_workcenter_id.individuation_page_ids.ids
-                # 初始化页签配置
-                mw.individuation_page_PTD = False
-                # 根据工单对应的【作业_个性化记录】配置页签
-                if any(item.code == 'PTD' for item in mw.routing_workcenter_id.individuation_page_ids):
-                    mw.individuation_page_PTD = True
+            mw.individuation_page_list = '[]'
+            if mw.routing_work_center_id:
+                if mw.individuation_page_ids:
+                    # 根据工单对应的【作业_个性化记录】配置页签
+                    individuation_page_list = [item.code for item in mw.individuation_page_ids]
+                    if individuation_page_list:
+                        mw.individuation_page_list = list(set(individuation_page_list))
     # =============================================================================================
 
     is_inspect = fields.Boolean('需送检', compute='_compute_is_inspect', store=True, default=False)
@@ -1685,7 +1863,7 @@ class CNCprocessing(models.Model):
 
     # 将FTP的多面的程序单文件下载到临时目录
     def download_file_tmp(self, production_no, processing_panel):
-        remotepath = os.path.join('/home/ftp/ftp_root/NC', production_no, 'return', processing_panel)
+        remotepath = os.path.join('/', production_no, 'return', processing_panel)
         serverdir = os.path.join('/tmp', production_no, 'return', processing_panel)
         ftp_resconfig = self.env['res.config.settings'].get_values()
         ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']), ftp_resconfig['ftp_user'],
@@ -1776,7 +1954,8 @@ class SfWorkOrderBarcodes(models.Model):
                             self.write(val)
                             workorder_rfid = self.env['mrp.workorder'].search(
                                 [('production_id', '=', workorder.production_id.id),
-                                 ('processing_panel', '=', workorder.processing_panel)])
+                                 ('processing_panel', '=', workorder.processing_panel),
+                                 ('state', '!=', 'rework')])
                             if workorder_rfid:
                                 for item in workorder_rfid:
                                     item.write({'rfid_code': barcode})
@@ -1861,7 +2040,6 @@ class WorkPieceDelivery(models.Model):
 
     def _get_agv_route_type_selection(self):
         return self.env['sf.agv.task.route'].fields_get(['route_type'])['route_type']['selection']
-
     type = fields.Selection(selection=_get_agv_route_type_selection, string='类型')
     delivery_duration = fields.Float('配送时长', compute='_compute_delivery_duration')
     status = fields.Selection(

sf_manufacturing/models/product_template.py

@@ -4,6 +4,7 @@ import requests
 import base64
 import hashlib
 import os
+import re
 from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError, UserError
 from odoo.modules import get_resource_path
@@ -29,6 +30,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_area = fields.Float('模型表面积(m²)')
     model_machining_precision = fields.Selection(selection=_get_machining_precision, string='加工精度')
     model_processing_panel = fields.Char('模型加工面板')
     model_remark = fields.Char('模型备注说明')
@@ -776,10 +778,40 @@ class ResProductMo(models.Model):
     manual_quotation = fields.Boolean('人工编程', default=False, readonly=True)
     machining_drawings = fields.Binary('2D加工图纸', readonly=True)
     quality_standard = fields.Binary('质检标准', readonly=True)
-    part_name = fields.Char(string='零件名称', readonly=True)
-    part_number = fields.Char(string='零件图号', readonly=True)
+    part_name = fields.Char(string='零件名称', compute='_compute_related_product', readonly=True, store=True)
+    part_number = fields.Char(string='零件图号', compute='_compute_related_product', readonly=True, store=True)
     machining_drawings_name = fields.Char(string='零件图号名称', readonly=True)
     machining_drawings_mimetype = fields.Char(string='零件图号类型', readonly=True)
+
+    model_url = fields.Char('模型文件地址')
+    glb_url = fields.Char('glb文件地址')
+    area = fields.Float('表面积(m²)')
+    auto_machining = fields.Boolean('自动化加工（模型识别）', default=False)
+    model_id = fields.Char('模型id')
+
+
+    @api.depends('name')
+    def _compute_related_product(self):
+        for record in self:
+            if record.categ_id.name == '坯料':
+                product_name = ''
+                match = re.search(r'(S\d{5}-\d)', record.name)
+                # 如果匹配成功，提取结果
+                if match:
+                    product_name = match.group(0)
+                sale_order_name = ''
+                match_sale = re.search(r'S(\d+)', record.name)
+                if match_sale:
+                    sale_order_name = match_sale.group(0)
+                sale_order = self.env['sale.order'].sudo().search(
+                    [('name', '=', sale_order_name)])
+                if sale_order:
+                    filtered_order_line = sale_order.order_line.filtered(
+                        lambda order_line: re.search(f'{product_name}$', order_line.product_id.name)
+                    )
+                    record.part_number = filtered_order_line.product_id.part_number if filtered_order_line else None
+                    record.part_name = filtered_order_line.product_id.part_name if filtered_order_line else None
+
     @api.constrains('tool_length')
     def _check_tool_length_size(self):
         if self.tool_length > 1000000:
@@ -850,7 +882,7 @@ class ResProductMo(models.Model):
         copy_product_id = product_id.with_user(self.env.ref("base.user_admin")).copy()
         copy_product_id.product_tmpl_id.active = True
         model_type = self.env['sf.model.type'].search([], limit=1)
-        attachment = self.attachment_create(item['model_name'], item['model_data'])
+        # attachment = self.attachment_create(item['model_name'], item['model_data'])
         # 获取坯料冗余配置
         if not item.get('embryo_redundancy'):
             embryo_redundancy_id = model_type.embryo_tolerance_id
@@ -873,10 +905,14 @@ class ResProductMo(models.Model):
             'length': item['model_long'],
             'width': item['model_width'],
             'height': item['model_height'],
-            'volume': item['model_long'] * item['model_width'] * item['model_height'],
-            'model_file': '' if not item['model_file'] else base64.b64decode(item['model_file']),
-            'model_name': attachment.name if attachment else None,
-            'upload_model_file': [(6, 0, [attachment.id])] if attachment else None,
+            'volume': item['model_volume'],
+            'area': item['model_area'],
+            # 'model_file': '' if not item['model_file'] else base64.b64decode(item['model_file']),
+            'model_url': item['model_url'],
+            'glb_url': item['glb_url'],
+            'model_name': item['model_name'],
+            'auto_machining': item['auto_machining'],
+            # 'upload_model_file': [(6, 0, [attachment.id])] if attachment else None,
             'list_price': item['price'],
             'materials_id': self.env['sf.production.materials'].search(
                 [('materials_no', '=', item['texture_code'])]).id,
@@ -896,6 +932,7 @@ class ResProductMo(models.Model):
             'part_name': item.get('part_name') or '',
             'machining_drawings_name': item.get('machining_drawings_name') or '',
             'machining_drawings_mimetype': item.get('machining_drawings_mimetype') or '',
+            'model_id': item['model_id'],
         }
         tax_id = self.env['account.tax'].sudo().search(
             [('type_tax_use', '=', 'sale'), ('amount', '=', item.get('tax')), ('price_include', '=', 'True')])
@@ -978,15 +1015,14 @@ class ResProductMo(models.Model):
         vals = {
             'name': '%s-%s-%s [%s %s-%s * %s * %s]' % ('R',
                                                        order_id.name, i, materials_id.name, materials_type_id.name,
-                                                       item['model_long'] + embryo_redundancy_id.long,
-                                                       item['model_width'] + embryo_redundancy_id.width,
-                                                       item['model_height'] + embryo_redundancy_id.height),
-            'length': item['model_long'] + embryo_redundancy_id.long,
-            'width': item['model_width'] + embryo_redundancy_id.width,
-            'height': item['model_height'] + embryo_redundancy_id.height,
-            'volume': (item['model_long'] + embryo_redundancy_id.long) * (
-                    item['model_width'] + embryo_redundancy_id.width) * (
-                              item['model_height'] + embryo_redundancy_id.height),
+                                                       self.format_float(item['model_long'] + embryo_redundancy_id.long),
+                                                       self.format_float(item['model_width'] + embryo_redundancy_id.width),
+                                                       self.format_float(item['model_height'] + embryo_redundancy_id.height)),
+            'length': self.format_float(item['model_long'] + embryo_redundancy_id.long),
+            'width': self.format_float(item['model_width'] + embryo_redundancy_id.width),
+            'height': self.format_float(item['model_height'] + embryo_redundancy_id.height),
+            'volume': self.format_float(item['blank_volume']),
+            'area': self.format_float(item['blank_area']),
             'embryo_model_type_id': model_type.id,
             'list_price': item['price'],
             'materials_id': materials_id.id,
@@ -1079,6 +1115,9 @@ class ResProductMo(models.Model):
             base64_data = base64.b64encode(image_data)
         return base64_data
 
+    # 增加产品表面积
+
+
 
 class ResProductFixture(models.Model):
     _inherit = 'product.template'
@@ -1091,6 +1130,7 @@ class ResProductFixture(models.Model):
     fixture_material_type = fields.Char(string="夹具物料类型", related='fixture_material_id.name')
     multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型")
     model_file = fields.Binary(string="3D模型图")
+    glb_url = fields.Char(string="3D模型图")
 
     # 夹具物料基本参数
     diameter = fields.Float('直径(mm)', digits=(16, 2))

sf_manufacturing/models/purchase_order.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
-
+import re
 from collections import defaultdict
 
 from odoo import api, fields, models, _
@@ -59,18 +59,15 @@ class PurchaseOrder(models.Model):
             production_id = self.env['mrp.production'].search([('origin', 'in', origins)])
             purchase.production_count = len(production_id)
 
-    # def button_confirm(self):
-    #     super().button_confirm()
-    #     workorders = self.env['mrp.workorder'].search([('purchase_id', '=', self.id), ('state', '!=', 'cancel')])
-    #     for workorder in workorders:
-    #         if workorder.routing_type == '表面工艺' and workorder.is_subcontract is True:
-    #             move_out = workorder.move_subcontract_workorder_ids[1]
-    #             for mo in move_out:
-    #                 if mo.state != 'done':
-    #                     mo.write({'state': 'assigned', 'production_id': False})
-    #                     if not mo.move_line_ids:
-    #                         self.env['stock.move.line'].create(mo.get_move_line(workorder.production_id, workorder))
-    #     return True
+    def button_confirm(self):
+        for record in self:
+            for line in record.order_line:
+                if line.product_qty <= 0:
+                    raise UserError('请对【产品】中的【数量】进行输入')
+                if line.price_unit <= 0:
+                    raise UserError('请对【产品】中的【单价】进行输入')
+        return super(PurchaseOrder, self).button_confirm()
+    
 
     origin_sale_id = fields.Many2one('sale.order', string='销售订单号', store=True, compute='_compute_origin_sale_id')
     origin_sale_ids = fields.Many2many('sale.order', string='销售订单号(多个)', store=True,
@@ -109,15 +106,41 @@ class PurchaseOrder(models.Model):
 class PurchaseOrderLine(models.Model):
     _inherit = 'purchase.order.line'
 
-    part_number = fields.Char('零件图号', related='product_id.part_number', readonly=True)
+    part_number = fields.Char('零件图号',  store=True, compute='_compute_part_number')
+    part_name = fields.Char('零件名称',  store=True, compute='_compute_part_number')
     related_product = fields.Many2one('product.product', string='关联产品',
                                       help='经此产品工艺加工成的成品')
+    manual_part_number = fields.Char()
+    manual_part_name = fields.Char()
 
-    # @api.depends('order_id.origin')
-    # def _compute_related_product(self):
-    #     for record in self:
-    #         if record.product_id.detailed_type:
-    #             production_id = self.env['mrp.production'].search([('name', '=', record.order_id.origin)])
-    #             record.related_product = production_id.product_id if production_id else False
-    #         else:
-    #             record.related_product = False
+    @api.depends('product_id')
+    def _compute_part_number(self):
+        for record in self:
+            if record.part_number and record.part_name:
+                continue
+            if record.product_id.categ_id.name == '坯料':
+                product_name = ''
+                match = re.search(r'(S\d{5}-\d)', record.product_id.name)
+                # 如果匹配成功，提取结果
+                if match:
+                    product_name = match.group(0)
+                sale_order_name = ''
+                match_sale = re.search(r'S(\d+)', record.product_id.name)
+                if match_sale:
+                    sale_order_name = match_sale.group(0)
+                sale_order = self.env['sale.order'].sudo().search(
+                    [('name', '=', sale_order_name)])
+                if sale_order:
+                    filtered_order_line = sale_order.order_line.filtered(
+                        lambda order_line: re.search(f'{product_name}$', order_line.product_id.name)
+                    )
+                    record.part_number = filtered_order_line.product_id.part_number
+                    record.part_name = filtered_order_line.product_id.part_name
+            else:
+                record.part_number = record.product_id.part_number
+                record.part_name = record.product_id.part_name
+            if record.manual_part_name:
+                # 如果手动设置了 part_name，使用手动设置的值
+                record.part_name = record.manual_part_name
+            if record.manual_part_number:
+                record.part_number = record.manual_part_number

sf_manufacturing/models/quality_check.py

@@ -3,5 +3,6 @@ from odoo import fields, models, api
 
 class QualityCheck(models.Model):
     _inherit = "quality.check"
+    _description = "质量检查"
 
     is_inspect = fields.Boolean('需送检')

sf_manufacturing/models/quick_easy_order.py

@@ -59,7 +59,7 @@ class QuickEasyOrder(models.Model):
             product_id = self.env.ref('jikimo_sale_multiple_supply_methods.product_template_default').sudo().with_context(active_test=False).product_variant_id
             # user_id = request.env.ref('base.user_admin').sudo()
             order_id = self.env['sale.order'].sale_order_create(company_id, 'XXXXX', 'XXXXX', 'XXXXX',
-                                                                str(datetime.now()), '现结', '支付宝', state='draft')
+                                                                str(datetime.now()), '现结', '支付宝', state='draft', model_display_version='v2')
             order_id.default_code = obj.name
             i = 1
             for item in res['bfm_process_order_list']:

sf_manufacturing/models/sale_order.py

@@ -1,10 +1,13 @@
 import logging
 import json
-from odoo import models, fields, api
+import re
+
+from odoo import models, fields, api, _
 from odoo.exceptions import UserError
 
 _logger = logging.getLogger(__name__)
 
+
 class SaleOrder(models.Model):
     _inherit = 'sale.order'
 
@@ -22,8 +25,13 @@ class SaleOrder(models.Model):
 
     def confirm_to_supply_method(self):
         self.state = 'supply method'
+        for line in self.order_line:
+            if line.product_id.auto_machining:
+                line.supply_method = 'automation'
 
     def action_confirm(self):
+        if self._get_forbidden_state_confirm() & set(self.mapped('state')):
+            raise UserError(_('订单状态已发生变化，请刷新当前页面'))
         # 判断是否所有产品都选择了供货方式
         filter_line = self.order_line.filtered(lambda line: not line.supply_method)
         if filter_line:
@@ -37,12 +45,15 @@ class SaleOrder(models.Model):
                 product_template_id = self.env.ref('sf_dlm.product_template_sf').sudo().product_tmpl_id
             elif line.supply_method == 'outsourcing':
                 bom_type = 'subcontract'
-                product_template_id = self.env.ref('jikimo_sale_multiple_supply_methods.product_template_outsourcing').sudo()
+                product_template_id = self.env.ref(
+                    'jikimo_sale_multiple_supply_methods.product_template_outsourcing').sudo()
             elif line.supply_method == 'purchase':
-                product_template_id = self.env.ref('jikimo_sale_multiple_supply_methods.product_template_purchase').sudo()
+                product_template_id = self.env.ref(
+                    'jikimo_sale_multiple_supply_methods.product_template_purchase').sudo()
             elif line.supply_method == 'manual':
                 bom_type = 'normal'
-                product_template_id = self.env.ref('jikimo_sale_multiple_supply_methods.product_template_manual_processing').sudo()
+                product_template_id = self.env.ref(
+                    'jikimo_sale_multiple_supply_methods.product_template_manual_processing').sudo()
 
             # 复制成品模板上的属性
             line.product_id.product_tmpl_id.copy_template(product_template_id)
@@ -51,30 +62,39 @@ class SaleOrder(models.Model):
 
             order_id = self
             product = line.product_id
-            # 拼接方法需要的item结构
+            # 拼接方法需要的item结构，成品的模型数据信息就是坯料的数据信息
             item = {
                 'texture_code': product.materials_id.materials_no,
                 'texture_type_code': product.materials_type_id.materials_no,
                 'model_long': product.length,
                 'model_width': product.width,
                 'model_height': product.height,
+                'blank_volume': product.model_volume,
+                'blank_area': product.model_area,
                 'price': product.list_price,
                 'embryo_redundancy_id': line.embryo_redundancy_id,
             }
+            product_name = ''
+            match = re.search(r'(S\d{5}-\d)', product.name)
+            # 如果匹配成功，提取结果
+            if match:
+                product_name = match.group(0)
             # 获取成品名结尾-n的n
-            product_seria = int(product.name.split('-')[-1])
+            product_seria = int(product_name.split('-')[-1])
             # 成品供货方式为采购则不生成bom
             if line.supply_method != 'purchase':
                 bom_data = self.env['mrp.bom'].with_user(self.env.ref("base.user_admin")).get_bom(product)
                 _logger.info('bom_data:%s' % bom_data)
                 if bom_data:
-                    bom = self.env['mrp.bom'].with_user(self.env.ref("base.user_admin")).bom_create(product, 'normal', False)
+                    bom = self.env['mrp.bom'].with_user(self.env.ref("base.user_admin")).bom_create(product, 'normal',
+                                                                                                    False)
                     bom.with_user(self.env.ref("base.user_admin")).bom_create_line_has(bom_data)
                 else:
-                     # 当成品上带有客供料选项时，生成坯料时选择“客供料”路线
+                    # 当成品上带有客供料选项时，生成坯料时选择“客供料”路线
                     if line.embryo_redundancy_id:
                         # 将成品模板的内容复制到成品上
-                        customer_provided_embryo = self.env.ref('jikimo_sale_multiple_supply_methods.product_template_embryo_customer_provided').sudo()
+                        customer_provided_embryo = self.env.ref(
+                            'jikimo_sale_multiple_supply_methods.product_template_embryo_customer_provided').sudo()
                         # 创建坯料，客供料的批量不需要创建bom
                         material_customer_provided_embryo = self.env['product.template'].sudo().no_bom_product_create(
                             customer_provided_embryo.with_context(active_test=False).product_variant_id,
@@ -84,7 +104,8 @@ class SaleOrder(models.Model):
                         product_bom_material_customer_provided = self.env['mrp.bom'].with_user(
                             self.env.ref("base.user_admin")).bom_create(
                             product, bom_type, 'product')
-                        product_bom_material_customer_provided.with_user(self.env.ref("base.user_admin")).bom_create_line_has(
+                        product_bom_material_customer_provided.with_user(
+                            self.env.ref("base.user_admin")).bom_create_line_has(
                             material_customer_provided_embryo)
                     elif line.product_id.materials_type_id.gain_way == '自加工':
                         self_machining_id = self.env.ref('sf_dlm.product_embryo_sf_self_machining').sudo()
@@ -113,10 +134,11 @@ class SaleOrder(models.Model):
                         outsource_id = self.env.ref('sf_dlm.product_embryo_sf_outsource').sudo()
                         # 创建坯料
                         outsource_embryo = self.env['product.template'].sudo().no_bom_product_create(outsource_id,
-                                                                                                        item,
-                                                                                                        order_id,
-                                                                                                        'subcontract',
-                                                                                                        product_seria, product)
+                                                                                                     item,
+                                                                                                     order_id,
+                                                                                                     'subcontract',
+                                                                                                     product_seria,
+                                                                                                     product)
                         if outsource_embryo == -3:
                             raise UserError('该订单模型的材料型号暂未设置获取方式和供应商,请先配置再进行分配')
                         # 创建坯料的bom
@@ -136,11 +158,12 @@ class SaleOrder(models.Model):
                     elif line.product_id.materials_type_id.gain_way == '采购':
                         purchase_id = self.env.ref('sf_dlm.product_embryo_sf_purchase').sudo()
                         purchase_embryo = self.env['product.template'].sudo().no_bom_product_create(purchase_id,
-                                                                                                        item,
-                                                                                                        order_id,
-                                                                                                        'purchase', product_seria,
-                                                                                                        product)
-                        if purchase_embryo == -3:
+                                                                                                    item,
+                                                                                                    order_id,
+                                                                                                    'purchase',
+                                                                                                    product_seria,
+                                                                                                    product)
+                        if purchase_embryo and purchase_embryo == -3:
                             raise UserError('该订单模型的材料型号暂未设置获取方式和供应商,请先配置再进行分配')
                         else:
                             # 产品配置bom
@@ -150,6 +173,24 @@ class SaleOrder(models.Model):
                                 purchase_embryo)
         return super(SaleOrder, self).action_confirm()
 
+    def action_show_cancel_wizard(self):
+        wizard = self.env['sf.sale.order.cancel.wizard'].create({
+            'order_id': self.id,
+        })
+
+        # 创建关联单据行
+        self.env['sf.sale.order.cancel.line'].create_from_order(wizard.id, self)
+
+        return {
+            'name': '取消销售订单',
+            'type': 'ir.actions.act_window',
+            'res_model': 'sf.sale.order.cancel.wizard',
+            'view_mode': 'form',
+            'target': 'new',
+            'res_id': wizard.id,
+        }
+
+
 class SaleOrderLine(models.Model):
     _inherit = 'sale.order.line'
     part_number = fields.Char('零件图号', related='product_id.part_number', readonly=True)
@@ -166,4 +207,17 @@ class SaleOrderLine(models.Model):
             for line in self:
                 if vals['supply_method'] == 'automation' and line.manual_quotation:
                     raise UserError('当前（%s）产品为人工编程产品，不能选择自动化产线加工' % ','.join(line.mapped('product_id.name')))
+                if vals['supply_method'] == 'purchase' and line.is_incoming_material:
+                    raise UserError('当前（%s）产品为客供料，不能选择外购' % ','.join(line.mapped('product_id.name')))
         return super(SaleOrderLine, self).write(vals)
+
+    cancel_auto_machining = fields.Boolean('是否取消自动化加工', compute='_compute_cancel_auto_machining', store=True)
+    cancel_auto_machining_reason = fields.Char('更改供货原因')
+
+    @api.depends('product_id', 'supply_method')
+    def _compute_cancel_auto_machining(self):
+        for line in self:
+            line.cancel_auto_machining = True if line.product_id.auto_machining \
+                and line.supply_method != 'automation' else False
+
+

sf_manufacturing/models/stock.py

@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
 import base64
+import random
+import re
+import traceback
+
 import qrcode
 from itertools import groupby
 from collections import defaultdict, namedtuple
@@ -289,7 +293,8 @@ class StockRule(models.Model):
                 if production_item.product_id.id in product_id_to_production_names:
                     # 同一个产品多个制造订单对应一个编程单和模型库
                     # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
-                    if not production_item.programming_no and production_item.production_type in ['自动化产线加工', '人工线下加工']:
+                    if not production_item.programming_no and production_item.production_type in ['自动化产线加工',
+                                                                                                  '人工线下加工']:
                         if not production_programming.programming_no:
                             production_item.fetchCNC(
                                 ', '.join(product_id_to_production_names[production_item.product_id.id]))
@@ -350,9 +355,9 @@ class StockRule(models.Model):
                     )
                     for p in production_process:
                         logging.info('production_process:%s' % p.name)
-                        process_parameter = production_item.product_id.model_process_parameters_ids.filtered(
+                        process_parameters = production_item.product_id.model_process_parameters_ids.filtered(
                             lambda pm: pm.process_id.id == p.id)
-                        if process_parameter:
+                        for process_parameter in process_parameters:
                             i += 1
                             route_production_process = self.env[
                                 'mrp.routing.workcenter'].search(
@@ -449,25 +454,15 @@ class ProductionLot(models.Model):
         """Return the next serial number to be attributed to the product."""
         if product.tracking == "serial":
             last_serial = self.env['stock.lot'].search(
-                [('company_id', '=', company.id), ('product_id', '=', product.id)],
+                [('company_id', '=', company.id), ('product_id', '=', product.id), ('name', 'ilike', product.name)],
                 limit=1, order='name desc')
-            if last_serial:
-                if product.categ_id.name == '刀具':
-                    return self.env['stock.lot'].get_tool_generate_lot_names1(company, product)
-                else:
-                    # 对last_serial的name进行检测，如果不是以产品名称+数字的形式的就重新搜索
-                    if product.name.split('[')[0] not in last_serial.name:
-                        last_serial = self.env['stock.lot'].search(
-                            [('company_id', '=', company.id), ('product_id', '=', product.id),
-                             ('name', 'ilike', product.name.split('[')[0])],
-                            limit=1, order='name desc')
-                        if not last_serial:
-                            return "%s-%03d" % (product.name, 1)
-                    return self.env['stock.lot'].generate_lot_names1(product.name, last_serial.name, 2)[1]
-        now = datetime.now().strftime("%Y%m%d")
-        if product.cutting_tool_model_id:
-            split_codes = product.cutting_tool_model_id.code.split('-')
-            return "%s-T-%s-%s-%03d" % (split_codes[0], now, product.specification_id.name, 1)
+            move_line_id = self.env['stock.move.line'].sudo().search(
+                [('company_id', '=', company.id), ('product_id', '=', product.id), ('lot_name', 'ilike', product.name)],
+                limit=1, order='lot_name desc')
+            if last_serial or move_line_id:
+                return self.env['stock.lot'].generate_lot_names1(product.name, last_serial.name if (
+                        not move_line_id or
+                        (last_serial and last_serial.name > move_line_id.lot_name)) else move_line_id.lot_name, 2)[1]
         return "%s-%03d" % (product.name, 1)
 
     qr_code_image = fields.Binary(string='二维码', compute='_generate_qr_code')
@@ -567,6 +562,18 @@ class StockPicking(models.Model):
     sale_order_id = fields.Many2one('sale.order', '销售单号', compute='_compute_move_ids', store=True)
     picking_type_sequence_code = fields.Char(related='picking_type_id.sequence_code')
 
+    part_numbers = fields.Char(string="零件图号", compute='_compute_part_info', store=True, index=True)
+    part_names = fields.Char(string="零件名称", compute='_compute_part_info', store=True, index=True)
+
+    @api.depends('move_ids_without_package.part_number', 'move_ids_without_package.part_name')
+    def _compute_part_info(self):
+        for picking in self:
+            # 聚合所有关联行的 part_number 和 part_name
+            part_numbers = picking.move_ids_without_package.mapped('part_number')
+            part_names = picking.move_ids_without_package.mapped('part_name')
+            picking.part_numbers = ','.join(filter(None, part_numbers))
+            picking.part_names = ','.join(filter(None, part_names))
+
     @api.depends('move_ids', 'move_ids.product_id')
     def _compute_move_ids(self):
         for item in self:
@@ -594,7 +601,7 @@ class StockPicking(models.Model):
                             item.address_of_delivery = sale_info.address_of_delivery
 
     # 设置外协出入单的名称
-    def _get_name_Res(self, rescode,sequence):
+    def _get_name_Res(self, rescode, sequence):
         last_picking = self.sudo().search([('name', 'ilike', rescode)], order='name desc', limit=1)
         sequence_id = sequence.next_by_id()
         name_without_prefix = last_picking.name.removeprefix(rescode)
@@ -611,6 +618,18 @@ class StockPicking(models.Model):
             return sequence_id
 
     def button_validate(self):
+        # 校验“收料入库单、客供料入库单”是否已经分配序列号，如果没有分配则自动分配
+        if self.picking_type_id.use_existing_lots is False and self.picking_type_id.use_create_lots is True:
+            for move in self.move_ids:
+                if not move.move_line_nosuggest_ids:
+                    move.action_show_details()
+                else:
+                    # 对已经生成的序列号做唯一性校验，如果重复则重新生成新的序列号
+                    line_lot_name = [line_id.lot_name for line_id in move.move_line_nosuggest_ids]
+                    lot_ids = self.env['stock.lot'].sudo().search([('name', 'in', line_lot_name)])
+                    if lot_ids:
+                        move.action_clear_lines_show_details()
+                        move.action_show_details()
         res = super().button_validate()
         picking_type_in = self.env.ref('sf_manufacturing.outcontract_picking_in').id
         if res is True and self.picking_type_id.id == picking_type_in:
@@ -619,13 +638,14 @@ class StockPicking(models.Model):
             if move_in:
                 workorder = move_in.subcontract_workorder_id
                 workorders = workorder.production_id.workorder_ids
-                subcontract_workorders = workorders.filtered(lambda wo: wo.is_subcontract == True and wo.state!='cancel').sorted('sequence')
-                if workorder == subcontract_workorders[-1]:
-                    self.env['stock.quant']._update_reserved_quantity(
-                        move_in.product_id, move_in.location_dest_id, move_in.product_uom_qty,
-                        lot_id=move_in.move_line_ids.lot_id,
-                        package_id=False, owner_id=False, strict=False
-                    )
+                subcontract_workorders = workorders.filtered(
+                    lambda wo: wo.is_subcontract == True and wo.state != 'cancel').sorted('sequence')
+                # if workorder == subcontract_workorders[-1]:
+                #     self.env['stock.quant']._update_reserved_quantity(
+                #         move_in.product_id, move_in.location_dest_id, move_in.product_uom_qty,
+                #         lot_id=move_in.move_line_ids.lot_id,
+                #         package_id=False, owner_id=False, strict=False
+                #     )
                 workorder.button_finish()
         picking_type_out = self.env.ref('sf_manufacturing.outcontract_picking_out').id
         if res and self.picking_type_id.id == picking_type_out:
@@ -641,6 +661,16 @@ class StockPicking(models.Model):
             stock_picking = stock_picking_list.filtered(lambda p: p.state not in ("done", "cancel"))
             if sale_id and not stock_picking:
                 sale_id.write({'state': 'delivered'})
+        if self.location_dest_id.name == '成品存货区' and self.state == 'done':
+            for move in self.move_ids:
+                for production in self.sale_order_id.mrp_production_ids:
+                    moves = self.env['stock.move'].search([
+                        ('name', '=', production.name),
+                        ('state', '!=', 'cancel')
+                    ])
+                    finish_move = next((move for move in moves if move.location_dest_id.name == '制造后'), None)
+                    if finish_move.id in move.move_orig_ids.ids and finish_move.state == 'done':
+                        production.workorder_ids.write({'back_button_display': False})
         return res
 
     # 创建 外协出库入单
@@ -658,7 +688,8 @@ class StockPicking(models.Model):
             # 如果当前工单是是制造订单的最后一个工艺外协工单
             if workorder == next((workorder for workorder in reversed(sorted_workorders) if workorder.is_subcontract),
                                  None):
-                move_dest_id = item.move_raw_ids[0].id
+                if item.move_raw_ids:
+                    move_dest_id = item.move_raw_ids[0].id
             else:
                 # 从sorted_workorders中找到上一工单的move
                 if len(sorted_workorders) > 1:
@@ -679,8 +710,8 @@ class StockPicking(models.Model):
             picking_in = self.create(
                 moves_in._get_new_picking_values_Res(item, workorder, 'WH/OCIN/'))
             # pick_ids.append(picking_in.id)
-            moves_in.write(
-                {'picking_id': picking_in.id, 'state': 'waiting'})
+            moves_in.write({'picking_id': picking_in.id})
+            moves_in._action_confirm()
             moves_in._assign_picking_post_process(new=new_picking)
             # self.env.context.get('default_production_id')
             moves_out = self.env['stock.move'].sudo().with_context(context).create(
@@ -690,10 +721,11 @@ class StockPicking(models.Model):
             picking_out = self.create(
                 moves_out._get_new_picking_values_Res(item, workorder, 'WH/OCOUT/'))
             # pick_ids.append(picking_out.id)
-            moves_out.write(
-                {'picking_id': picking_out.id, 'state': 'waiting'})
+            moves_out.write({'picking_id': picking_out.id})
+            moves_out._action_confirm()
             moves_out._assign_picking_post_process(new=new_picking)
 
+
     @api.depends('move_type', 'immediate_transfer', 'move_ids.state', 'move_ids.picking_id')
     def _compute_state(self):
         super(StockPicking, self)._compute_state()
@@ -709,6 +741,20 @@ class StockPicking(models.Model):
                             'draft', 'sent']:
                             picking.state = 'waiting'
 
+    @api.constrains('state', 'move_ids_without_package')
+    def _check_move_ids_without_package(self):
+        """
+        凡库存调拨单的【作业类型】=“收料入库、客供料入库”，且其产品行的【产品_库存_追溯】="按唯一序列号/按批次”的，当调拨单的【状态】=就绪时
+        自动生成预分配序列号
+        """
+        for sp in self:
+            if (sp.picking_type_id.use_existing_lots is False and sp.picking_type_id.use_create_lots is True
+                    and sp.state == 'assigned'):
+                if sp.move_ids_without_package:
+                    for move_id in sp.move_ids_without_package:
+                        if move_id.product_id.tracking in ['serial', 'lot'] and not move_id.move_line_nosuggest_ids:
+                            move_id.action_show_details()
+
 
 class ReStockMove(models.Model):
     _inherit = 'stock.move'
@@ -721,29 +767,68 @@ class ReStockMove(models.Model):
 
     @api.depends('product_id')
     def _compute_part_info(self):
-        for move in self:
-            if move.product_id.categ_id.type == '成品':
-                move.part_number = move.product_id.part_number
-                move.part_name = move.product_id.part_name
-            elif move.product_id.categ_id.type == '坯料':
-                if move.origin:
-                    origin = move.origin.split(',')[0] if ',' in move.origin else move.origin
-                    mrp_productio_info = self.env['mrp.production'].sudo().search(
-                        [('name', '=', origin)])
-                    if mrp_productio_info:
-                        move.part_number = mrp_productio_info.part_number
-                        move.part_name = mrp_productio_info.part_name
+        try:
+            for move in self:
+                if move.product_id.categ_id.type == '成品':
+                    move.part_number = move.product_id.part_number
+                    move.part_name = move.product_id.part_name
+                elif move.product_id.categ_id.type == '坯料':
+                    product_name = ''
+                    match = re.search(r'(S\d{5}-\d)', move.product_id.name)
+                    # 如果匹配成功，提取结果
+                    if match:
+                        product_name = match.group(0)
+                    if move.picking_id.sale_order_id:
+                        sale_order = move.picking_id.sale_order_id
                     else:
-                        purchase_order_info = self.env['purchase.order'].sudo().search(
-                            [('name', '=', origin)])
-                        if purchase_order_info:
-                            mrp_production_ids = purchase_order_info._get_mrp_productions().ids
-                            if mrp_production_ids:
-                                mrp_productio_info = self.env['mrp.production'].sudo().search(
-                                    [('id', '=', mrp_production_ids[0])])
-                                if mrp_productio_info:
-                                    move.part_number = mrp_productio_info.part_number
-                                    move.part_name = mrp_productio_info.part_name
+                        sale_order_name = ''
+                        match = re.search(r'(S\d+)', move.product_id.name)
+                        if match:
+                            sale_order_name = match.group(0)
+                        sale_order = self.env['sale.order'].sudo().search(
+                            [('name', '=', sale_order_name)])
+                    filtered_order_line = sale_order.order_line.filtered(
+                        lambda production: re.search(f'{product_name}$', production.product_id.name)
+                    )
+
+                    if filtered_order_line:
+                        move.part_number = filtered_order_line.part_number
+                        move.part_name = filtered_order_line.part_name
+                elif move.product_id.categ_id.type == '原材料':
+                    production_id = move.production_id or move.raw_material_production_id
+                    if not production_id:
+                        if not move.origin:
+                            continue
+                        logging.info('制造订单的调拨单 %s', move.origin)
+                        production_id = self.env['mrp.production'].sudo().search(
+                            [('name', '=', move.origin.split(',')[0] if move.origin else '')], limit=1)
+                        if not production_id:
+                            continue
+                    product_name = ''
+                    logging.info('制造订单的产品 %s', production_id.product_id.name)
+                    match = re.search(r'(S\d{5}-\d)', production_id.product_id.name)
+                    # 如果匹配成功，提取结果
+                    if match:
+                        product_name = match.group(0)
+                    if move.picking_id.sale_order_id:
+                        sale_order = move.picking_id.sale_order_id
+                    else:
+                        sale_order_name = ''
+                        match = re.search(r'(S\d+)', production_id.product_id.name)
+                        if match:
+                            sale_order_name = match.group(0)
+                        sale_order = self.env['sale.order'].sudo().search(
+                            [('name', '=', sale_order_name)])
+                    filtered_order_line = sale_order.order_line.filtered(
+                        lambda production: re.search(f'{product_name}$', production.product_id.name)
+                    )
+
+                    if filtered_order_line:
+                        move.part_number = filtered_order_line.part_number
+                        move.part_name = filtered_order_line.part_name
+        except Exception as e:
+            traceback_error = traceback.format_exc()
+            logging.error("零件图号 零件名称获取失败:%s" % traceback_error)
 
     def _get_stock_move_values_Res(self, item, picking_type_id, group_id, move_dest_ids=False):
         route_id = self.env.ref('sf_manufacturing.route_surface_technology_outsourcing').id
@@ -764,6 +849,7 @@ class ReStockMove(models.Model):
             # 'route_ids': False if not route else [(4, route.id)],
             'date_deadline': datetime.now(),
             'picking_type_id': picking_type_id,
+            # 'is_subcontract': True,
         }
         return move_values
 
@@ -777,7 +863,7 @@ class ReStockMove(models.Model):
             picking_type_id = self.env.ref('sf_manufacturing.outcontract_picking_in').id
             sequence = self.env.ref('sf_manufacturing.sequence_stock_picking_in')
         return {
-            'name': self.env['stock.picking']._get_name_Res(rescode,sequence),
+            'name': self.env['stock.picking']._get_name_Res(rescode, sequence),
             'origin': item.name,
             'surface_technics_parameters_id': sorted_workorders.surface_technics_parameters_id.id,
             'company_id': self.mapped('company_id').id,
@@ -844,10 +930,12 @@ class ReStockMove(models.Model):
                     self.next_serial = self._get_tool_next_serial(self.company_id, self.product_id, self.origin)
                 else:
                     self.next_serial = self.env['stock.lot']._get_next_serial(self.company_id, self.product_id)
-                    if self.picking_type_id.sequence_code == 'DL' and not self.move_line_nosuggest_ids:
-                        self.action_assign_serial_show_details()
+                if (self.picking_type_id.use_existing_lots is False
+                        and self.picking_type_id.use_create_lots is True and not self.move_line_nosuggest_ids):
+                    self.action_assign_serial_show_details()
             elif self.product_id.tracking == "lot":
-                self._put_tool_lot(self.company_id, self.product_id, self.origin)
+                if self.product_id.categ_id.name == '刀具':
+                    self._put_tool_lot(self.company_id, self.product_id, self.origin)
 
         return {
             'name': _('Detailed Operations'),
@@ -872,37 +960,22 @@ class ReStockMove(models.Model):
             ),
         }
 
-    def put_move_line(self):
-        """
-        确认订单时,自动分配序列号
-        """
-        if self.product_id.tracking == "serial":
-            if self.product_id.categ_id.name == '刀具':
-                self.next_serial = self._get_tool_next_serial(self.company_id, self.product_id, self.origin)
-            else:
-                self.next_serial = self.env['stock.lot']._get_next_serial(self.company_id, self.product_id)
-            self._generate_serial_numbers()
-            for item in self.move_line_nosuggest_ids:
-                if item.lot_name:
-                    lot_name = item.lot_name
-                    if item.product_id.categ_id.name == '坯料':
-                        lot_name = lot_name.split('[', 1)[0]
-                    item.lot_qr_code = self.compute_lot_qr_code(lot_name)
-
     def _put_tool_lot(self, company, product, origin):
         if product.tracking == "lot" and self.product_id.categ_id.name == '刀具':
             if not self.move_line_nosuggest_ids:
                 lot_code = '%s-%s-%s' % ('%s-T-DJWL-%s' % (
                     product.cutting_tool_model_id.code.split('-')[0], product.cutting_tool_material_id.code),
                                          datetime.now().strftime("%Y%m%d"), origin)
-                move_line_ids = self.env['stock.move.line'].sudo().search([('lot_name', 'like', lot_code)], limit=1,
-                                                                          order='id desc')
+                move_line_ids = self.env['stock.move.line'].sudo().search(
+                    [('company_id', '=', company.id), ('lot_name', 'like', lot_code)], limit=1, order='id desc')
                 if not move_line_ids:
                     lot_code = '%s-001' % lot_code
                 else:
                     lot_code = '%s-%03d' % (lot_code, int(move_line_ids.lot_name[-3:]) + 1)
                 lot_names = self.env['stock.lot'].generate_lot_names(lot_code, 1)
                 move_lines_commands = self._generate_serial_move_line_commands_tool_lot(lot_names)
+                for move_lines_command in move_lines_commands:
+                    move_lines_command[2]['qty_done'] = self.product_uom_qty
                 self.write({'move_line_nosuggest_ids': move_lines_commands})
                 for item in self.move_line_nosuggest_ids:
                     if item.lot_name:
@@ -930,10 +1003,16 @@ class ReStockMove(models.Model):
             last_serial = self.env['stock.lot'].search(
                 [('company_id', '=', company.id), ('product_id', '=', product.id), ('name', 'ilike', origin)],
                 limit=1, order='id DESC')
+            move_line_id = self.env['stock.move.line'].sudo().search(
+                [('company_id', '=', company.id), ('product_id', '=', product.id), ('lot_name', 'ilike', origin)],
+                limit=1, order='lot_name desc')
             split_codes = product.cutting_tool_model_id.code.split('-')
-            if last_serial:
+            if last_serial or move_line_id:
                 return "%s-T-%s-%s-%03d" % (
-                    split_codes[0], origin, product.specification_id.name, int(last_serial.name[-3:]) + 1)
+                    split_codes[0], origin, product.specification_id.name,
+                    int(last_serial.name[-3:] if (not move_line_id or
+                                                  (last_serial and last_serial.name > move_line_id.lot_name))
+                        else move_line_id.lot_name[-3:]) + 1)
             else:
                 return "%s-T-%s-%s-%03d" % (split_codes[0], origin, product.specification_id.name, 1)
 
@@ -1008,6 +1087,9 @@ class ReStockMove(models.Model):
             productions = self.env['mrp.production'].search(
                 [('origin', '=', production.origin), ('product_id', '=', production.product_id.id)])
             res['origin'] = ','.join(productions.mapped('name'))
+            if self.picking_type_id.name == '客供料入库':
+                self.picking_id.sudo().write(
+                    {'origin': res['origin'] if res.get('origin') else self[0].picking_id.origin})
         return res
 
     def _get_new_picking_values(self):
@@ -1029,6 +1111,22 @@ class ReStockMove(models.Model):
     subcontract_workorder_id = fields.Many2one('mrp.workorder', '外协工单组件', check_company=True,
                                                index='btree_not_null')
 
+    def button_update_the_sequence_number(self):
+        """
+        更新序列号 功能按钮
+        """
+        self.move_line_nosuggest_ids.unlink()
+        if self.state != 'assigned':
+            self.state = 'assigned'
+        return self.action_show_details()
+    
+    def _prepare_move_line_vals(self, quantity=None, reserved_quant=None):
+        res = super(ReStockMove, self)._prepare_move_line_vals(quantity, reserved_quant)
+        if self.subcontract_workorder_id:
+            if self.subcontract_workorder_id.production_id.move_raw_ids.move_line_ids:
+                res['lot_id'] = self.subcontract_workorder_id.production_id.move_raw_ids.move_line_ids[0].lot_id.id
+        return res
+
 
 class ReStockQuant(models.Model):
     _inherit = 'stock.quant'

sf_manufacturing/security/ir.model.access.csv

@@ -192,3 +192,5 @@ access_sf_programming_reason,sf_programming_reason,model_sf_programming_reason,b
 access_sf_programming_record,sf_programming_record,model_sf_programming_record,base.group_user,1,1,1,0
 access_sf_work_individuation_page,sf_work_individuation_page,model_sf_work_individuation_page,sf_base.group_sf_mrp_user,1,1,1,0
 access_sf_work_individuation_page_group_plan_dispatch,sf_work_individuation_page_group_plan_dispatch,model_sf_work_individuation_page,sf_base.group_plan_dispatch,1,1,0,0
+access_sf_sale_order_cancel_wizard,sf_sale_order_cancel_wizard,model_sf_sale_order_cancel_wizard,sf_base.group_sf_order_user,1,1,1,0
+access_sf_sale_order_cancel_line,sf_sale_order_cancel_line,model_sf_sale_order_cancel_line,sf_base.group_sf_order_user,1,0,1,1

sf_manufacturing/views/agv_setting_views.xml

@@ -15,6 +15,23 @@
             </field>
         </record>
 
+        <record id="view_agv_site_form" model="ir.ui.view">
+            <field name="name">agv.site.form</field>
+            <field name="model">sf.agv.site</field>
+            <field name="arch" type="xml">
+                <form create="false" edit="false">
+                    <sheet>
+                        <group>
+                            <field name="name" readonly="1" required="1"/>
+                            <field name="workcenter_id" readonly="1" required="1" options="{'no_create': True}"/>
+                            <field name="state" readonly="1" required="1"/>
+                            <field name="divide_the_work" readonly="1" required="1"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
         <record id="action_agv_site_form" model="ir.actions.act_window">
             <field name="name">AGV站点</field>
             <field name="res_model">sf.agv.site</field>
@@ -39,7 +56,8 @@
                     <field name="route_type" string="类型" required="1" attrs="{'readonly': [('id', '!=', False)]}"/>
                     <field name="start_site_id" required="1" options="{'no_create': True}" string="起点接驳站"
                            attrs="{'readonly': [('id', '!=', False)]}"/>
-                    <field name="end_site_id" required="1" options="{'no_create': True}" string="终点接驳站"/>
+                    <field name="end_site_id" required="1" options="{'no_create': True}" string="终点接驳站"
+                           attrs="{'readonly': [('id', '!=', False)]}"/>
 <!--                    <field name="destination_production_line_id" required="1" options="{'no_create': True}"-->
 <!--                           attrs="{'readonly': [('id', '!=', False)]}"/>-->
                     <field name="workcenter_id"/>