处理销售单不能创建的问题

jikimo_account_process/__manifest__.py

@@ -3,8 +3,8 @@
     'name': "jikimo_account_process",
 
     '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

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

@@ -1,99 +1,41 @@
-
-.processing-capabilities-grid {
-    display: grid;
-    grid-template-columns: repeat(6, 1fr);
-    gap: 10px;
-    width: 100%;
+.zoomed {
+  position: fixed !important;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%) scale(10);
 }
 
-.grid-item {
-    display: flex;
-    align-items: center;
+.many2many_flex {
+  display: flex;
 }
 
-.item-content {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    text-align: center;
-}
-/*控制图片大小*/
-.item-icon {
-    width: 50px;
-    height: 50px;
-    margin-bottom: 5px;
+.many2many_flex>div {
+  margin-right: 15px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
 }
 
-.item-label {
-    font-size: 12px;
-    word-break: break-word;
+.many2many_flex>div>:nth-child(2) {
+  position: relative;
 }
 
-@media (max-width: 1200px) {
-    .processing-capabilities-grid {
-        grid-template-columns: repeat(4, 1fr);
-    }
+.close {
+  width: 20px;
+  height: 20px;
+  position: absolute;
+  top: -8.8px;
+  right: -8.8px;
+  color: #fff;
+  background-color: #000;
+  opacity: 0;
+  text-align: center;
+  line-height: 20px;
+  font-size: 18px;
 }
 
-@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;
+.img_close {
+  opacity: 1;
+  transform: scale(0.1);
+  cursor: pointer;
 }

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

@@ -4,57 +4,35 @@ import {Many2ManyCheckboxesField} from "@web/views/fields/many2many_checkboxes/m
 import {registry} from "@web/core/registry";
 
 export class MyCustomWidget extends Many2ManyCheckboxesField {
+    // 你可以重写或者添加一些方法和属性
+    // 例如，你可以重写setup方法来添加一些事件监听器或者初始化一些变量
     setup() {
-        super.setup();
+        super.setup(); // 调用父类的setup方法
+        // 你自己的代码
     }
 
-    onImageClick(event, src) {
-        event.preventDefault();
-        event.stopPropagation();
+    onImageClick(event) {
+        // 放大图片逻辑
+        // 获取图片元素
+        const img = event.target;
+        const close = img.nextSibling;
 
-        // 创建预览框
-        const previewContainer = document.createElement('div');
-        previewContainer.className = 'image-preview-container';
+        // 实现放大图片逻辑
+        // 比如使用 CSS 放大
+        img.parentElement.classList.add('zoomed');
+        close.classList.add('img_close');
+    }
 
-        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);
+    onCloseClick(event) {
+        const close = event.target;
+        const img = close.previousSibling;
+        img.parentElement.classList.remove('zoomed');
+        close.classList.remove('img_close');
     }
 }
 
 MyCustomWidget.template = "jikimo_frontend.MyCustomWidget";
+// MyCustomWidget.supportedTypes = ['many2many'];
 
 registry.category("fields").add("custom_many2many_checkboxes", MyCustomWidget);
+

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

@@ -2,20 +2,25 @@
 <templates xml:space="preserve">
 
     <t t-name="jikimo_frontend.MyCustomWidget" owl="1">
-        <div aria-atomic="true" class="many2many_flex processing-capabilities-grid">
+        <div aria-atomic="true" class="many2many_flex">
             <t t-foreach="items" t-as="item" t-key="item[0]">
-                <div class="grid-item">
+                <div>
                     <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>
+                        <t t-esc="item[1]"/>
+
                     </CheckBox>
+                    <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>

jikimo_frontend/static/src/scss/custom_style.scss

@@ -108,10 +108,6 @@ td.o_required_modifier {
 }
 
 .color_3 {
-  background-color: #808080;
-}
-
-.color_4 {
   background-color: rgb(255, 150, 0);
 }
 

jikimo_sale_multiple_supply_methods/__init__.py

@@ -1,143 +0,0 @@
-# -*- coding: utf-8 -*-
-from . import models
-from . import controllers
-
-from odoo import api, SUPERUSER_ID
-
-def _data_install(cr, registry):
-    env = api.Environment(cr, SUPERUSER_ID, {})
-    # 获取所有需要设置的产品模板
-    env.ref('jikimo_sale_multiple_supply_methods.product_template_purchase').product_variant_id.write({'active': False, 'is_bfm': True})
-    env.ref('jikimo_sale_multiple_supply_methods.product_template_manual_processing').product_variant_id.write({'active': False, 'single_manufacturing': True, 'is_bfm': True})
-    env.ref('jikimo_sale_multiple_supply_methods.product_template_default').product_variant_id.write({'active': False, 'is_bfm': True})
-    env.ref('jikimo_sale_multiple_supply_methods.product_template_embryo_customer_provided').product_variant_id.write({'active': False})
-    env.ref('jikimo_sale_multiple_supply_methods.product_template_outsourcing').product_variant_id.write({'active': False, 'is_bfm': True})
-    env.ref('sf_dlm.product_embryo_sf_self_machining').product_tmpl_id.write({'categ_type': '坯料'})
-    env.ref('sf_dlm.product_template_sf').product_tmpl_id.write({'categ_type': '成品'})
-    env.ref('sf_dlm.product_embryo_sf_outsource').product_tmpl_id.write({'categ_type': '坯料'})
-    env.ref('sf_dlm.product_embryo_sf_purchase').product_tmpl_id.write({'categ_type': '坯料'})
-    
-    # 为三步制造增加规则
-    warehouse = env['stock.warehouse'].search([('company_id', '=', env.company.id)], limit=1)
-    product_route_id = warehouse.pbm_route_id
-    # 创建规则：原料存货区 -> 制造前， 坯料存货区 -> 制造前， 制造后 -> 坯料存货区， 制造后 -> 成品存货区
-    raw_material_location_id = env['stock.location'].search([('name', '=', '坯料存货区')], limit=1)
-    picking_type_production = warehouse.pbm_type_id
-    picking_type_stock = warehouse.sam_type_id
-    material_location_id = env['stock.location'].search([('name', '=', '原料存货区')], limit=1)
-    # 为mto增加规则
-    mto_route_id = env.ref('stock.route_warehouse0_mto')
-    # 创建规则：原料存货区 -> 外包位置， 坯料存货区 -> 外包位置
-    subcontracting_location_id = env.company.subcontracting_location_id
-    picking_type_subcontracting = warehouse.subcontracting_resupply_type_id
-    # 为补给外包商增加规则
-    resupply_route_id = warehouse.subcontracting_route_id
-    
-    rules_data = [
-        {
-            'name': 'WH: 原料存货区 → 制造前',
-            'location_src_id': material_location_id.id,
-            'location_dest_id': warehouse.pbm_loc_id.id,
-            'route_id': product_route_id.id,
-            'picking_type_id': picking_type_production.id,
-            'action': 'pull',
-            'sequence': 20,
-            'warehouse_id': warehouse.id,
-            'procure_method': 'mts_else_mto',
-        },
-        {
-            'name': 'WH: 坯料存货区 → 制造前',
-            'location_src_id': raw_material_location_id.id,
-            'location_dest_id': warehouse.pbm_loc_id.id,
-            'route_id': product_route_id.id,
-            'picking_type_id': picking_type_production.id,
-            'action': 'pull',
-            'sequence': 21,
-            'warehouse_id': warehouse.id,
-            'procure_method': 'mts_else_mto',
-        },
-        {
-            'name': 'WH: 制造后 → 坯料存货区',
-            'location_src_id': warehouse.sam_loc_id.id,
-            'location_dest_id': raw_material_location_id.id,
-            'route_id': product_route_id.id,
-            'picking_type_id': picking_type_stock.id,
-            'action': 'push',
-            'sequence': 23,
-        },
-        {
-            'name': 'WH: 制造后 → 成品存货区',
-            'location_src_id': warehouse.sam_loc_id.id,
-            'location_dest_id': env['stock.location'].search([('name', '=', '成品存货区')], limit=1).id,
-            'route_id': product_route_id.id,
-            'picking_type_id': picking_type_stock.id,
-            'action': 'push',
-            'sequence': 24,
-        },
-        {
-            'name': 'WH: 原料存货区 → 外包位置 (MTO)',
-            'location_src_id': material_location_id.id,
-            'location_dest_id': subcontracting_location_id.id,
-            'route_id': mto_route_id.id,
-            'picking_type_id': picking_type_subcontracting.id,
-            'action': 'pull',
-            'sequence': 24,
-            'warehouse_id': warehouse.id,
-            'procure_method': 'mts_else_mto',
-        },
-        {
-            'name': 'WH: 坯料存货区 → 外包位置 (MTO)',
-            'location_src_id': raw_material_location_id.id,
-            'location_dest_id': subcontracting_location_id.id,
-            'route_id': mto_route_id.id,
-            'picking_type_id': picking_type_subcontracting.id,
-            'action': 'pull',
-            'sequence': 25,
-            'warehouse_id': warehouse.id,
-            'procure_method': 'mts_else_mto',
-        },
-        {
-            'name': 'WH: 坯料存货区 → 外包位置',
-            'location_src_id': raw_material_location_id.id,
-            'location_dest_id': subcontracting_location_id.id,
-            'route_id': resupply_route_id.id,
-            'picking_type_id': picking_type_subcontracting.id,
-            'action': 'pull',
-            'sequence': 26,
-            'warehouse_id': warehouse.id,
-            'procure_method': 'make_to_stock',
-        }
-    ]
-    # 遍历每个规则数据，执行创建或更新操作
-    for rule_data in rules_data:
-        _create_or_update_stock_rule(env, rule_data)
-
-def _create_or_update_stock_rule(env, rule_data):
-    # 尝试查找现有的 stock.rule
-    existing_rule = env['stock.rule'].search([
-        ('name', '=', rule_data['name']),
-        ('route_id', '=', rule_data.get('route_id'))
-    ], limit=1)
-
-    if existing_rule:
-        # 如果存在，更新现有记录
-        existing_rule.write(rule_data)
-    else:
-        # 如果不存在，创建新记录
-        env['stock.rule'].create(rule_data)
-
-def _data_uninstall(cr, registry):
-    env = api.Environment(cr, SUPERUSER_ID, {})
-    warehouse = env['stock.warehouse'].search([('company_id', '=', env.company.id)], limit=1)
-    product_route_id = warehouse.pbm_route_id
-    resupply_route_id = warehouse.subcontracting_route_id
-    mto_route_id = env.ref('stock.route_warehouse0_mto')
-    # Fail unlink means that the route is used somewhere (e.g. route_id on stock.rule). In this case
-    # we don't try to do anything.
-    try:
-        with env.cr.savepoint():
-            env['stock.rule'].search([('name', 'in', ('WH: 原料存货区 → 制造前', 'WH: 坯料存货区 → 制造前', 'WH: 制造后 → 坯料存货区', 'WH: 制造后 → 成品存货区')), ('route_id', '=', product_route_id.id)]).unlink()
-            env['stock.rule'].search([('name', 'in', ('WH: 原料存货区 → 外包位置 (MTO)', 'WH: 坯料存货区 → 外包位置 (MTO)')), ('route_id', '=', mto_route_id.id)]).unlink()
-            env['stock.rule'].search([('name', '=', 'WH: 坯料存货区 → 外包位置'), ('route_id', '=', resupply_route_id.id)]).unlink()
-    except:
-        pass

jikimo_sale_multiple_supply_methods/__manifest__.py

@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-{
-    'name': '机企猫 多供货方式',
-    'version': '16.0.1.0.0',
-    'summary': """ 报价单提供（自动化产线加工/人工线下加工/外购/委外加工）多种供货方式选择 """,
-    'author': 'fox',
-    'website': '',
-    'category': '',
-    'depends': ['sf_dlm', 'sale_stock', 'sf_sale'],
-    "data": [
-        'security/ir.model.access.csv',
-        'data/stock_routes.xml',
-        'data/product_data.xml',
-        'views/sale_order_views.xml',
-        # 'views/product_product_views.xml',
-    ],'assets': {
-            #   'web.assets_backend': [
-            #       'jikimo_sale_multiple_supply_methods/static/src/**/*'
-            #   ],
-          },
-    'post_init_hook': '_data_install',
-    'uninstall_hook': '_data_uninstall',
-    'application': True,
-    'installable': True,
-    'auto_install': False,
-    'license': 'LGPL-3',
-}

jikimo_sale_multiple_supply_methods/controllers/__init__.py

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

jikimo_sale_multiple_supply_methods/controllers/main.py

@@ -1,51 +0,0 @@
-import logging
-import json
-from odoo import http
-from odoo.http import request
-from odoo.addons.sf_bf_connect.controllers.controllers import Sf_Bf_Connect
-
-_logger = logging.getLogger(__name__)
-
-class JikimoSaleRoutePicking(Sf_Bf_Connect):
-
-    @http.route('/api/bfm_process_order/list', type='http', auth='sf_token', methods=['GET', 'POST'], csrf=False,
-                cors="*")
-    def get_bfm_process_order_list(self, **kw):
-        """
-        接收业务平台加工订单分配工厂时传送来的订单数据并生成销售订单和产品及坯料
-        :param kw:
-        :return:
-        """
-        res = {'status': 1, 'factory_order_no': ''}
-        # _logger.info('get_bfm_process_order_list:%s' % kw['order_number'])
-        try:
-            product_id = request.env.ref('jikimo_sale_multiple_supply_methods.product_template_default').with_context(active_test=False).sudo().product_variant_id
-            _logger.info('product_id:%s' % product_id)
-            company_id = request.env.ref('base.main_company').sudo()
-            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'], state='draft')
-            i = 1
-            # 给sale_order的default_code字段赋值
-            # aa = request.env['sale.order'].sudo().search([('name', '=', order_id.name)])
-            # _logger.info('get_bfm_process_or===================================:%s' % order_id.name)
-            order_id.default_code = kw['order_number']
-            if kw.get('logistics_way'):
-                order_id.logistics_way = kw['logistics_way']
-            for item in bfm_process_order_list:
-                if item.get('embryo_redundancy_id'):
-                    item['embryo_redundancy'] = request.env['sf.embryo.redundancy'].sudo().search([('code', '=', item['embryo_redundancy_id'])], limit=1)
-                    item['embryo_redundancy_id'] = item['embryo_redundancy'].id
-                product = request.env['product.template'].sudo().product_create(product_id, item, order_id,
-                                                                                kw['order_number'], i)
-                product.product_tmpl_id.is_customer_provided = True if item['embryo_redundancy_id'] else False
-                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
-        except Exception as e:
-            _logger.info('get_bfm_process_order_list error:%s' % e)
-            res['status'] = -1
-            res['message'] = '工厂创建销售订单和产品失败，请联系管理员'
-            request.cr.rollback()
-        return json.JSONEncoder().encode(res)

jikimo_sale_multiple_supply_methods/data/product_data.xml

@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<odoo>
-    <data noupdate="1">
-        <record id="product_template_manual_processing" model="product.template">
-            <field name="name">人工线下加工模板</field>
-            <field name="active" eval="False"/>
-            <field name="categ_id" ref="sf_dlm.product_category_finished_sf"/>
-            <field name="route_ids"
-                   eval="[ref('stock.route_warehouse0_mto'), ref('mrp.route_warehouse0_manufacture')]"/>
-            <field name="invoice_policy">delivery</field>
-            <field name="detailed_type">product</field>
-            <field name="purchase_ok">false</field>
-            <field name="uom_id" ref="uom.product_uom_unit"/>
-            <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="single_manufacturing">true</field>
-            <field name="tracking">serial</field>
-            <!-- <field name="categ_type">成品</field> -->
-            <field name="is_manual_processing">true</field>
-        </record>
-
-        <record id="product_template_purchase" model="product.template">
-            <field name="name">成品外购模板</field>
-            <field name="active" eval="False"/>
-            <field name="categ_id" ref="sf_dlm.product_category_finished_sf"/>
-            <field name="route_ids"
-                   eval="[ref('stock.route_warehouse0_mto'), ref('purchase_stock.route_warehouse0_buy')]"/>
-            <field name="tracking">serial</field>
-            <field name="detailed_type">product</field>
-            <field name="uom_id" ref="uom.product_uom_unit"/>
-            <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="company_id" ref="base.main_company"/>
-            <!-- <field name="categ_type">成品</field> -->
-        </record>
-
-        <record id="product_template_outsourcing" model="product.template">
-            <field name="name">成品委外加工模板</field>
-            <field name="active" eval="False"/>
-            <field name="categ_id" ref="sf_dlm.product_category_finished_sf"/>
-            <field name="route_ids"
-                   eval="[ref('stock.route_warehouse0_mto'), ref('purchase_stock.route_warehouse0_buy'), ref('mrp_subcontracting.route_resupply_subcontractor_mto')]"/>
-            <field name="tracking">serial</field>
-            <field name="detailed_type">product</field>
-            <field name="uom_id" ref="uom.product_uom_unit"/>
-            <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="company_id" ref="base.main_company"/>
-            <!-- <field name="categ_type">成品</field> -->
-        </record>
-
-        <record id="product_template_default" model="product.template">
-            <field name="name">成品初始化模板</field>
-            <field name="active" eval="False"/>
-            <field name="categ_id" ref="sf_dlm.product_category_finished_sf"/>
-            <field name="route_ids" eval="[]"/>
-            <field name="tracking">serial</field>
-            <field name="detailed_type">product</field>
-            <field name="uom_id" ref="uom.product_uom_unit"/>
-            <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="company_id" ref="base.main_company"/>
-            <!-- <field name="categ_type">成品</field> -->
-        </record>
-
-        <!-- 供应商信息（业务平台），由于数据是python创建，只能指定ID -->
-        <record id="product_supplierinfo_bfm" model="product.supplierinfo">
-            <field name="partner_id" eval="91"/>
-        </record>
-
-        <record id="product_template_embryo_customer_provided" model="product.template">
-            <field name="name">坯料客供料模板</field>
-            <field name="active" eval="False"/>
-            <field name="categ_id" ref="sf_dlm.product_category_embryo_sf"/>
-            <field name="route_ids" eval="[
-                ref('stock.route_warehouse0_mto'),
-                ref('mrp_subcontracting.route_resupply_subcontractor_mto'),
-                ref('jikimo_sale_multiple_supply_methods.route_material_processing')]"/>
-            <field name="sale_ok">false</field>
-            <field name="tracking">serial</field>
-            <field name="detailed_type">product</field>
-            <field name="uom_id" ref="uom.product_uom_unit"/>
-            <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="company_id" ref="base.main_company"/>
-            <!-- <field name="categ_type">坯料</field> -->
-            <field name="seller_ids" eval="[ref('jikimo_sale_multiple_supply_methods.product_supplierinfo_bfm')]"/>
-        </record>
-
-        <record id="sf_dlm.product_embryo_sf_self_machining" model="product.product">
-            <field name="is_manual_processing">true</field>
-        </record>
-
-        <record id="sf_dlm.product_embryo_sf_self_machining" model="product.product">
-            <field name="route_ids" eval="[(4, ref('mrp_subcontracting.route_resupply_subcontractor_mto'))]"/>
-        </record>
-
-        <record id="sf_dlm.product_embryo_sf_purchase" model="product.product">
-            <field name="route_ids" eval="[(4, ref('mrp_subcontracting.route_resupply_subcontractor_mto'))]"/>
-        </record>
-    </data> 
-</odoo>

jikimo_sale_multiple_supply_methods/data/stock_routes.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<odoo>
-    <data noupdate="1">
-        <record id="route_material_processing" model="stock.route">
-            <field name="name">带料加工</field>
-            <field name="product_selectable">true</field>
-            <field name="warehouse_selectable">true</field>
-            <field name="warehouse_ids" eval="[ref('stock.warehouse0')]"/>
-            <field name="sequence">16</field>
-        </record>
-
-        <record id="material_picking_in" model="stock.picking.type">
-            <field name="name">客供料入库</field>
-            <field name="code">incoming</field>
-            <field name="active">true</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="sequence_code">DL</field>
-            <field name="warehouse_id" ref="stock.warehouse0"/>
-            <field name="default_location_src_id" ref="stock.stock_location_customers"/>
-            <field name="default_location_dest_id" eval="25"/>
-        </record>
-
-        <record id="rule_material_receiving" model="stock.rule">
-            <field name="name">带料收货</field>
-            <field name="route_id" ref="route_material_processing"/>
-            <field name="location_dest_id" ref="stock.stock_location_company"/>
-            <field name="location_src_id" ref="stock.stock_location_customers"/>
-            <field name="picking_type_id" ref="material_picking_in"/>
-            <field name="action">pull</field>
-        </record>
-    </data> 
-</odoo>

jikimo_sale_multiple_supply_methods/models/__init__.py

@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-from . import product_template
-from . import sale_order
-from . import mrp_bom

jikimo_sale_multiple_supply_methods/models/mrp_bom.py

@@ -1,13 +0,0 @@
-from odoo import models, fields
-
-class MrpBom(models.Model):
-    _inherit = 'mrp.bom'
-
-    # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品后再次进行创建bom
-    def bom_create(self, product, bom_type, product_type):
-        bom_id = super(MrpBom, self).bom_create(product, bom_type, product_type)
-
-        # 成品的供应商从模板中获取
-        if product_type == 'product':
-            bom_id.subcontractor_id = product.product_tmpl_id.seller_ids.partner_id.id
-        return bom_id

jikimo_sale_multiple_supply_methods/models/product_template.py

@@ -1,26 +0,0 @@
-from odoo import models, fields, api
-
-class ProductTemplate(models.Model):
-    _inherit = 'product.template'
-
-    is_manual_processing = fields.Boolean(string='人工线下加工')
-    is_customer_provided = fields.Boolean(string='客供料')
-
-    def copy_template(self, product_template_id):
-        if not isinstance(product_template_id, ProductTemplate):
-            raise ValueError('%s必须是ProductTemplate类型' % product_template_id)
-
-        self.route_ids = product_template_id.route_ids
-        self.categ_id = product_template_id.categ_id
-        self.invoice_policy = product_template_id.invoice_policy
-        self.detailed_type = product_template_id.detailed_type
-        self.purchase_ok = product_template_id.purchase_ok
-        self.uom_id = product_template_id.uom_id
-        self.uom_po_id = product_template_id.uom_po_id
-        self.company_id = product_template_id.company_id
-        self.single_manufacturing = product_template_id.single_manufacturing
-        self.tracking = product_template_id.tracking
-        self.is_bfm = product_template_id.is_bfm
-        self.is_manual_processing = product_template_id.is_manual_processing
-         # 复制 seller_ids
-        self.seller_ids = [(0, 0, {'partner_id': seller.partner_id.id, 'delay': 1.0}) for seller in product_template_id.seller_ids]

jikimo_sale_multiple_supply_methods/models/quick_easy_order.py

@@ -1,71 +0,0 @@
-from datetime import datetime
-from odoo import models
-
-import logging
-import base64
-import hashlib
-
-_logger = logging.getLogger(__name__)
-
-
-class QuickEasyOrder(models.Model):
-    _inherit = 'quick.easy.order'
-
-    def distribute_to_factory(self, obj):
-        """
-            多供货方式，重写派单到工厂
-        :return:
-        """
-        try:
-            _logger.info('---------派单到工厂-------')
-            res = {'bfm_process_order_list': []}
-            for item in obj:
-                attachment = item.upload_model_file[0]
-                base64_data = base64.b64encode(attachment.datas)
-                base64_datas = base64_data.decode('utf-8')
-                barcode = hashlib.sha1(base64_datas.encode('utf-8')).hexdigest()
-                # logging.info('model_file-size: %s' % len(item.model_file))
-                res['bfm_process_order_list'].append({
-                    'model_long': item.model_length,
-                    'model_width': item.model_width,
-                    'model_height': item.model_height,
-                    'model_volume': item.model_volume,
-                    'model_machining_precision': item.machining_precision,
-                    'model_name': attachment.name,
-                    'model_data': base64_datas,
-                    'model_file': base64.b64encode(item.model_file).decode('utf-8'),
-                    'texture_code': item.material_id.materials_no,
-                    'texture_type_code': item.material_model_id.materials_no,
-                    # 'surface_process_code': self.env['jikimo.surface.process']._json_surface_process_code(item),
-                    'process_parameters_code': self.env[
-                        'sf.production.process.parameter']._json_production_process_item_code(
-                        item),
-                    'price': item.price,
-                    'number': item.quantity,
-                    'total_amount': item.price,
-                    'remark': '',
-                    'manual_quotation': True,
-                    'barcode': barcode,
-                    'part_number': item.part_drawing_number,
-                    'machining_drawings_name': '',
-                    'quality_standard_name': '',
-                    'machining_drawings_mimetype': '',
-                    'quality_standard_mimetype': '',
-                    'machining_drawings': item.machining_drawings,
-                    'quality_standard': '',
-                    'part_name': '',
-                })
-            company_id = self.env.ref('base.main_company').sudo()
-            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')
-            order_id.default_code = obj.name
-            i = 1
-            for item in res['bfm_process_order_list']:
-                product = self.env['product.template'].sudo().product_create(product_id, item, order_id,
-                                                                             obj.name, i)
-                order_id.with_user(self.env.ref("base.user_admin")).sale_order_create_line(product, item)
-            return order_id
-        except Exception as e:
-            return UserError('工厂创建销售订单和产品失败，请联系管理员')

jikimo_sale_multiple_supply_methods/models/sale_order.py

@@ -1,157 +0,0 @@
-import logging
-import json
-from odoo import models, fields, api
-from odoo.exceptions import UserError
-
-_logger = logging.getLogger(__name__)
-
-class SaleOrder(models.Model):
-    _inherit = 'sale.order'
-
-    state = fields.Selection([
-        ('draft', "报价"),
-        ('sent', "报价已发送"),
-        ('supply method', "供货方式待确认"),
-        ('sale', "销售订单"),
-        ('done', "已锁定"),
-        ('cancel', "已取消"),
-    ])
-
-    def confirm_to_supply_method(self):
-        self.state = 'supply method'
-
-    def action_confirm(self):
-        # 判断是否所有产品都选择了供货方式
-        filter_line = self.order_line.filtered(lambda line: not line.supply_method)
-        if filter_line:
-            raise UserError('当前订单内（%s）产品未选择路线，请选择后重试' % ','.join(filter_line.mapped('product_id.name')))
-
-        for line in self.order_line:
-            bom_type = ''
-            # 根据供货方式修改成品模板
-            if line.supply_method == 'automation':
-                bom_type = 'normal'
-                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()
-            elif line.supply_method == 'purchase':
-                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()
-            
-            # 复制成品模板上的属性
-            line.product_id.product_tmpl_id.copy_template(product_template_id)
-
-            order_id = self
-            product = line.product_id
-            # 拼接方法需要的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,
-                'price': product.list_price,
-                'embryo_redundancy_id': line.embryo_redundancy_id,
-            }
-            # 获取成品名结尾-n的n
-            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.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()
-                        # 创建坯料，客供料的批量不需要创建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,
-                            item,
-                            order_id, 'material_customer_provided', product_seria, product)
-                        # 成品配置bom
-                        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(
-                            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()
-                        # 创建坯料
-                        self_machining_embryo = self.env['product.template'].sudo().no_bom_product_create(
-                            self_machining_id,
-                            item,
-                            order_id, 'self_machining', product_seria, product)
-                        # 创建坯料的bom
-                        self_machining_bom = self.env['mrp.bom'].with_user(
-                            self.env.ref("base.user_admin")).bom_create(
-                            self_machining_embryo, 'normal', False)
-                        # 创建坯料里bom的组件
-                        self_machining_bom_line = self_machining_bom.with_user(
-                            self.env.ref("base.user_admin")).bom_create_line(
-                            self_machining_embryo)
-                        if not self_machining_bom_line:
-                            raise UserError('该订单模型的材料型号暂未有原材料,请先配置再进行分配')
-                        # 产品配置bom
-                        product_bom_self_machining = self.env['mrp.bom'].with_user(
-                            self.env.ref("base.user_admin")).bom_create(
-                            product, bom_type, 'product')
-                        product_bom_self_machining.with_user(self.env.ref("base.user_admin")).bom_create_line_has(
-                            self_machining_embryo)
-                    elif line.product_id.materials_type_id.gain_way == '外协':
-                        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)
-                        if outsource_embryo == -3:
-                            raise UserError('该订单模型的材料型号暂未设置获取方式和供应商,请先配置再进行分配')
-                        # 创建坯料的bom
-                        outsource_bom = self.env['mrp.bom'].with_user(self.env.ref("base.user_admin")).bom_create(
-                            outsource_embryo,
-                            'subcontract', True)
-                        # 创建坯料的bom的组件
-                        outsource_bom_line = outsource_bom.with_user(
-                            self.env.ref("base.user_admin")).bom_create_line(outsource_embryo)
-                        if not outsource_bom_line:
-                            raise UserError('该订单模型的材料型号暂未有原材料,请先配置再进行分配')
-                        # 产品配置bom
-                        product_bom_outsource = self.env['mrp.bom'].with_user(
-                            self.env.ref("base.user_admin")).bom_create(product, bom_type, 'product')
-                        product_bom_outsource.with_user(self.env.ref("base.user_admin")).bom_create_line_has(
-                            outsource_embryo)
-                    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:
-                            raise UserError('该订单模型的材料型号暂未设置获取方式和供应商,请先配置再进行分配')
-                        else:
-                            # 产品配置bom
-                            product_bom_purchase = self.env['mrp.bom'].with_user(
-                                self.env.ref("base.user_admin")).bom_create(product, bom_type, 'product')
-                            product_bom_purchase.with_user(self.env.ref("base.user_admin")).bom_create_line_has(
-                                purchase_embryo)
-        return super(SaleOrder, self).action_confirm()
-
-class SaleOrderLine(models.Model):
-    _inherit = 'sale.order.line'
-
-    # 供货方式
-    supply_method = fields.Selection([
-        ('automation', "自动化产线加工"),
-        ('manual', "人工线下加工"),
-        ('purchase', "外购"),
-        ('outsourcing', "委外加工"),
-    ], string='供货方式')

jikimo_sale_multiple_supply_methods/security/ir.model.access.csv

@@ -1,8 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_sale_order_group_production_engineer,sale.order_group_production_engineer,sale.model_sale_order,sf_base.group_production_engineer,1,1,0,0
-access_sale_order_line_group_production_engineer,sale_order_line_group_production_engineer,sale.model_sale_order_line,sf_base.group_production_engineer,1,1,0,0
-access_product_product_group_production_engineer,product_product_group_production_engineer,product.model_product_product,sf_base.group_production_engineer,1,0,0,0
-access_product_template_group_production_engineer,product_template_group_production_engineer,product.model_product_template,sf_base.group_production_engineer,1,0,0,0
-access_stock_picking_group_production_engineer,stock_picking_group_production_engineer,stock.model_stock_picking,sf_base.group_production_engineer,1,0,0,0
-access_stock_move_group_production_engineer,stock_move_group_production_engineer,stock.model_stock_move,sf_base.group_production_engineer,1,0,0,0
-access_mrp_bom_group_production_engineer,mrp_bom_group_production_engineer,mrp.model_mrp_bom,sf_base.group_production_engineer,1,0,0,0

jikimo_sale_multiple_supply_methods/views/product_product_views.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <!-- 由于该模块不能依赖sf_dlm_management, 该功能只能在sf_dlm_management中实现，并且依赖该模块-->
-    <record id="view_product_product_form_inherit_sf" model="ir.ui.view">
-        <field name="name">view.product.template.form.inherit.sf</field>
-        <field name="model">product.template</field>
-        <field name="inherit_id" ref="sf_dlm_management.view_sale_product_template_form_inherit_sf"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='manual_quotation']" position="after">
-                <field name="is_customer_provided" attrs="{'invisible': [('categ_type', 'not in', ['成品', '坯料'])], 'readonly': True}" />
-            </xpath>
-        </field>
-    </record>
-</odoo>
-
-        

jikimo_sale_multiple_supply_methods/views/sale_order_views.xml

@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <record id="view_order_form_inherit_sf" model="ir.ui.view">
-        <field name="name">view.sale.order.form.inherit.sf</field>
-        <field name="inherit_id" ref="sale_stock.view_order_form_inherit_sale_stock_qty"/>
-        <field name="model">sale.order</field>
-        <field name="arch" type="xml">
-            <xpath expr="//page/field[@name='order_line']/form/group/group/div[@name='ordered_qty']/widget[@name='qty_at_date_widget']" position="replace">
-            </xpath>
-            <xpath expr="//page/field[@name='order_line']/tree/widget[@name='qty_at_date_widget']" position="replace">
-            </xpath>
-        </field>
-    </record>
-
-    <record id="view_order_form_inherit_supply_method" model="ir.ui.view">
-        <field name="name">view.sale.order.form.inherit.supply.method</field>
-        <field name="inherit_id" ref="sf_sale.view_sale_order_form_inherit_sf"/>
-        <field name="model">sale.order</field>
-        <field name="arch" type="xml">
-             <xpath expr="//header/button[@name='action_confirm'][last()]" position="attributes">
-                <attribute name="attrs">{'invisible': [('state', '!=', 'draft')]}</attribute>
-                <attribute name="name">confirm_to_supply_method</attribute>
-            </xpath>
-            <xpath expr="//header/button[@name='confirm_to_supply_method']" position="before">
-                <button name="action_confirm" string="供货方式确认" type="object" attrs="{'invisible': [('state', '!=', 'supply method')]}" confirm="确认供货方式"/>
-            </xpath>
-            <xpath expr="//header/field[@name='state']" position="attributes">
-                <attribute name="statusbar_visible">draft,sent,supply method,sale</attribute>
-            </xpath>
-            <xpath expr="//page/field[@name='order_line']/tree/field[@name='remark']" position="before">
-                <field name="supply_method" attrs="{'invisible': [('state', '=', 'draft')], 'required': [('state', '=', 'supply method')]}" />
-            </xpath>
-            <xpath expr="//header/button[@name='action_cancel']" position="attributes">
-                <attribute name="attrs">{'invisible': [('state', '!=', 'draft')]}</attribute>
-            </xpath>
-            <xpath expr="//header/button[@name='action_cancel']" position="attributes">
-                <attribute name="attrs">{'invisible': [('state', '!=', 'draft')]}</attribute>
-            </xpath>
-            <xpath expr="//header/button[@name='action_quotation_send'][5]" position="attributes">
-                <attribute name="attrs">{'invisible': ['|','&amp;',('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel','supply method']),'&amp;',('check_status', '=', 'approved'),('state', 'in', ['sale','cancel','supply method'])]}</attribute>
-            </xpath>
-        </field>
-    </record>
-
-    <record id="jikimo_sale_order_view_search_inherit_quotation_supply_method" model="ir.ui.view">
-        <field name="name">jikimo.sale.order.search.inherit.quotation.supply.method</field>
-        <field name="model">sale.order</field>
-        <field name="mode">primary</field>
-        <field name="inherit_id" ref="sale.sale_order_view_search_inherit_quotation"/>
-        <field name="arch" type="xml">
-            <xpath expr="//filter[@name='my_quotation']" position="attributes">
-                <attribute name="domain">[('state', 'in', ('draft', 'sent')), ('user_id', '=', uid)]</attribute>
-            </xpath>
-            <xpath expr="//filter[@name='draft']" position="after">
-                <filter string="供货方式待确认" name="supply_method" domain="[('state', '=', 'supply method')]"/>
-            </xpath>
-        </field>
-    </record>
-
-    <record id="sale.action_quotations_with_onboarding" model="ir.actions.act_window">
-        <field name="search_view_id" ref="jikimo_sale_order_view_search_inherit_quotation_supply_method"/>
-        <field name="context">{'search_default_draft': 1}</field>
-    </record>
-
-    <record id="action_quotations_supply_method" model="ir.actions.act_window">
-        <field name="name">报价单</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sale.order</field>
-        <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
-        <field name="view_id" ref="sale.view_quotation_tree_with_onboarding"/>
-        <field name="search_view_id" ref="jikimo_sale_order_view_search_inherit_quotation_supply_method"/>
-        <field name="context">{'search_default_supply_method': 1}</field>
-        <field name="help" type="html">
-            <p class="o_view_nocontent_smiling_face">
-            Create a new quotation, the first step of a new sale!
-            </p><p>
-            Once the quotation is confirmed by the customer, it becomes a sales order.<br/> You will be able to create an invoice and collect the payment.
-            </p>
-        </field>
-    </record>
-    <menuitem
-        id="sale.sale_menu_root"
-        groups="sf_base.group_production_engineer,sf_base.group_sale_director,sf_base.group_sale_salemanager"
-        />
-    <!--供货路线专员菜单-->
-    <menuitem
-        id="sale_order_menu_quotations_supply_method"
-        name="报价"
-        action="action_quotations_supply_method"
-        parent="sale.sale_order_menu"
-        groups="sf_base.group_production_engineer"
-        sequence="2"/>
-
-    <record id="sale.menu_sale_order" model="ir.ui.menu">
-        <field name="groups_id" eval="[(4, ref('sf_base.group_production_engineer'))]"/>
-    </record>
-
-    <record id="sale.report_sales_team" model="ir.ui.menu">
-        <field name="groups_id" eval="[(4, ref('sf_base.group_production_engineer'))]"/>
-    </record>
-
-    <record id="sale.res_partner_menu" model="ir.ui.menu">
-        <field name="groups_id" eval="[(4, ref('sf_base.group_production_engineer'))]"/>
-    </record>
-
-    
-    
-</odoo>

jikimo_workorder_exception/__init__.py

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

jikimo_workorder_exception/__manifest__.py

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-{
-    'name': '机企猫 工单异常记录',
-    'version': '1.0',
-    'summary': '记录工单的异常日志',
-    'sequence': 1,
-    'category': 'sf',
-    'website': 'https://www.sf.jikimo.com',
-    'depends': ['sf_manufacturing', 'sf_mrs_connect'],
-    'data': [
-        'views/mrp_workorder_views.xml',
-        'security/ir.model.access.csv',
-    ],
-    'demo': [
-    ],
-    'license': 'LGPL-3',
-    'installable': True,
-    'application': False,
-    'auto_install': False,
-}

jikimo_workorder_exception/controllers/__init__.py

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

jikimo_workorder_exception/controllers/main.py

@@ -1,89 +0,0 @@
-from odoo import http, fields
-from odoo.http import request
-import json
-import logging
-from odoo.addons.sf_mrs_connect.controllers.controllers import Sf_Mrs_Connect
-from odoo.addons.sf_manufacturing.controllers.controllers import Manufacturing_Connect
-
-_logger = logging.getLogger(__name__)
-
-class WorkorderExceptionConroller(http.Controller):
-
-    @http.route('/AutoDeviceApi/BillError', type='json', auth='public', methods=['GET', 'POST'], csrf=False,
-                cors="*")
-    def workder_exception(self, **kw):
-        """
-            记录工单异常
-        :param kw:
-        :return:
-        """
-        _logger.info('workder_exception:%s' % kw)
-        try:
-            res = {'Succeed': True, 'ErrorCode': 0, 'Error': ''}
-            datas = request.httprequest.data
-            ret = json.loads(datas)
-            if not ret.get('RfidCode') or not ret.get('coding'):
-                res = {'Succeed': False, 'ErrorCode': 400, 'Error': '参数错误'}
-                return json.JSONEncoder().encode(res)
-            
-            # 通过RfidCode获取就绪的CNC工单
-            workorder = request.env['mrp.workorder'].sudo().search([
-                ('rfid_code', '=', ret['RfidCode']),
-                ('routing_type', '=', 'CNC加工'),
-            ])
-            if not workorder:
-                res = {'Succeed': False, 'ErrorCode': 401, 'Error': '无效的工单'}
-                return json.JSONEncoder().encode(res)
-            
-            # 创建工单异常记录,关联工单
-            request.env['jikimo.workorder.exception'].sudo().create({
-                'workorder_id': workorder.id,
-                'exception_code': ret.get('coding'),
-                'exception_content': ret.get('Error', '')
-            })
- 
-        except Exception as e:
-            res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
-            _logger.info('workder_exception error:%s' % e)
-        return json.JSONEncoder().encode(res)
-
-
-class SfMrsConnectController(Sf_Mrs_Connect):
-
-    @http.route('/api/cnc_processing/create', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
-                cors="*")
-    def get_cnc_processing_create(self, **kw):
-        """
-            更新工单异常记录【'YC001', 'YC004'】
-        """
-        res = super(SfMrsConnectController, self).get_cnc_processing_create(**kw)
-        # 如果有未完成的YC0001、YC0004异常记录，则标记为完成
-        res = json.loads(res)
-        _logger.info('已进入工单异常:%s' % res)
-        if res.get('production_ids'):
-            try:
-                productions = request.env['mrp.production'].sudo().search([('id', 'in', res.get('production_ids'))])
-                if productions.workorder_ids:
-                    productions.workorder_ids.handle_exception(['YC0001', 'YC0004'])
-            except Exception as e:
-                _logger.info('更新工单异常记录失败:%s' % e)
-        return json.JSONEncoder().encode(res)
-    
-class ManufactruingController(Manufacturing_Connect):
-
-    @http.route('/AutoDeviceApi/FeedBackStart', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
-                cors="*")
-    def button_Work_START(self, **kw):
-        """
-            更新工单异常记录【'YC0002', 'YC0003'】
-        """
-        res = super(ManufactruingController, self).button_Work_START(**kw)
-        res = json.loads(res)
-        _logger.info('已进入工单异常:%s' % res)
-        if res.get('workorder_id'):
-            try:
-                workorder = request.env['mrp.workorder'].sudo().browse(int(res.get('workorder_id')))
-                workorder.handle_exception(['YC0002', 'YC0003'])
-            except Exception as e:
-                _logger.info('更新工单异常记录失败:%s' % e)
-        return json.JSONEncoder().encode(res)

jikimo_workorder_exception/models/__init__.py

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

jikimo_workorder_exception/models/jikimo_workorder_exception.py

@@ -1,14 +0,0 @@
-from odoo import models, fields
-
-
-class JikimoWorkorderException(models.Model):
-    _name = 'jikimo.workorder.exception'
-    _description = '工单异常记录'
-    _order = 'id desc'
-
-    workorder_id = fields.Many2one('mrp.workorder', string='工单')
-    exception_code = fields.Char('异常编码')
-    exception_content = fields.Char('反馈的异常/问题信息')
-    completion_time = fields.Datetime('处理完成时间')
-    state = fields.Selection([('pending', '进行中'), ('done', '已处理')], string='状态', default='pending')
-    

jikimo_workorder_exception/models/mrp_workorder.py

@@ -1,40 +0,0 @@
-from odoo import models, fields
-import logging
-
-_logger = logging.getLogger(__name__)
-
-class MrpWorkorder(models.Model):
-    _inherit = 'mrp.workorder'
-
-    exception_ids = fields.One2many('jikimo.workorder.exception', 'workorder_id', string='工单异常记录')
-
-    def write(self, values):
-        if values.get('test_results') and self.exception_ids:
-            pending_exception = self.exception_ids.filtered(
-                lambda exc: exc.state == 'pending' and exc.exception_code == 'YC0005'
-            )
-            if pending_exception:
-                pending_exception.write({
-                    'completion_time': fields.Datetime.now(),
-                    'state': 'done'
-                })
-        return super(MrpWorkorder, self).write(values)
-    
-    def handle_exception(self, exception_codes):
-        """
-            处理异常
-            :param exception_codes: 需要处理的异常编码列表
-        """
-        if not isinstance(exception_codes, list):
-            exception_codes = [exception_codes]
-        if self.exception_ids:
-            _logger.info('workorder.exception_ids:%s' % self.exception_ids)
-            pending_exception = self.exception_ids.filtered(
-                lambda exc: exc.state == 'pending' and exc.exception_code in exception_codes
-            )
-            _logger.info('pending_exception:%s' % pending_exception)
-            if pending_exception:
-                pending_exception.write({
-                    'completion_time': fields.Datetime.now(),
-                    'state': 'done'
-                })

jikimo_workorder_exception/security/ir.model.access.csv

@@ -1,5 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_jikimo_workorder_exception","access.jikimo.workorder.exception","model_jikimo_workorder_exception","mrp.group_mrp_user",1,1,1,0
-"access_jikimo_workorder_exception_group_quality","access.jikimo.workorder.exception.group_quality","model_jikimo_workorder_exception","sf_base.group_quality",1,1,1,0
-"access_jikimo_workorder_exception_group_quality_director","access.jikimo.workorder.exception.group_quality_director","model_jikimo_workorder_exception","sf_base.group_quality_director",1,1,1,0
-

jikimo_workorder_exception/tests/__init__.py

@@ -1,2 +0,0 @@
-from . import common
-from . import test_jikimo_workorder_exception

jikimo_workorder_exception/tests/common.py

@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from odoo import fields, Command
-from odoo.tests.common import TransactionCase, HttpCase, tagged, Form
-
-import json
-import time
-import base64
-from lxml import etree
-
-@tagged('post_install', '-at_install')
-class TestJikimoWorkorderExceptionCommon(TransactionCase):
-
-    def setUp(self):
-        super(TestJikimoWorkorderExceptionCommon, self).setUp()
-        # 获取名字为“1#自动生产线”的制造中心
-        workcenter = self.env['mrp.workcenter'].search([('name', '=', '1#自动生产线')], limit=1)
-        # 创建一个产品
-        product_product = self.env['product.product'].create({
-            'name': '测试产品',
-            'type': 'product',
-            })
-        uom_unit = self.env.ref('uom.product_uom_unit')
-        # 创建一个bom
-        self.bom = self.env['mrp.bom'].create({
-            'product_id': product_product.id,
-            'product_tmpl_id': product_product.product_tmpl_id.id,
-            'product_uom_id': uom_unit.id,
-            'product_qty': 1.0,
-            'type': 'normal',
-         })
-        # 创建一个制造订单
-        self.production = self.env['mrp.production'].create({
-            'name': 'Test Production',
-            'product_id': product_product.id,
-            'bom_id': self.bom.id,
-            'company_id': self.env.ref('base.main_company').id,
-        })
-        # 创建一个测试工单
-        self.workorder = self.env['mrp.workorder'].create({
-            'name': 'Test order',
-            'workcenter_id': workcenter.id,
-            'product_uom_id': self.bom.product_uom_id.id,
-            'production_id': self.production.id,
-            'duration_expected': 1.0,
-            'rfid_code': 'test-123456',
-            'routing_type': 'CNC加工'
-        })

jikimo_workorder_exception/tests/test_jikimo_workorder_exception.py

@@ -1,53 +0,0 @@
-import json
-from datetime import datetime
-from odoo.addons.jikimo_workorder_exception.tests.common import TestJikimoWorkorderExceptionCommon
-
-class TestJikimoWorkorderException(TestJikimoWorkorderExceptionCommon):
-
-    def test_create_exception_record(self):
-        exception_record = self.env['jikimo.workorder.exception'].create({
-            'workorder_id': self.workorder.id,
-            'exception_code': 'YC0001',
-            'exception_content': '无CNC编程'
-        })
-       
-        self.assertTrue(exception_record)
-        self.assertEqual(exception_record.exception_content, '无CNC编程')
-        self.assertEqual(exception_record.workorder_id.id, self.workorder.id)
-        self.assertEqual(exception_record.exception_code, 'YC0001')
-
-    def test_handle_exception(self):
-        exception_record = self.env['jikimo.workorder.exception'].create({
-            'workorder_id': self.workorder.id,
-            'exception_code': 'YC0001',
-            'exception_content': '无CNC编程'
-        })
-        self.workorder.handle_exception('YC0001')
-        self.assertEqual(exception_record.state, 'done')
-        # 判断完成时间是否为当前分钟
-        self.assertEqual(exception_record.completion_time.minute, datetime.now().minute)
-
-    def test_handle_exception_with_invalid_code(self):
-        exception_record = self.env['jikimo.workorder.exception'].create({
-            'workorder_id': self.workorder.id,
-            'exception_code': 'YC0001',
-            'exception_content': '无CNC编程'
-        })
-        self.workorder.handle_exception(['YC0002', 'YC0004'])
-        self.assertEqual(exception_record.state, 'pending')
-        self.assertEqual(exception_record.completion_time, False) 
-    
-
-    def test_handle_exception_with_test_results(self):
-        exception_record = self.env['jikimo.workorder.exception'].create({
-            'workorder_id': self.workorder.id,
-            'exception_code': 'YC0005',
-            'exception_content': '工单加工失败'
-        })
-        self.workorder.write({
-            'test_results': '返工',
-            'reason': 'cutter',
-            'detailed_reason': '刀坏了',
-        })
-        self.assertEqual(exception_record.state, 'done')
-        self.assertEqual(exception_record.completion_time.minute, datetime.now().minute)

jikimo_workorder_exception/views/mrp_workorder_views.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data>
-        <record id="jikimo_workorder_exception_form_view_inherit" model="ir.ui.view">
-            <field name="name">mrp.workorder.form</field>
-            <field name="model">mrp.workorder</field>
-            <field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/>
-            <field name="arch" type="xml">
-                <xpath expr="//notebook/page[last()]" position="after">
-                    <page string="异常记录" name="workorder_exception" attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}">
-                        <field name="exception_ids" nolabel="1" readonly="1">
-                            <tree create="false" delete="false" edit="false">
-                                <field name="exception_content" string="反馈的异常/问题信息"/>
-                                <field name="create_date" string="时间"/>
-                                <field name="completion_time"/>
-                            </tree>
-                        </field>
-                    </page>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</odoo>

jikimo_workorder_exception_notify/__init__.py

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

jikimo_workorder_exception_notify/__manifest__.py

@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-{
-    'name': '机企猫 工单异常消息通知',
-    'version': '1.0',
-    'summary': '当产生工单异常时，发送消息通知',
-    'sequence': 1,
-    'category': 'sf',
-    'website': 'https://www.sf.jikimo.com',
-    'depends': ['jikimo_workorder_exception', 'jikimo_message_notify'],
-    'data': [
-        'data/bussiness_node.xml',
-        'data/template_data.xml',
-        # 'security/ir.model.access.csv',
-    ],
-    'demo': [
-    ],
-    'license': 'LGPL-3',
-    'installable': True,
-    'application': False,
-    'auto_install': False,
-}

jikimo_workorder_exception_notify/data/bussiness_node.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<odoo>
-    <data noupdate="1">
-        <record id="bussiness_no_functional_tool" model="jikimo.message.bussiness.node">
-            <field name="name">无功能刀具</field>
-            <field name="model">jikimo.workorder.exception</field>
-        </record>
-        <record id="bussiness_no_position_data" model="jikimo.message.bussiness.node">
-            <field name="name">无定位数据</field>
-            <field name="model">jikimo.workorder.exception</field>
-        </record>
-        <record id="bussiness_processing_failure" model="jikimo.message.bussiness.node">
-            <field name="name">加工失败</field>
-            <field name="model">jikimo.workorder.exception</field>
-        </record>
-    </data>
-</odoo>

jikimo_workorder_exception_notify/data/template_data.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" ?>
-<odoo>
-    <data noupdate="1">
-        <record id="template_no_function_tool" model="jikimo.message.template">
-            <field name="name">生产线无功能刀具提醒</field>
-            <field name="model_id" ref="jikimo_workorder_exception_notify.model_jikimo_workorder_exception"/>
-            <field name="model">jikimo.workorder.exception</field>
-            <field name="bussiness_node_id" ref="bussiness_no_functional_tool"/>
-            <field name="msgtype">markdown</field>
-            <field name="urgency">urgent</field>
-            <field name="content">### 生产线无功能刀具提醒
-单号：工单[{{workorder_id.production_id.name}}]({{url}})
-原因：生产线无加工程序要用的功能刀具</field>
-        </record>
-        <record id="template_no_position_data" model="jikimo.message.template">
-            <field name="name">工单无定位数据提醒</field>
-            <field name="model_id" ref="jikimo_workorder_exception_notify.model_jikimo_workorder_exception"/>
-            <field name="model">jikimo.workorder.exception</field>
-            <field name="bussiness_node_id" ref="bussiness_no_position_data"/>
-            <field name="msgtype">markdown</field>
-            <field name="urgency">urgent</field>
-            <field name="content">### 工单无定位数据提醒
-单号：工单[{{workorder_id.production_id.name}}]({{url}})
-原因：无装夹定位测量数据</field>
-        </record>
-        <record id="template_processing_failure" model="jikimo.message.template">
-            <field name="name">工单加工失败提醒</field>
-            <field name="model_id" ref="jikimo_workorder_exception_notify.model_jikimo_workorder_exception"/>
-            <field name="model">jikimo.workorder.exception</field>
-            <field name="bussiness_node_id" ref="bussiness_processing_failure"/>
-            <field name="msgtype">markdown</field>
-            <field name="urgency">urgent</field>
-            <field name="content">### 工单加工失败提醒
-单号：工单[{{workorder_id.production_id.name}}]({{url}})
-原因：加工失败，工件下产线处理</field>
-        </record>
-    </data>
-</odoo>

jikimo_workorder_exception_notify/models/__init__.py

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

jikimo_workorder_exception_notify/models/jikimo_message_template.py

@@ -1,10 +0,0 @@
-from odoo import models
-
-
-class JikimoMessageTemplate(models.Model):
-    _inherit = "jikimo.message.template"
-
-    def _get_message_model(self):
-        res = super(JikimoMessageTemplate, self)._get_message_model()
-        res.append('jikimo.workorder.exception')
-        return res

jikimo_workorder_exception_notify/models/jikimo_workorder_exception.py

@@ -1,61 +0,0 @@
-from odoo import models, api
-from odoo.addons.sf_base.commons.common import Common
-import requests, logging
-
-_logger = logging.getLogger(__name__)
-
-
-class JikimoWorkorderException(models.Model):
-    _name = 'jikimo.workorder.exception'
-    _inherit = ['jikimo.workorder.exception', 'jikimo.message.dispatch']
-
-    @api.model_create_multi
-    def create(self, vals_list):
-        res = super(JikimoWorkorderException, self).create(vals_list)
-        # 根据异常编码发送消息提醒
-        try:    
-            for rec in res:
-                if rec.exception_code == 'YC0001':
-                    # 无CNC程序，调用cloud接口
-                    data = {'name': rec.workorder_id.production_id.programming_no, 'exception_code': 'YC0001'}
-                    configsettings = self.env['res.config.settings'].sudo().get_values()
-                    config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
-                    url = '/api/message/workorder_exception'
-                    config_url = configsettings['sf_url'] + url
-                    data['token'] = configsettings['token']
-                    ret = requests.post(config_url, json=data, headers=config_header)
-                    ret = ret.json()
-                    _logger.info('无CNC程序异常消息推送接口:%s' % ret)
-                elif rec.exception_code == 'YC0002':
-                    # 无功能刀具
-                    rec.add_queue('无功能刀具')
-                elif rec.exception_code == 'YC0003':
-                    # 无定位数据
-                    rec.add_queue('无定位数据') 
-                elif rec.exception_code == 'YC0004':
-                    # 无FTP文件，调用cloud接口
-                    data = {'name': rec.workorder_id.production_id.programming_no, 'exception_code': 'YC0004'}
-                    configsettings = self.env['res.config.settings'].sudo().get_values()
-                    config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
-                    url = '/api/message/workorder_exception'
-                    config_url = configsettings['sf_url'] + url
-                    data['token'] = configsettings['token']
-                    ret = requests.post(config_url, json=data, headers=config_header)
-                    ret = ret.json()
-                    _logger.info('无FTP文件异常消息推送接口:%s' % ret)
-                elif rec.exception_code == 'YC0005':
-                    # 加工失败
-                    rec.add_queue('加工失败') 
-        except Exception as e:
-            _logger.error('异常编码发送消息提醒失败：%s' % e)
-        return res
-
-    def _get_message(self, message_queue_ids):
-        contents = super(JikimoWorkorderException, self)._get_message(message_queue_ids)
-        url = self.env['ir.config_parameter'].get_param('web.base.url')
-        action_id = self.env.ref('mrp.mrp_production_action').id
-        for index, content in enumerate(contents):
-            exception_id = self.env['jikimo.workorder.exception'].browse(message_queue_ids[index].res_id)
-            url = url + '/web#id=%s&view_type=form&action=%s' % (exception_id.workorder_id.production_id.id, action_id)
-            contents[index] = content.replace('{{url}}', url)
-        return contents

jikimo_workorder_exception_notify/tests/__init__.py

@@ -1,2 +0,0 @@
-from . import common
-from . import test_jikimo_workorder_exception_notify

jikimo_workorder_exception_notify/tests/common.py

@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from odoo import fields, Command
-from odoo.tests.common import TransactionCase, HttpCase, tagged, Form
-
-import json
-import time
-import base64
-from lxml import etree
-
-@tagged('post_install', '-at_install')
-class TestJikimoWorkorderExceptionNotifyCommonNotify(TransactionCase):
-
-    def setUp(self):
-        super(TestJikimoWorkorderExceptionNotifyCommonNotify, self).setUp()
-        # 获取最后一个工单
-        self.workorder = self.env['mrp.workorder'].search([], order='id desc', limit=1)
-        

jikimo_workorder_exception_notify/tests/test_jikimo_workorder_exception_notify.py

@@ -1,113 +0,0 @@
-import json
-from datetime import datetime
-from odoo.addons.jikimo_workorder_exception_notify.tests.common import TestJikimoWorkorderExceptionNotifyCommonNotify
-
-class TestJikimoWorkorderExceptionNotify(TestJikimoWorkorderExceptionNotifyCommonNotify):
-
-    def test_create_message_template(self):
-        self.assertTrue(self.env['jikimo.message.template'].search([
-            ('name', '=', '生产线无功能刀具提醒'),
-            ('model', '=', 'jikimo.workorder.exception')
-        ]))
-        self.assertTrue(self.env['jikimo.message.template'].search([
-            ('name', '=', '工单无定位数据提醒'),
-            ('model', '=', 'jikimo.workorder.exception')
-        ]))
-        self.assertTrue(self.env['jikimo.message.template'].search([
-            ('name', '=', '工单加工失败提醒'),
-            ('model', '=', 'jikimo.workorder.exception')
-        ]))
-
-    def test_create_message_queue_yc0001(self):
-        exception_record = self.env['jikimo.workorder.exception'].create({
-            'workorder_id': self.workorder.id,
-            'exception_code': 'YC0001',
-            'exception_content': '无CNC程序'
-        })
-
-        message_record = self.env['jikimo.message.queue'].search([
-            ('res_id', '=', exception_record.id),
-            ('model', '=', 'jikimo.workorder.exception'),
-            ('message_status', '=', 'pending')
-        ])
-        self.assertFalse(message_record)
-
-    def test_create_message_queue_yc0002(self):
-        exception_record = self.env['jikimo.workorder.exception'].create({
-            'workorder_id': self.workorder.id,
-            'exception_code': 'YC0002',
-            'exception_content': '无功能刀具'
-        })
-
-        bussiness_node = self.env['jikimo.message.bussiness.node'].search([
-            ('name', '=', '无功能刀具'),
-            ('model', '=', 'jikimo.workorder.exception')
-        ])
-
-        message_template = self.env['jikimo.message.template'].search([
-            ('bussiness_node_id', '=', bussiness_node.id),
-            ('model', '=', 'jikimo.workorder.exception')
-        ])
-
-        message_record = self.env['jikimo.message.queue'].search([
-            ('res_id', '=', exception_record.id),
-            ('model', '=', 'jikimo.workorder.exception'),
-            ('message_status', '=', 'pending'),
-            ('message_template_id', '=', message_template.id)
-        ])
-        self.assertTrue(message_record)
-
-    def test_create_message_queue_yc0003(self):
-        exception_record = self.env['jikimo.workorder.exception'].create({
-            'workorder_id': self.workorder.id,
-            'exception_code': 'YC0003',
-            'exception_content': '无定位数据'
-        })
-
-        bussiness_node = self.env['jikimo.message.bussiness.node'].search([
-            ('name', '=', '无定位数据'),
-            ('model', '=', 'jikimo.workorder.exception')
-        ])
-
-        message_template = self.env['jikimo.message.template'].search([
-            ('bussiness_node_id', '=', bussiness_node.id),
-            ('model', '=', 'jikimo.workorder.exception')
-        ])
-
-        message_record = self.env['jikimo.message.queue'].search([
-            ('res_id', '=', exception_record.id),
-            ('model', '=', 'jikimo.workorder.exception'),
-            ('message_status', '=', 'pending'),
-            ('message_template_id', '=', message_template.id)
-        ])
-        self.assertTrue(message_record)
-    
-    def test_create_message_queue_yc0004(self):
-        exception_record = self.env['jikimo.workorder.exception'].create({
-            'workorder_id': self.workorder.id,
-            'exception_code': 'YC0004',
-            'exception_content': '无CNC程序'
-        })
-
-        message_record = self.env['jikimo.message.queue'].search([
-            ('res_id', '=', exception_record.id),
-            ('model', '=', 'jikimo.workorder.exception'),
-            ('message_status', '=', 'pending')
-        ])
-        self.assertFalse(message_record)
-
-    def test_get_message(self):
-        exception_record = self.env['jikimo.workorder.exception'].create({
-            'workorder_id': self.workorder.id,
-            'exception_code': 'YC0002',
-            'exception_content': '无功能刀具'
-        })
-        message_queue_ids = self.env['jikimo.message.queue'].search([
-            ('res_id', '=', exception_record.id),
-            ('model', '=', 'jikimo.workorder.exception'),
-            ('message_status', '=', 'pending')
-        ])
-        message = self.env['jikimo.workorder.exception']._get_message(message_queue_ids)
-        self.assertTrue(message)
-
-    

mrp_workorder/i18n/zh_CN.po

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

quality/i18n/zh_CN.po

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

quality/models/quality.py

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

quality_control/i18n/zh_CN.po

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

quality_control/models/__init__.py

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

quality_control/models/product_category.py

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

quality_control/views/quality_views.xml

@@ -203,7 +203,7 @@
     <record id="quality_alert_action_check" model="ir.actions.act_window">
         <field name="name">Quality Alerts</field>
         <field name="res_model">quality.alert</field>
-        <field name="view_mode">tree,kanban,form,pivot,graph,calendar</field>
+        <field name="view_mode">kanban,tree,form,pivot,graph,calendar</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
                 Create a new quality alert
@@ -1033,7 +1033,7 @@
             name="Overview"
             action="quality_alert_team_action"
             parent="menu_quality_root"
-            sequence="5" active="False"/>
+            sequence="5"/>
 
     <menuitem
             id="menu_quality_control"

sf_base/controllers/controllers.py

@@ -38,17 +38,3 @@ class Manufacturing_Connect(http.Controller):
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
             logging.info('get_maintenance_tool_groups_Info error:%s' % e)
         return json.JSONEncoder().encode(res)
-
-
-class MultiInheritController():
-    _sub_classes = []
-
-    def __init_subclass__(cls):
-        """
-            多继承，解决多个字类时方法调用super的问题
-        """
-        super().__init_subclass__()
-        if len(cls._sub_classes) > 0 and cls not in cls._sub_classes:
-            cls.__bases__ = (cls._sub_classes[-1],)
-        if cls not in cls._sub_classes:
-            cls._sub_classes.append(cls)

sf_base/models/base.py

@@ -394,30 +394,3 @@ class MachineToolCategory(models.Model):
     active = fields.Boolean('有效', default=True)
     category = fields.Selection([('shukong', u'数控'), ('putong', u'普通')], string=u'机床类别',
                                 default='shukong')
-
-
-class MachiningAccuracy(models.Model):
-    _name = 'sf.machining.accuracy'
-    _description = '加工精度'
-    name = fields.Char('一般公差', index=True)
-    standard_tolerance = fields.Char(string="标准公差")
-    sync_id = fields.Char('同步ID')
-
-
-class ReSaleOrder(models.Model):
-    _inherit = 'sale.order'
-
-    person_of_delivery = fields.Char('收货人')
-    telephone_of_delivery = fields.Char('电话号码')
-    address_of_delivery = fields.Char('联系地址')
-
-
-class EmbryoRedundancy(models.Model):
-    _name = "sf.embryo.redundancy"
-
-    code = fields.Char('编码', required=True)
-    name = fields.Char('名称', required=True)
-    long = fields.Float('长度(mm)', required=True)
-    width = fields.Float('宽度(mm)', required=True)
-    height = fields.Float('高度(mm)', required=True)
-    active = fields.Boolean('有效', default=True)

sf_base/models/common.py

@@ -56,7 +56,7 @@ class MrsMaterialModel(models.Model):
     finish_machining = fields.Float("精加工Vc(m/min)")
     remark = fields.Text("备注")
     gain_way = fields.Selection(
-        [("自加工", "自加工"), ("外协", "委外加工"), ("采购", "采购")],
+        [("自加工", "自加工"), ("外协", "外协"), ("采购", "采购")],
         default="", string="获取方式")
     supplier_ids = fields.One2many('sf.supplier.sort', 'materials_model_id', string='供应商')
     active = fields.Boolean('有效', default=True)
@@ -100,7 +100,6 @@ class MrsProductionProcess(models.Model):
     travel_day = fields.Float('路途天数/d')
     sequence = fields.Integer('排序')
 
-
 # class MrsProcessingTechnology(models.Model):
 #     _name = 'sf.processing.technology'
 #     _description = '加工工艺'
@@ -158,9 +157,7 @@ class MrsProductionProcessParameter(models.Model):
         for parameter in self:
             if parameter.process_id:
                 name = parameter.process_id.name + '-' + parameter.name
-            else:
-                name = parameter.name
-            result.append((parameter.id, name))
+                result.append((parameter.id, name))
         return result
 
     # 获取表面工艺的获取方式

sf_base/security/group_security.xml

@@ -1,6 +1,6 @@
 <odoo>
     <data>
-        <record id="group_quality" model="res.groups">
+         <record id="group_quality" model="res.groups">
             <field name="name">质检岗</field>
             <field name="category_id" ref="base.module_category_manufacturing_quality"/>
         </record>
@@ -46,11 +46,6 @@
             <field name="category_id" ref="base.module_category_manufacturing_manufacturing"/>
         </record>
 
-        <record id="group_production_engineer" model="res.groups">
-            <field name="name">工艺工程师</field>
-            <field name="implied_ids" eval="[(4, ref('group_sf_mrp_user'))]"/>
-            <field name="category_id" ref="base.module_category_manufacturing_manufacturing"/>
-        </record>
 
         <record model="ir.module.category" id="module_category_plan">
             <field name="name">计划</field>
@@ -70,7 +65,7 @@
         <record id="group_plan_dispatch" model="res.groups">
             <field name="name">计划调度岗</field>
             <field name="category_id" ref="module_category_plan"/>
-            <!--             <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/> -->
+<!--             <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/> -->
         </record>
 
         <record id="group_plan_director" model="res.groups">

sf_base/security/ir.model.access.csv

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

sf_base/static/js/customTable.js

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

sf_base/static/js/setTableWidth.js

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

sf_base/static/js/updateTable.js

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

sf_base/static/src/scss/change.scss

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

sf_base/static/src/scss/format_img.scss

@@ -14,7 +14,6 @@
 
 .img-fluid {
   max-width: unset !important;
-  width: 40px;
 }
 
 .o_inner_group .img-fluid {

sf_base/views/base_view.xml

@@ -109,7 +109,7 @@
         <field name="name">form.sf.machine_tool.type</field>
         <field name="model">sf.machine_tool.type</field>
         <field name="arch" type="xml">
-            <form string="机床型号" delete="0">
+              <form string="机床型号" delete="0">
                 <sheet>
                     <div class="oe_title">
                         <h1>
@@ -129,28 +129,31 @@
                             <field name="machine_tool_picture" widget="image" nolabel="1"/>
                         </group>
                     </group>
-                    <group string="加工能力">
+                     <group string="加工能力">
                         <div>
-                            <field name='jg_image_id' widget="custom_many2many_checkboxes">
-                                <tree>
-                                    <field name="name"/>
-                                    <field name="image" widget="image"/>
+                             <field name='jg_image_id' widget="custom_many2many_checkboxes">
 
-                                </tree>
-                            </field>
+                            <tree>
+                                <field name="name"/>
+                                <field name="image" widget="image"
+                                       options="{'size': [100, 100], 'click enlarge': True}"/>
+
+                            </tree>
+                        </field>
                         </div>
 
                     </group>
                     <group string="冷却方式">
                         <div>
-                            <field name='lq_image_id' widget="custom_many2many_checkboxes">
+                             <field name='lq_image_id' widget="custom_many2many_checkboxes">
 
-                                <tree>
-                                    <field name="name"/>
-                                    <field name="image" widget="image"/>
+                            <tree>
+                                <field name="name"/>
+                                <field name="image" widget="image"
+                                       options="{'size': [100, 100], 'click enlarge': True}"/>
 
-                                </tree>
-                            </field>
+                            </tree>
+                        </field>
                         </div>
 
                     </group>
@@ -175,7 +178,7 @@
                                         <field name="workbench_H" class="o_address_zip" required="1"
                                                options="{'format': false}"/>
                                     </div>
-                                    <field name="workpiece_load"/>
+                                     <field name="workpiece_load"/>
                                     <label for="machine_tool_L" string="机床尺寸(mm)"/>
                                     <div class="test_model">
                                         <label for="machine_tool_L" string="长"/>
@@ -189,7 +192,7 @@
                                         <field name="machine_tool_H" class="o_address_zip"
                                                options="{'format': false}"/>
                                     </div>
-                                    <label for="T_trough_num" string="T型槽尺寸:"/>
+                                     <label for="T_trough_num" string="T型槽尺寸:"/>
                                     <div class="test_model">
                                         <label for="T_trough_num" string="槽数"/>
                                         <field name="T_trough_num" class="o_address_zip"
@@ -202,20 +205,20 @@
                                         <field name="T_trough_distance" class="o_address_zip"
                                                options="{'format': false}"/>
                                     </div>
-                                    <!--                                    <field name="feed_speed" required="1"/>-->
-                                    <!--                                    <label for="precision_min" string="X轴定位精度(mm)"/>-->
-                                    <!--                                    <div class="test_model">-->
-                                    <!--                                        <label for="precision_min" string="最小(min)"/>-->
-                                    <!--                                        <field name="precision_min" class="o_address_zip" required="1"-->
-                                    <!--                                               options="{'format': false}"/>-->
-                                    <!--                                        <span>&amp;nbsp;</span>-->
-                                    <!--                                        <label for="precision_max" string="最大(max)"/>-->
-                                    <!--                                        <field name="precision_max" class="o_address_zip" required="1"-->
-                                    <!--                                               options="{'format': false}"/>-->
-                                    <!--                                    </div>-->
+<!--                                    <field name="feed_speed" required="1"/>-->
+<!--                                    <label for="precision_min" string="X轴定位精度(mm)"/>-->
+<!--                                    <div class="test_model">-->
+<!--                                        <label for="precision_min" string="最小(min)"/>-->
+<!--                                        <field name="precision_min" class="o_address_zip" required="1"-->
+<!--                                               options="{'format': false}"/>-->
+<!--                                        <span>&amp;nbsp;</span>-->
+<!--                                        <label for="precision_max" string="最大(max)"/>-->
+<!--                                        <field name="precision_max" class="o_address_zip" required="1"-->
+<!--                                               options="{'format': false}"/>-->
+<!--                                    </div>-->
 
-                                    <!--                                    <field name="lead_screw" required="1"/>-->
-                                    <!--                                    <field name="guide_rail" required="1"/>-->
+<!--                                    <field name="lead_screw" required="1"/>-->
+<!--                                    <field name="guide_rail" required="1"/>-->
                                     <field name="number_of_axles" required="1" widget="radio"
                                            options="{'horizontal': true}"/>
                                     <label for="x_axis" string="加工行程(mm)"
@@ -255,7 +258,7 @@
                                 </group>
                                 <group string="主轴">
                                     <field name="taper_type_id" required="1"/>
-                                    <label for="distance_min" string="主轴端面-工作台距离(mm)"/>
+                                     <label for="distance_min" string="主轴端面-工作台距离(mm)"/>
                                     <div class="test_model">
                                         <label for="distance_min" string="最小(min)"/>
                                         <field name="distance_min" class="o_address_zip"
@@ -265,7 +268,7 @@
                                         <field name="distance_max" class="o_address_zip"
                                                options="{'format': false}"/>
                                     </div>
-                                    <field name="rotate_speed" string="主轴最高转速(r/min)"
+                                     <field name="rotate_speed" string="主轴最高转速(r/min)"
                                            options="{'format': false}"/>
                                     <field name="spindle_center_distance"/>
                                     <field name="spindle_continuous_power"/>
@@ -283,50 +286,50 @@
                         <page string="进给/精度参数">
                             <group>
                                 <group string="进给参数">
-                                    <field name="X_axis_rapid_traverse_speed"/>
-                                    <field name="Y_axis_rapid_traverse_speed"/>
-                                    <field name="Z_axis_rapid_traverse_speed"/>
-                                    <field name="a_axis_rapid_traverse_speed"/>
-                                    <field name="b_axis_rapid_traverse_speed"/>
-                                    <field name="c_axis_rapid_traverse_speed"/>
-                                    <field name="straight_cutting_feed_rate"/>
-                                    <field name="rotary_cutting_feed_rate"/>
+                                     <field name="X_axis_rapid_traverse_speed"/>
+                                     <field name="Y_axis_rapid_traverse_speed"/>
+                                     <field name="Z_axis_rapid_traverse_speed"/>
+                                     <field name="a_axis_rapid_traverse_speed"/>
+                                     <field name="b_axis_rapid_traverse_speed"/>
+                                     <field name="c_axis_rapid_traverse_speed"/>
+                                     <field name="straight_cutting_feed_rate"/>
+                                     <field name="rotary_cutting_feed_rate"/>
                                 </group>
                                 <group string="精度参数">
-                                    <field name="X_precision"/>
-                                    <field name="X_precision_repeat"/>
-                                    <field name="Y_precision"/>
-                                    <field name="Y_precision_repeat"/>
-                                    <field name="Z_precision"/>
-                                    <field name="Z_precision_repeat"/>
-                                    <field name="a_precision"/>
-                                    <field name="a_precision_repeat"/>
-                                    <field name="b_precision"/>
-                                    <field name="b_precision_repeat"/>
-                                    <field name="c_precision"/>
-                                    <field name="c_precision_repeat"/>
+                                     <field name="X_precision"/>
+                                     <field name="X_precision_repeat"/>
+                                     <field name="Y_precision"/>
+                                     <field name="Y_precision_repeat"/>
+                                     <field name="Z_precision"/>
+                                     <field name="Z_precision_repeat"/>
+                                     <field name="a_precision"/>
+                                     <field name="a_precision_repeat"/>
+                                     <field name="b_precision"/>
+                                     <field name="b_precision_repeat"/>
+                                     <field name="c_precision"/>
+                                     <field name="c_precision_repeat"/>
                                 </group>
                             </group>
                         </page>
-                        <page string="刀库参数">
-                            <group>
+                                <page string="刀库参数">
+                                    <group>
                                 <group string="刀具">
-                                    <!--                                    <field name="knife_type" required="1"/>-->
+<!--                                    <field name="knife_type" required="1"/>-->
                                     <field name="number_of_knife_library" required="1" options="{'format': false}"/>
-                                    <!--                                    <field name="tool_speed" required="1"/>-->
+<!--                                    <field name="tool_speed" required="1"/>-->
                                     <field name="tool_full_diameter_max"/>
                                     <field name="tool_perimeter_diameter_max"/>
                                     <field name="tool_long_max"/>
-                                    <!--                                    <label for="tool_diameter_min" string="刀具刀径(mm)"/>-->
-                                    <!--                                    <div class="test_model">-->
-                                    <!--                                        <label for="tool_diameter_min" string="最小(min)"/>-->
-                                    <!--                                        <field name="tool_diameter_min" class="o_address_zip" required="1"-->
-                                    <!--                                               options="{'format': false}"/>-->
-                                    <!--                                        <span>&amp;nbsp;</span>-->
-                                    <!--                                        <label for="tool_diameter_max" string="最大(max)"/>-->
-                                    <!--                                        <field name="tool_diameter_max" class="o_address_zip" required="1"-->
-                                    <!--                                               options="{'format': false}"/>-->
-                                    <!--                                    </div>-->
+<!--                                    <label for="tool_diameter_min" string="刀具刀径(mm)"/>-->
+<!--                                    <div class="test_model">-->
+<!--                                        <label for="tool_diameter_min" string="最小(min)"/>-->
+<!--                                        <field name="tool_diameter_min" class="o_address_zip" required="1"-->
+<!--                                               options="{'format': false}"/>-->
+<!--                                        <span>&amp;nbsp;</span>-->
+<!--                                        <label for="tool_diameter_max" string="最大(max)"/>-->
+<!--                                        <field name="tool_diameter_max" class="o_address_zip" required="1"-->
+<!--                                               options="{'format': false}"/>-->
+<!--                                    </div>-->
                                     <field name="tool_quality_max"/>
                                     <field name="T_tool_time"/>
                                     <field name="C_tool_time"/>
@@ -614,45 +617,4 @@
         <field name="res_model">sf.machine.control_system</field>
         <field name="view_mode">tree</field>
     </record>
-
-    #------------------加工精度------------------
-    <record model="ir.ui.view" id="tree_sf_machining_accuracy_view">
-        <field name="name">tree.sf.machining.accuracy</field>
-        <field name="model">sf.machining.accuracy</field>
-        <field name="arch" type="xml">
-            <tree string="加工精度" create="0" edit="0" delete="0">
-                <field name="name"/>
-                <field name="standard_tolerance"/>
-            </tree>
-        </field>
-    </record>
-
-      <record id="action_sf_machining_accuracy" model="ir.actions.act_window">
-        <field name="name">加工精度</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.machining.accuracy</field>
-        <field name="view_mode">tree</field>
-    </record>
-
-     #------------------坯料冗余量------------------
-    <record model="ir.ui.view" id="tree_sf_embryo_redundancy_view">
-        <field name="name">tree.sf.embryo.redundancy</field>
-        <field name="model">sf.embryo.redundancy</field>
-        <field name="arch" type="xml">
-            <tree string="坯料冗余量" create="0" edit="0" delete="0">
-                <field name="name"/>
-                <field name="code"/>
-                <field name="long"/>
-                <field name="width"/>
-                <field name="height"/>
-            </tree>
-        </field>
-    </record>
-
-      <record id="action_sf_embryo_redundancy" model="ir.actions.act_window">
-        <field name="name">坯料冗余量</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.embryo.redundancy</field>
-        <field name="view_mode">tree</field>
-    </record>
 </odoo>

sf_base/views/menu_view.xml

@@ -141,25 +141,12 @@
                 sequence="1"
                 action="action_sf_machine_brand"/>
 
-        <menuitem
-                id="menu_sf_embryo_redundancy"
-                parent="menu_sf_base"
-                name="坯料冗余"
-                sequence="2"
-                action="action_sf_embryo_redundancy"/>
-
-        <menuitem
-                id="menu_sf_machining_accuracy"
-                parent="menu_sf_base"
-                name="加工精度"
-                sequence="3"
-                action="action_sf_machining_accuracy"/>
 
         <menuitem
                 id="menu_sf_machine_control_system"
                 parent="menu_sf_base"
                 name="数控系统"
-                sequence="4"
+                sequence="1"
                 action="action_sf_machine_control_system"/>
 
 

sf_base/views/tool_views.xml

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

sf_bf_connect/models/process_status.py

@@ -36,7 +36,6 @@ class StatusChange(models.Model):
         # 使用super()来调用原始方法（在本例中为'sale.order'模型的'action_confirm'方法）
         try:
             res = super(StatusChange, self).action_confirm()
-            logging.info('原生方法返回结果:%s' % res)
             # 原有方法执行后，进行额外的操作（如调用外部API）
             process_start_time = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
             config = self.env['res.config.settings'].get_values()
@@ -62,7 +61,6 @@ class StatusChange(models.Model):
             traceback_error = traceback.format_exc()
             logging.error("工厂加工同步订单状态失败:%s " % traceback_error)
             raise UserError(e)
-        logging.info('最终返回值:%s' % res)
         return res
 
     def action_cancel(self):

sf_bf_connect/views/view.xml

@@ -58,7 +58,7 @@
         <field name="inherit_id" ref="stock.view_picking_form"/>
         <field name="arch" type="xml">
             <xpath expr="//form//sheet//notebook//page[@name='operations']" position="after">
-                <page string="发货信息" name="tracking" attrs="{'invisible': [('picking_type_code', '!=', 'outgoing')]}">
+                <page string="发货信息" name="tracking">
                     <group>
                         <group>
                         <field name="senderNickName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>

sf_dlm/__manifest__.py

@@ -10,7 +10,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sf_base', 'mrp_subcontracting', 'purchase_stock', 'uom'],
+    'depends': ['sf_base', 'web_widget_model_viewer', 'mrp_subcontracting', 'purchase_stock', 'uom', ],
     'data': [
         'data/product_data.xml',
         'data/uom_data.xml',

sf_dlm/data/product_data.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <data noupdate="1">
+    <data>
         <record id="product_category_embryo_sf" model="product.category">
             <field name="name">坯料</field>
             <field name="type">坯料</field>

sf_dlm/models/__init__.py

@@ -1,3 +1 @@
 from . import product_supplierinfo
-from . import stock_rule_inherit
-

sf_dlm/models/stock_rule_inherit.py

@@ -1,43 +0,0 @@
-import logging
-from odoo import models, fields, api, _
-
-
-class StockRuleInherit(models.Model):
-    _inherit = 'stock.rule'
-
-    @api.model
-    def _run_buy(self, procurements):
-        # 首先调用父类的 _run_buy 方法，以保留原有逻辑
-        super(StockRuleInherit, self)._run_buy(procurements)
-
-        # 然后在这里添加自定义的逻辑
-        for procurement, rule in procurements:
-            product = procurement.product_id
-            # 获取主 BOM
-            bom = self.env['mrp.bom'].search([('product_tmpl_id', '=', product.product_tmpl_id.id)], limit=1)
-
-            if bom:
-                # 遍历 BOM 中的组件（即坯料等）
-                for line in bom.bom_line_ids:
-                    raw_material = line.product_id
-                    # 检查路线
-                    for route in raw_material.route_ids:
-                        # print('route.name:', route.name)
-                        if route.name == '按订单补给外包商':  # 或者用 route.id 检查精确的路线
-                            print("按订单补给外包商============是")
-                            # 使用 procurement.values['supplier'] 获取供应商
-                            supplier = procurement.values.get('supplier')
-                            if supplier:
-                                domain = rule._make_po_get_domain(procurement.company_id, procurement.values,
-                                                                  supplier.partner_id)
-                                logging.info("domain=============: %s", domain)
-                                po = self.env['purchase.order'].sudo().search([
-                                    ('partner_id', '=', supplier.partner_id.id),
-                                    ('company_id', '=', procurement.company_id.id),  # 保证公司一致
-                                    ('origin', '=', procurement.origin),  # 根据来源匹配
-                                    ('state', '=', 'draft')  # 状态为草稿
-                                ], limit=1)
-                                logging.info("po=: %s", po)
-                                if po:
-                                    po.write({'purchase_type': 'consignment'})
-                            break

sf_dlm_management/__manifest__.py

@@ -9,7 +9,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sf_sale', 'sf_dlm', 'sf_manufacturing','jikimo_attachment_viewer'],
+    'depends': ['sf_sale', 'sf_dlm', 'sf_manufacturing'],
     'data': [
         'data/stock_data.xml',
         'views/product_template_management_view.xml',

sf_dlm_management/views/product_template_management_view.xml

@@ -2,7 +2,6 @@
 <odoo>
     <data>
         <record id="mrp.product_template_action" model="ir.actions.act_window">
-            <field name="view_mode">tree,kanban,form,activity</field>
             <field name="context">
                 {"search_default_categ_id":1,"search_default_consumable": 1, 'default_detailed_type': 'product'}
             </field>
@@ -16,10 +15,8 @@
                     <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='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="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)]}"/>
@@ -66,9 +63,6 @@
                            attrs="{'invisible': [('categ_type', '!=', '夹具')],'required': [('categ_type', '=', '夹具')]}"
                            domain="[('fixture_model_id','=',fixture_model_id)]"/>
                 </field>
-                <xpath expr="//field[@name='uom_id']" position="before">
-                    <field name="is_manual_processing" attrs="{'invisible': [('categ_type', 'not in', ['成品', '坯料'])], 'readonly': True}" />
-                </xpath>
                 <xpath expr="//label[@for='volume']" position="before">
                     <label for="length" string="尺寸"
                            attrs="{'invisible':[('product_variant_count', '>', 1), ('is_product_variant', '=', False)]}"/>
@@ -115,17 +109,6 @@
                         '刀具')], 'required': True}
                     </attribute>
                 </xpath>
-                <xpath expr="//sheet//notebook" position="inside">
-                    <page string="2D加工图纸" attrs="{'invisible': [('categ_type', 'not in', ['成品', '坯料'])]}">
-                        <field name='machining_drawings' widget="adaptive_viewer"/>
-                    </page>
-                </xpath>
-                <xpath expr="//sheet//notebook" position="inside">
-                    <page string="质检标准" attrs="{'invisible': [('categ_type', 'not in', ['成品', '坯料'])]}">
-                        <field name='quality_standard' widget="adaptive_viewer"/>
-
-                    </page>
-                </xpath>
                 <!--                <xpath expr="//field[@name='default_code']" position="attributes">-->
                 <!--                    <attribute name="attrs">{'readonly': [('categ_type', '=', '刀具')], 'invisible':-->
                 <!--                        [('product_variant_count', '>' , 1)]}-->

sf_hr/models/__init__.py

@@ -2,4 +2,3 @@
 
 from . import hr_employee
 from . import res_config_setting
-from . import res_users

sf_hr/models/hr_employee.py

@@ -11,42 +11,6 @@ class JkmPracticeEmployee(models.Model):
 
     we_id = fields.Char(string='企微ID', index=True)
 
-    @api.model_create_multi
-    def create(self, vals_list):
-        for val in vals_list:
-            if 'work_email' in val:
-                val["we_id"] = self._get_we_id(val.get('work_email'))
-        return super(JkmPracticeEmployee, self).create(vals_list)
-
-    def write(self, vals):
-        if 'work_email' in vals:
-            vals["we_id"] = self._get_we_id(vals.get('work_email'))
-        return super(JkmPracticeEmployee, self).write(vals)
-
-    @api.depends('work_contact_id', 'work_contact_id.mobile', 'work_contact_id.email')
-    def _compute_work_contact_details(self):
-        for employee in self:
-            if employee.work_contact_id:
-                employee.mobile_phone = employee.work_contact_id.mobile
-                employee.work_email = employee.work_contact_id.email
-                if employee.work_contact_id.email:
-                    employee.we_id = self._get_we_id(employee.work_contact_id.email)
-
-    def _get_we_id(self, work_email):
-        json1 = {
-            'params': {
-                'work_email': work_email
-            }
-        }
-        url = '/api/get/we_id/info'
-        config = self.env['res.config.settings'].get_values()
-        ret = requests.post((config['ims_url'] + url), json=json1, data={})
-        result = ret.json()['result']
-        if result['code'] == 200:
-            if result['we_id']:
-                return result['we_id']
-        return None
-
     def _employee_info_sync(self):
         url = '/api/get/organization'
         config = self.env['res.config.settings'].get_values()

sf_hr/models/res_users.py

@@ -1,15 +0,0 @@
-# -*- coding: utf-8 -*-
-import random
-from odoo import models, fields, api
-from odoo.http import request
-from odoo.exceptions import AccessDenied
-
-import logging
-
-_logger = logging.getLogger(__name__)
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    we_employee_id = fields.Char(string=u'企业微信账号', related='employee_id.we_id', default="")

sf_machine_connect/__manifest__.py

@@ -12,7 +12,7 @@
     'category': 'sf',
     'author': 'jikimo',
     'website': 'https://sf.cs.jikimo.com',
-    'depends': ['web', 'sf_manufacturing', 'barcodes'],
+    'depends': ['web', 'mail', 'sf_base', 'sf_manufacturing', 'barcodes', ],
     'data': [
         # 定义权限组放在最上面
         # 权限组

sf_machine_connect/controllers/controllers.py

@@ -15,7 +15,7 @@ db_config = {
     "user": "postgres",
     "password": "postgres",
     "port": "5432",
-    "host": "172.16.10.131"
+    "host": "172.16.10.113"
 }
 
 
@@ -24,8 +24,6 @@ def convert_to_seconds(time_str):
 
     if time_str is None:
         return 0
-    if time_str == 0:
-        return 0
 
     pattern = r"(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?"
 
@@ -402,45 +400,20 @@ class Sf_Dashboard_Connect(http.Controller):
         try:
             plan_obj = request.env['sf.production.plan'].sudo()
             production_obj = request.env['mrp.production'].sudo()
-            work_order_obj = request.env['mrp.workorder'].sudo()
             line_list = ast.literal_eval(kw['line_list'])
             # print('line_list: %s' % line_list)
             for line in line_list:
 
+                # 工单计划量
+                plan_data_total_counts = production_obj.search_count(
+                    [('production_line_id.name', '=', line), ('state', 'not in', ['cancel']),
+                     ('active', '=', True)])
+                # 工单完成量
+                plan_data_finish_counts = plan_obj.search_count(
+                    [('production_line_id.name', '=', line), ('state', 'in', ['finished'])])
                 # # 工单计划量
-                # plan_data_total_counts = production_obj.search_count(
-                #     [('production_line_id.name', '=', line), ('state', 'not in', ['cancel']),
-                #      ('active', '=', True)])
-
-                # 工单计划量切换为CNC工单
-                plan_data_total_counts = work_order_obj.search_count(
-                    [('production_id.production_line_id.name', '=', line),
-                     ('state', 'in', ['ready', 'progress', 'done']), ('routing_type', '=', 'CNC加工')])
-
-                # # 工单完成量
-                # plan_data_finish_counts = plan_obj.search_count(
-                #     [('production_line_id.name', '=', line), ('state', 'in', ['finished'])])
-
-                # 工单完成量切换为CNC工单
-                plan_data_finish_counts = work_order_obj.search_count(
-                    [('production_id.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),
-                    ('state', 'in', ['done']),
-                    ('routing_type', '=', 'CNC加工')
-                ])
-
-                # 使用 filtered 进行字段比较
-                plan_data_overtime_counts = plan_data_overtime.filtered(
-                    lambda order: order.date_finished > order.date_planned_finished
-                )
-
-                # 获取数量
-                plan_data_overtime_counts = len(plan_data_overtime_counts)
+                # plan_data_plan_counts = plan_obj.search_count(
+                #     [('production_line_id.name', '=', line), ('state', 'not in', ['finished'])])
 
                 # 查找符合条件的生产计划记录
                 plan_data = plan_obj.search([
@@ -542,10 +515,7 @@ class Sf_Dashboard_Connect(http.Controller):
                         'on_time_rate': on_time_rate,
                         # 'detection_data': detection_data,
                         'detection_data': plan_data_finish_counts,
-                        'pass_rate': (plan_data_finish_counts - plan_data_fault_counts) / plan_data_finish_counts,
-                        'plan_data_overtime_counts': plan_data_overtime_counts,
-                        'overtime_rate': plan_data_overtime_counts / plan_data_finish_counts
-                        if plan_data_finish_counts > 0 else 0,
+                        'pass_rate': (plan_data_finish_counts - plan_data_fault_counts) / plan_data_finish_counts
                     }
                     res['data'][line] = data
 
@@ -1264,7 +1234,6 @@ class Sf_Dashboard_Connect(http.Controller):
         """
         获取
         """
-        logging.info("kw=============:%s" % kw)
         res = {'status': 1, 'message': '成功', 'data': {}}
         # 连接数据库
         conn = psycopg2.connect(**db_config)
@@ -1273,7 +1242,6 @@ class Sf_Dashboard_Connect(http.Controller):
         time_threshold = datetime.now() - timedelta(days=1)
 
         alarm_last_24_time = 0.0
-        alarm_all_time = 0.0
 
         def fetch_result_as_dict(cursor):
             """辅助函数：将查询结果转为字典"""
@@ -1334,49 +1302,17 @@ class Sf_Dashboard_Connect(http.Controller):
                         alarm_last_24_time += float(result[0])
                     else:
                         alarm_last_24_time += 0.0
-
-            alarm_all_nums = []
-            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;
-                                    """, (item,))
-                results = cur.fetchall()
-                for result in results:
-                    alarm_all_nums.append(result[1])
-                    if result[0]:
-                        if float(result[0]) >= 1000:
-                            continue
-                        alarm_all_time += float(result[0])
-                    else:
-                        alarm_all_time += 0.0
-
-            # with conn.cursor() as cur:
-            #     cur.execute("""
-            #                 SELECT * FROM device_data
-            #                 WHERE device_name = %s
-            #                 AND total_count IS NOT NULL
-            #                 ORDER BY time ASC
-            #                 LIMIT 1;
-            #             """, (item, ))
-            #     total_count = fetch_result_as_dict(cur)
-
             # 返回数据
             res['data'][item] = {
                 'wait_time': last_all_time['run_time'] if last_all_time['run_time'] is not None else 0,
                 'cut_time': last_all_time['process_time'] if last_all_time['process_time'] is not None else 0,
-                'cut_24_time': last_24_time['process_time'] if last_24_time else 0,
+                'cut_24_time': last_24_time['process_time'] if last_24_time['process_time'] is not None else 0,
                 'power_on_time': last_all_time['power_on_time'] if last_all_time['power_on_time'] is not None else 0,
-                'power_on_24_time': last_24_time['power_on_time'] if last_24_time else 0,
+                'power_on_24_time': last_24_time['power_on_time'] if last_24_time['power_on_time'] is not None else 0,
                 'alarm_last_24_time': alarm_last_24_time,
                 'alarm_last_24_nums': len(list(set(alarm_last_24_nums))),
                 'idle_count': idle_count,
                 'first_online_time': first_online_duration,
-                'alarm_all_time': alarm_all_time,
-                'alarm_all_nums': len(list(set(alarm_all_nums)))
-                # 'total_count': total_count['total_count'] if total_count else 0
             }
 
         conn.close()

sf_machine_connect/models/ftp_client.py

@@ -217,7 +217,7 @@ class Machine_ftp(models.Model):
     status = fields.Boolean('机床在线状态', readonly=True)
     # run_status = fields.Selection([('0', '空闲中'), ('1', '加工中'), ('2', '加工中'), ('3', '加工中')], string='机床运行状态',
     #                               readonly=True, default='0')
-    # run_status = fields.Char('机床运行状态', readonly=True)
+    run_status = fields.Char('机床运行状态', readonly=True)
     run_time = fields.Char('机床累计运行时长', readonly=True)
     # 机床系统日期
     system_date = fields.Char('机床系统日期', readonly=True)

sf_machine_connect/views/WorkCenterBarcodes.xml

@@ -10,8 +10,6 @@
                 <searchpanel>
                     <field name="routing_type" select="multi" string="工序类型" icon="fa-building" enable_counters="1"/>
                     <field name="state" select="multi" string="状态" icon="fa-building" enable_counters="1"/>
-
-                    <field name="construction_period_status" select="multi"  icon="fa-building" enable_counters="1"/>
 <!--                    <field name="manual_quotation" select="multi" string="" icon="fa-building" enable_counters="1"/>-->
                 </searchpanel>
 

sf_maintenance/__init__.py

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

sf_maintenance/__manifest__.py

@@ -11,14 +11,12 @@
         'security/group_security.xml',
         'security/ir.model.access.csv',
         'security/ir_rule_data.xml',
-        'data/scheduled_actions.xml',
         'views/maintenance_logs_views.xml',
         'views/maintenance_equipment_oee_views.xml',
         'views/maintenance_views.xml',
         'views/equipment_maintenance_standards_views.xml',
         'views/maintenance_request_views.xml',
         'views/maintenance_equipment_category_views.xml',
-        'wizard/maintenance_request_wizard.xml',
     ],
     'installable': True,
     'application': False,

sf_maintenance/data/scheduled_actions.xml

@@ -1,14 +0,0 @@
-<odoo>
-    <data noupdate="1">
-        <record id="ir_cron_oee_get_running_datas" model="ir.cron">
-            <field name="name">设备运行数据</field>
-            <field name="model_id" ref="model_maintenance_equipment_oee"/>
-            <field name="state">code</field>
-            <field name="code">model.get_running_datas()</field>
-            <field name="interval_number">15</field>
-            <field name="interval_type">minutes</field>
-            <field name="numbercall">-1</field>
-            <field name="active" eval="True"/>
-        </record>
-    </data>
-</odoo>

sf_maintenance/models/sf_maintenance.py

@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
 import json
 import base64
-import logging
 from datetime import timedelta
 import requests
 from odoo.addons.sf_base.commons.common import Common
 from odoo import api, fields, models, _
-from odoo.exceptions import UserError, ValidationError
+from odoo.exceptions import UserError
 
 
 class SfMaintenanceEquipmentCategory(models.Model):
@@ -39,8 +38,6 @@ class SfMaintenanceEquipment(models.Model):
 
     crea_url = "/api/machine_tool/create"
 
-    run_status = fields.Char('机床运行状态', readonly=True)
-
     # AGV运行日志
     agv_logs = fields.One2many('maintenance.equipment.agv.log', 'equipment_id', string='AGV运行日志')
     # 1212修改后的字段
@@ -123,13 +120,6 @@ class SfMaintenanceEquipment(models.Model):
                                                            'sf_maintenance_equipment_ids', string='设备维保标准')
     eq_maintenance_id = fields.Many2one('equipment.maintenance.standards', string='设备保养标准',
                                         domain="[('maintenance_type','=','保养')]")
-
-    initial_action_date = fields.Date(string='重置保养日期')
-    initial_action_date_old = fields.Date(string='重置保养日期(旧)')
-    next_action_date = fields.Date(string='下次预防保养')
-
-    initial_overhaul_date = fields.Date(string='重置维修日期')
-    initial_overhaul_date_old = fields.Date(string='重置维修日期(旧)')
     overhaul_date = fields.Date(string='下次预防检修')
     overhaul_period = fields.Integer(string='预防检修频次')
     overhaul_duration = fields.Float(string='检修时长')
@@ -137,61 +127,6 @@ class SfMaintenanceEquipment(models.Model):
     overhaul_id = fields.Many2one('equipment.maintenance.standards', string='设备检修标准',
                                   domain="[('maintenance_type','=','检修')]")
 
-    def confirm_maintenance(self):
-        """
-        确认保养/检修
-        """
-        context = self.env.context
-        if context['type'] == '保养':
-            if not self.initial_action_date:
-                raise ValidationError('重置保养日期不能为空!!')
-            elif self.initial_action_date < fields.Date.today():
-                raise ValidationError('重置保养日期不能小于当前日期!!')
-        elif context['type'] == '检修':
-            if not self.initial_overhaul_date:
-                raise ValidationError('重置检修日期不能为空!!')
-            elif self.initial_overhaul_date < fields.Date.today():
-                raise ValidationError('重置检修日期不能小于当前日期!!')
-
-        request_ids = self.env['maintenance.request'].search([('stage_id.done', '=', False),
-                                                              ('equipment_id', '=', self.id),
-                                                              ('maintenance_type', '=', 'preventive'),
-                                                              ('sf_maintenance_type', '=', context['type'])])
-
-        if not request_ids:
-            return self.create_maintenance_request(context['type'])
-        else:
-            return {
-                "type": "ir.actions.act_window",
-                "res_model": "maintenance.request.wizard",
-                "views": [[False, "form"]],
-                "target": "new",
-                'context': {
-                    'equipment_id': self.id
-                }
-            }
-
-    def create_maintenance_request(self, maintenance_request_type):
-        """
-        根据条件创建维保计划
-        """
-        if maintenance_request_type == '保养':
-            self._create_new_request(self.initial_action_date + timedelta(days=self.period))
-            self.initial_action_date_old = self.initial_action_date
-        elif maintenance_request_type == '检修':
-            self._create_new_request1(self.initial_overhaul_date + timedelta(days=self.overhaul_period))
-            self.initial_overhaul_date_old = self.initial_overhaul_date
-        return {
-            'type': 'ir.actions.client',
-            'tag': 'display_notification',
-            'params': {
-                'title': f'创建{maintenance_request_type}计划',
-                'message': f'新{maintenance_request_type}维保计划创建成功',
-                'type': 'success',
-                'next': {'type': 'ir.actions.act_window_close'},
-            }
-        }
-
     @api.onchange('eq_maintenance_id', 'overhaul_id')
     def _compute_equipment_maintenance_standards_ids(self):
         for record in self:
@@ -654,13 +589,11 @@ class SfMaintenanceEquipment(models.Model):
                     ('equipment_id', '=', equipment.id),
                     ('sf_maintenance_type', '=', '保养'),
                     ('stage_id.done', '!=', True),
-                    ('active', '!=', False),
                     ('close_date', '=', False)], order="request_date asc", limit=1)
                 last_maintenance_done = self.env['maintenance.request'].search([
                     ('equipment_id', '=', equipment.id),
                     ('sf_maintenance_type', '=', '保养'),
                     ('stage_id.done', '=', True),
-                    ('active', '!=', False),
                     ('close_date', '!=', False)], order="close_date desc", limit=1)
                 if next_maintenance_todo and last_maintenance_done:
                     next_date = next_maintenance_todo.request_date
@@ -689,9 +622,7 @@ class SfMaintenanceEquipment(models.Model):
                     if next_date < date_now:
                         next_date = date_now
                 else:
-                    if not equipment.initial_action_date:
-                        raise ValidationError('重置保养日期不能为空!!!')
-                    next_date = equipment.initial_action_date + timedelta(days=equipment.period)
+                    next_date = equipment.effective_date + timedelta(days=equipment.period)
                 equipment.next_action_date = next_date
         else:
             self.next_action_date = False
@@ -702,13 +633,11 @@ class SfMaintenanceEquipment(models.Model):
                     ('equipment_id', '=', equipment.id),
                     ('sf_maintenance_type', '=', '检修'),
                     ('stage_id.done', '!=', True),
-                    ('active', '!=', False),
                     ('close_date', '=', False)], order="request_date asc", limit=1)
                 last_maintenance_done = self.env['maintenance.request'].search([
                     ('equipment_id', '=', equipment.id),
                     ('sf_maintenance_type', '=', '检修'),
                     ('stage_id.done', '=', True),
-                    ('active', '!=', False),
                     ('close_date', '!=', False)], order="close_date desc", limit=1)
                 if next_maintenance_todo and last_maintenance_done:
                     next_date = next_maintenance_todo.request_date
@@ -737,9 +666,7 @@ class SfMaintenanceEquipment(models.Model):
                     if next_date < date_now:
                         next_date = date_now
                 else:
-                    if not equipment.initial_overhaul_date:
-                        raise ValidationError('重置维修日期不能为空')
-                    next_date = equipment.initial_overhaul_date + timedelta(days=equipment.overhaul_period)
+                    next_date = equipment.effective_date + timedelta(days=equipment.overhaul_period)
                 equipment.overhaul_date = next_date
         else:
             self.overhaul_date = False
@@ -806,7 +733,6 @@ class SfMaintenanceEquipment(models.Model):
             next_requests = self.env['maintenance.request'].search([('stage_id.done', '=', False),
                                                                     ('equipment_id', '=', equipment.id),
                                                                     ('maintenance_type', '=', 'preventive'),
-                                                                    ('active', '=', True),
                                                                     ('request_date', '=', equipment.next_action_date),
                                                                     ('sf_maintenance_type', '=', '保养')])
             if not next_requests:
@@ -815,7 +741,6 @@ class SfMaintenanceEquipment(models.Model):
             next_requests = self.env['maintenance.request'].search([('stage_id.done', '=', False),
                                                                     ('equipment_id', '=', equipment.id),
                                                                     ('maintenance_type', '=', 'preventive'),
-                                                                    ('active', '=', True),
                                                                     ('request_date', '=', equipment.overhaul_date),
                                                                     ('sf_maintenance_type', '=', '检修')])
             if not next_requests:

sf_maintenance/models/sf_maintenance_oee.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import re
 import json
-import logging
 import datetime
 import requests
 from odoo import api, fields, models, _
@@ -13,8 +12,6 @@ def convert_to_seconds(time_str):
 
     if time_str is None:
         return 0
-    if time_str == 0:
-        return 0
 
     pattern = r"(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?"
 
@@ -63,22 +60,22 @@ class SfMaintenanceEquipmentOEE(models.Model):
          ("封存(报废)", "封存(报废)")],
         default='正常', string="机床状态", related='equipment_id.state')
 
-    online_time = fields.Char('开机时长(小时)', readonly='True')
+    online_time = fields.Char('开机时长(小时)', reaonly='True')
 
-    offline_time = fields.Char('关机时长(小时)', readonly='True')
-    idle_nums = fields.Integer('待机次数', readonly='True')
+    offline_time = fields.Char('关机时长(小时)', reaonly='True')
+    idle_nums = fields.Integer('待机次数', reaonly='True')
     # 待机时长
 
-    idle_time = fields.Char('待机时长(小时)', readonly='True')
+    idle_time = fields.Char('待机时长(小时)', reaonly='True')
 
     # 待机率
-    idle_rate = fields.Char('待机率(%)', readonly='True')
+    idle_rate = fields.Char('待机率(%)', reaonly='True')
 
-    work_time = fields.Char('加工时长(小时)', readonly='True')
-    work_rate = fields.Char('可用率(%)', readonly='True')
-    fault_time = fields.Char('故障时长(小时)', readonly='True')
-    fault_rate = fields.Char('故障率(%)', readonly='True')
-    fault_nums = fields.Integer('故障次数', readonly='True')
+    work_time = fields.Char('加工时长(小时)', reaonly='True')
+    work_rate = fields.Char('可用率(%)', reaonly='True')
+    fault_time = fields.Char('故障时长(小时)', reaonly='True')
+    fault_rate = fields.Char('故障率(%)', reaonly='True')
+    fault_nums = fields.Integer('故障次数', reaonly='True')
 
     # 设备故障日志
     sf_maintenance_logs_ids = fields.One2many('sf.maintenance.logs', 'maintenance_equipment_oee_id', '设备故障日志',
@@ -89,76 +86,6 @@ class SfMaintenanceEquipmentOEE(models.Model):
     begin_time = fields.Date('开始时间')
     end_time = fields.Date('结束时间')
 
-    def get_running_datas(self):
-        base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
-        logging.info("base_url=============:%s" % base_url)
-        # 只有当原始 URL 使用 http 时才替换为 https
-        if base_url.startswith("http://"):
-            secure_base_url = base_url.replace("http://", "https://")
-        else:
-            secure_base_url = base_url
-        url_time = secure_base_url + '/api/RunningTimeDetail'
-        logging.info("url_time=============:%s" % url_time)
-        cnc_list_obj = self.env['maintenance.equipment'].sudo().search(
-            [('function_type', '!=', False), ('active', '=', True)])
-        machine_list = list(map(lambda x: x.code, cnc_list_obj))
-        logging.info("machine_list=============:%s" % machine_list)
-
-        data_time = {
-            "machine_list": str(machine_list)
-        }
-        # 发送POST请求
-        response_time = requests.post(url_time, json={}, data=data_time)
-        # print(response_time.json())
-        if response_time.status_code == 200:
-            result_time = response_time.json()
-            if result_time['status'] == 1:
-                real_dict = result_time['data']
-                for key in real_dict:
-                    # print(key)
-                    equipment_obj = self.env['maintenance.equipment.oee'].sudo().search([('equipment_code', '=', key)])
-                    if real_dict[key]['power_on_time'] == 0:
-                        equipment_obj.online_time = 0
-                        equipment_obj.idle_time = 0
-                        equipment_obj.idle_rate = 0
-                        equipment_obj.work_rate = 0
-                        equipment_obj.fault_time = 0
-                        equipment_obj.fault_rate = 0
-                        equipment_obj.fault_nums = 0
-                        equipment_obj.idle_nums = 0
-                        equipment_obj.work_time = 0
-                    else:
-                        equipment_obj.online_time = round(convert_to_seconds(real_dict[key]['power_on_time']) / 3600, 2)
-                        equipment_obj.work_time = round(convert_to_seconds(real_dict[key]['cut_time']) / 3600, 2)
-                        equipment_obj.fault_nums = real_dict[key]['alarm_all_nums']
-                        equipment_obj.idle_nums = real_dict[key]['idle_count']
-                        equipment_obj.fault_time = round((float(real_dict[key]['alarm_all_time']) if real_dict[key][
-                            'alarm_all_time'] else 0) / 3600, 2)
-                        equipment_obj.idle_time = float(equipment_obj.online_time) - float(
-                            equipment_obj.work_time) if equipment_obj.online_time and equipment_obj.work_time else 0
-                        equipment_obj.idle_rate = round(
-                            float(equipment_obj.idle_time) / (
-                                float(equipment_obj.online_time) if equipment_obj.online_time else 1) * 100, 2)
-                        equipment_obj.work_rate = round(
-                            float(equipment_obj.work_time) / (
-                                float(equipment_obj.online_time) if equipment_obj.online_time else 1) * 100, 2)
-
-                        equipment_obj.fault_rate = round(
-                            float(equipment_obj.fault_time) / (
-                                float(equipment_obj.online_time) if equipment_obj.online_time else 1) * 100, 2)
-
-                    # 获取当前时间的时间戳
-                    current_timestamp = datetime.datetime.now().timestamp()
-                    # 机床上线时间段
-                    first_online_duration = current_timestamp - int(equipment_obj.equipment_id.first_online_time.timestamp())
-
-                    if equipment_obj.online_time:
-                        equipment_obj.offline_time = round((first_online_duration - float(equipment_obj.online_time)) / 3600, 2)
-                    else:
-                        equipment_obj.offline_time = False
-                    # equipment_obj.offline_time = equipment_obj.equipment_id.first_online_time - (
-                    #     float(equipment_obj.online_time) if equipment_obj.online_time else 0)
-
     # 获取日志详情
     def get_day_logs(self):
         base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
@@ -195,36 +122,24 @@ class SfMaintenanceEquipmentOEE(models.Model):
             real_dict = result_time['data'][self.equipment_code]
             print('=', result_time)
             if result_time['status'] == 1:
-                if real_dict['power_on_24_time'] == 0:
-                    self.online_time = 0
-                    self.idle_time = 0
-                    self.idle_rate = 0
-                    self.work_rate = 0
-                    self.fault_time = 0
-                    self.fault_rate = 0
-                    self.fault_nums = 0
-                    self.idle_nums = 0
-                    self.work_time = 0
-                else:
-                    self.online_time = round((convert_to_seconds(real_dict['power_on_time']) - convert_to_seconds(
-                        real_dict['power_on_24_time'])) / 3600, 2)
-                    self.idle_time = float(self.online_time) - float(
-                        self.work_time) if self.online_time and self.work_time else 0
-                    self.idle_rate = round(
-                        float(self.idle_time) / (float(self.online_time) if self.online_time else 1) * 100, 2)
-                    self.work_rate = round(
-                        float(self.work_time) / (float(self.online_time) if self.online_time else 1) * 100, 2)
-                    self.fault_time = (float(real_dict['alarm_last_24_time']) if real_dict[
-                        'alarm_last_24_time'] else 0) / 3600
-                    self.fault_rate = round(
-                        float(self.fault_time) / (float(self.online_time) if self.online_time else 1) * 100, 2)
-                    self.fault_nums = real_dict['alarm_last_24_nums']
-                    self.idle_nums = real_dict['idle_count']
-                    self.work_time = round(
-                        (convert_to_seconds(real_dict['cut_time']) - convert_to_seconds(
-                            real_dict['cut_24_time'])) / 3600,
-                        2)
+                self.online_time = round((convert_to_seconds(real_dict['power_on_time']) - convert_to_seconds(
+                    real_dict['power_on_24_time'])) / 3600, 2)
+                self.work_time = round(
+                    (convert_to_seconds(real_dict['cut_time']) - convert_to_seconds(real_dict['cut_24_time'])) / 3600,
+                    2)
                 self.offline_time = 24 - (float(self.online_time) if self.online_time else 0)
+                self.idle_time = float(self.online_time) - float(
+                    self.work_time) if self.online_time and self.work_time else 0
+                self.idle_rate = round(
+                    float(self.idle_time) / (float(self.online_time) if self.online_time else 1) * 100, 2)
+                self.work_rate = round(
+                    float(self.work_time) / (float(self.online_time) if self.online_time else 1) * 100, 2)
+                self.fault_time = (float(real_dict['alarm_last_24_time']) if real_dict[
+                    'alarm_last_24_time'] else 0) / 3600
+                self.fault_rate = round(
+                    float(self.fault_time) / (float(self.online_time) if self.online_time else 1) * 100, 2)
+                self.fault_nums = real_dict['alarm_last_24_nums']
+                self.idle_nums = real_dict['idle_count']
 
         if response.status_code == 200:
             result = response.json()
@@ -375,25 +290,25 @@ class SfMaintenanceEquipmentOEELog(models.Model):
         [("ZXJGZX", "钻铣加工中心"), ("CXJGZX", "车削加工中心"), ("FHJGZX", "复合加工中心")],
         default="", string="功能类型")
     machine_tool_picture = fields.Binary('设备图片')
-    type_id = fields.Many2one('sf.machine_tool.type', '品牌型号', readonly='True')
+    type_id = fields.Many2one('sf.machine_tool.type', '品牌型号', reaonly='True')
     state = fields.Selection([("加工", "加工"), ("关机", "关机"), ("待机", "待机"), ("故障", "故障"),
                               ("检修", "检修"), ("保养", "保养")], default="", string="实时状态")
-    online_time = fields.Char('开机时长', readonly='True')
+    online_time = fields.Char('开机时长', reaonly='True')
 
-    offline_time = fields.Char('关机时长', readonly='True')
-    offline_nums = fields.Integer('关机次数', readonly='True')
+    offline_time = fields.Char('关机时长', reaonly='True')
+    offline_nums = fields.Integer('关机次数', reaonly='True')
     # 待机时长
 
-    idle_time = fields.Char('待机时长', readonly='True')
+    idle_time = fields.Char('待机时长', reaonly='True')
 
     # 待机率
-    idle_rate = fields.Char('待机率', readonly='True')
+    idle_rate = fields.Char('待机率', reaonly='True')
 
-    work_time = fields.Char('加工时长', readonly='True')
-    work_rate = fields.Char('可用率', readonly='True')
-    fault_time = fields.Char('故障时长', readonly='True')
-    fault_rate = fields.Char('故障率', readonly='True')
-    fault_nums = fields.Integer('故障次数', readonly='True')
+    work_time = fields.Char('加工时长', reaonly='True')
+    work_rate = fields.Char('可用率', reaonly='True')
+    fault_time = fields.Char('故障时长', reaonly='True')
+    fault_rate = fields.Char('故障率', reaonly='True')
+    fault_nums = fields.Integer('故障次数', reaonly='True')
 
     detail_ids = fields.One2many('maintenance.equipment.oee.log.detail', 'log_id', string='日志详情')
 

sf_maintenance/models/sf_maintenance_requests.py

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

sf_maintenance/security/ir.model.access.csv

@@ -20,12 +20,7 @@ access_maintenance_equipment_agv_log,maintenance_equipment_agv_log,model_mainten
 
 
 
-access_maintenance_system_user,equipment.request system user,maintenance.model_maintenance_request,base.group_user,1,1,1,0
-access_maintenance_wizard_system_user,maintenance.request.wizard system user,model_maintenance_request_wizard,base.group_user,1,1,1,0
-access_maintenance_sf_group_equipment_user,equipment.request_sf_group_equipment_user,maintenance.model_maintenance_request,sf_group_equipment_user,1,1,1,0
-access_maintenance_wizard_sf_group_equipment_user,maintenance_wizard_sf_group_equipment_user,model_maintenance_request_wizard,sf_group_equipment_user,1,1,1,0
-access_maintenance_sf_group_equipment_manager,equipment.request_sf_group_equipment_manager,maintenance.model_maintenance_request,sf_group_equipment_manager,1,1,1,0
-access_maintenance_wizard_sf_group_equipment_manager,maintenance_wizard_sf_group_equipment_manager,model_maintenance_request_wizard,sf_group_equipment_manager,1,1,1,0
+access_maintenance_system_user,equipment.request system user,maintenance.model_maintenance_request,base.group_user,1,0,0,0
 
 access_maintenance_equipment_group_plan_dispatch,maintenance.equipment,maintenance.model_maintenance_equipment,sf_base.group_plan_dispatch,1,0,0,0
 access_maintenance_equipment_oee_group_plan_dispatch,maintenance_equipment_oee,model_maintenance_equipment_oee,sf_base.group_plan_dispatch,1,0,0,0

sf_maintenance/views/maintenance_equipment_oee_views.xml

@@ -79,12 +79,12 @@
                             </group>
 
                         </group>
-<!--                         <notebook> -->
-<!--                         <page string="24H日志详情"> -->
-<!--                             <group> -->
-<!--                                 <button name="get_day_logs" type="object" string="查看24H日志" t-attf-style="white-space:nowrap;"/> -->
-<!--                             </group> -->
-<!--                             <field name="day_logs_detail" readonly="1" widget="html"/> -->
+                        <notebook>
+                        <page string="24H日志详情">
+                            <group>
+                                <button name="get_day_logs" type="object" string="查看24H日志" t-attf-style="white-space:nowrap;"/>
+                            </group>
+                            <field name="day_logs_detail" readonly="1" widget="html"/>
 <!--                             <field name="page_num"/> -->
 <!--                             <group> -->
 <!--                                 <group> -->
@@ -109,7 +109,7 @@
 <!--                                     </div> -->
 <!--                                 </div> -->
 <!--                             </group> -->
-<!--                         </page> -->
+                        </page>
 <!--                         <page string="历史日志详情"> -->
 <!--                             <group> -->
 <!--                                 <group> -->
@@ -132,7 +132,7 @@
 <!--                             </group> -->
 <!--                             <field name="history_logs_detail"/> -->
 <!--                         </page> -->
-<!--                     </notebook> -->
+                    </notebook>
                     </sheet>
                 </form>
             </field>

sf_maintenance/views/maintenance_request_views.xml

@@ -76,61 +76,33 @@
                 <field name="equipment_maintenance_id"/>
 
             </xpath>
-            <xpath expr="//field[@name='user_id']" position="replace">
-                <field name="user_id" string="维保人"/>
-            </xpath>
-            <xpath expr="//field[@name='close_date']" position="replace">
-                <field name="close_date" attrs="{'invisible': [('done', '!=', True)]}" readonly="True"
-                       string="维保日期"/>
-            </xpath>
-
-            <xpath expr="//field[@name='request_date']" position="attributes">
-                <attribute name="string">计划维保日期</attribute>
-            </xpath>
+             <xpath expr="//field[@name='user_id']" position="replace">
+                      <field name="user_id" string="维保人"/>
+                 </xpath>
+                <xpath expr="//field[@name='close_date']" position="replace">
+                      <field name="close_date" attrs="{'invisible': [('done', '!=', True)]}" readonly="True" string="维保日期"/>
+                 </xpath>
 
             <sheet>
 
                 <notebook>
-                    <page string="维保标准" attrs="{'invisible': [('equipment_maintenance_id', '=', False)]}"
-                          context="{'default_standard_id': 'id'}">
+                    <page string="维保标准" attrs="{'invisible': [('equipment_maintenance_id', '=', False)]}" context="{'default_standard_id': 'id'}">
                         <field name="maintenance_standards" widget="one2many_list">
                             <tree multi_edit="" editable="">
-                                <field name="name" class="table_custom_required"/>
-                                <field name="maintenance_standards" class="table_custom_required"/>
-                                <field name="images" force_save="1" required="1" class="table_custom_required">
+                                <field name="name"  class="table_custom_required"/>
+                                <field name="maintenance_standards"  class="table_custom_required"/>
+                                <field name="images" force_save="1" required="1"  class="table_custom_required">
                                 </field>
                                 <field name="remark" class="table_custom_required"/>
                             </tree>
                         </field>
                     </page>
                 </notebook>
+
+
             </sheet>
-        </field>
-    </record>
 
-    <record id="maintenance_request_view_tree_sf" model="ir.ui.view">
-        <field name="name">maintenance.request.view.tree.sf</field>
-        <field name="model">maintenance.request</field>
-        <field name="inherit_id" ref="maintenance.hr_equipment_request_view_tree"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='request_date']" position="replace">
-                <field name="request_date" string="计划维保日期"/>
-            </xpath>
-            <xpath expr="//field[@name='user_id']" position="after">
-                <field name="sf_maintenance_type"/>
-            </xpath>
-        </field>
-    </record>
 
-    <record id="equipment_request_view_search_sf" model="ir.ui.view">
-        <field name="name">maintenance.request.view.search.sf</field>
-        <field name="model">maintenance.request</field>
-        <field name="inherit_id" ref="maintenance.hr_equipment_request_view_search"/>
-        <field name="arch" type="xml">
-            <xpath expr="//filter[@name='inactive']" position="replace">
-                <filter string="不活跃的" name="inactive" domain="[('archive', '=', True)]"/>
-                <filter string="已归档" name="in_active" domain="[('active', '=', False)]"/>
-            </xpath>
         </field>
     </record>
 
@@ -138,8 +110,8 @@
     <record id="hr_equipment_request_action1" model="ir.actions.act_window">
         <field name="name">维保计划</field>
         <field name="res_model">maintenance.request</field>
-        <field name="view_mode">tree,kanban,form,pivot,graph,calendar</field>
-        <field name="view_id" ref="sf_maintenance.maintenance_request_view_tree_sf"/>
+        <field name="view_mode">kanban,tree,form,pivot,graph,calendar</field>
+        <field name="view_id" ref="maintenance.hr_equipment_request_view_kanban"/>
         <field name="context">{'default_user_id': uid}</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">

sf_maintenance/views/maintenance_views.xml

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

sf_maintenance/wizard/__init__.py

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

sf_maintenance/wizard/maintenance_request_wizard.py

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

sf_maintenance/wizard/maintenance_request_wizard.xml

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

sf_manufacturing/__manifest__.py

@@ -10,9 +10,8 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse','jikimo_attachment_viewer', 'jikimo_sale_multiple_supply_methods'],
+    'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse'],
     'data': [
-        'data/cron_data.xml',
         'data/stock_data.xml',
         'data/empty_racks_data.xml',
         'data/panel_data.xml',
@@ -22,8 +21,6 @@
         'wizard/workpiece_delivery_views.xml',
         'wizard/rework_wizard_views.xml',
         'wizard/production_wizard_views.xml',
-        'wizard/production_technology_wizard_views.xml',
-        'wizard/production_technology_re_adjust_wizard_views.xml',
         'views/mrp_views_menus.xml',
         'views/agv_scheduling_views.xml',
         'views/stock_lot_views.xml',
@@ -32,7 +29,6 @@
         'views/production_line_view.xml',
         'views/mrp_workcenter_views.xml',
         'views/mrp_workorder_view.xml',
-        'views/stock_picking_view.xml',
         'views/model_type_view.xml',
         'views/agv_setting_views.xml',
         'views/sf_maintenance_equipment.xml',
@@ -49,8 +45,6 @@
             'sf_manufacturing/static/src/scss/kanban_change.scss',
             'sf_manufacturing/static/src/xml/button_show_on_tree.xml',
             'sf_manufacturing/static/src/js/workpiece_delivery_wizard_confirm.js',
-            'sf_manufacturing/static/src/js/qr.js',
-            'sf_manufacturing/static/src/xml/qr.xml',
         ]
 
     },

sf_manufacturing/controllers/controllers.py

@@ -189,7 +189,6 @@ class Manufacturing_Connect(http.Controller):
                 request.env['sf.production.plan'].sudo().search([('production_id', '=', production_id)]).write(
                     {'actual_start_time': workorder.date_start,
                      'state': 'processing'})
-            res.update({'workorder_id': workorder.id})
 
         except Exception as e:
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
@@ -596,6 +595,14 @@ class Manufacturing_Connect(http.Controller):
                                                 if panel_workorder:
                                                     panel_workorder.write({'production_line_state': '已下产线'})
                                                     workorder.write({'state': 'to be detected'})
+                                                # workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
+                                                #     [
+                                                #         ('rfid_code', '=', rfid_code), ('type', '=', '下产线'),
+                                                #         ('production_id', '=', order.production_id.id),
+                                                #         ('workorder_id', '=', order.id),
+                                                #         ('workorder_state', '=', 'done')])
+                                                # if workpiece_delivery:
+                                                #     delivery_Arr.append(workpiece_delivery.id)
                                     else:
                                         res = {'Succeed': False, 'ErrorCode': 204,
                                                'Error': 'DeviceId为%s没有对应的已配送工件数据' % ret['DeviceId']}

sf_manufacturing/data/cron_data.xml

@@ -1,29 +0,0 @@
-<odoo>
-    <data noupdate="1">
-        <record model="ir.cron" id="ir_cron_update_construction_period_status">
-            <field name="name">工期状态变更</field>
-            <field name="model_id" ref="model_mrp_workorder"/>
-            <field name="state">code</field>
-            <field name="code">model._corn_update_construction_period_status()</field>
-            <field name="interval_number">12</field>
-            <field name="interval_type">hours</field>
-            <field name="numbercall">-1</field>
-            <field name="doall" eval="False"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="active" eval="True"/>
-        </record>
-
-        <record model="ir.cron" id="ir_cron_update_delivery_status">
-            <field name="name">交期状态变更</field>
-            <field name="model_id" ref="model_mrp_production"/>
-            <field name="state">code</field>
-            <field name="code">model._corn_update_delivery_status()</field>
-            <field name="interval_number">12</field>
-            <field name="interval_type">hours</field>
-            <field name="numbercall">-1</field>
-            <field name="doall" eval="False"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="active" eval="True"/>
-        </record>
-    </data>
-</odoo>

sf_manufacturing/models/__init__.py

@@ -11,5 +11,3 @@ from . import production_line_base
 from . import agv_setting
 from . import agv_scheduling
 from . import res_config_setting
-from . import sf_technology_design
-from . import sf_production_common

sf_manufacturing/models/model_type.py

@@ -6,29 +6,42 @@ class ModelType(models.Model):
     _description = '模型类型'
 
     name = fields.Char('名称')
-    # embryo_tolerance = fields.Char('坯料容余')
-    embryo_tolerance_id = fields.Many2one('sf.embryo.redundancy', string='坯料容余')
+    embryo_tolerance = fields.Integer('坯料容余')
     product_routing_tmpl_ids = fields.One2many('sf.product.model.type.routing.sort', 'product_model_type_id',
-                                               '成品工序模板（自动化产线加工')
+                                               '成品工序模板')
     embryo_routing_tmpl_ids = fields.One2many('sf.embryo.model.type.routing.sort', 'embryo_model_type_id',
-                                              '坯料工序模板（人工线下加工）')
+                                              '坯料工序模板')
     surface_technics_routing_tmpl_ids = fields.One2many('sf.surface_technics.model.type.routing.sort',
                                                         'surface_technics_model_type_id',
                                                         '表面工艺工序模板')
-    manual_product_routing_tmpl_ids = fields.One2many('sf.manual.product.model.type.routing.sort',
-                                                       'manual_product_model_type_id',
-                                                       '成品工序模板（人工线下加工）')
 
 
 class ProductModelTypeRoutingSort(models.Model):
     _name = 'sf.product.model.type.routing.sort'
-    _description = '成品工序排序（自动化产线加工）'
+    _description = '成品工序排序'
 
     sequence = fields.Integer('Sequence')
     route_workcenter_id = fields.Many2one('mrp.routing.workcenter',
                                           domain=[('routing_type', 'in', ['装夹预调', 'CNC加工', '解除装夹'])])
     is_repeat = fields.Boolean('重复', related='route_workcenter_id.is_repeat')
+
+    # routing_type = fields.Selection([
+    #     ('获取CNC加工程序', '获取CNC加工程序'),
+    #     ('装夹', '装夹'),
+    #     ('前置三元定位检测', '前置三元定位检测'),
+    #     ('CNC加工', 'CNC加工'),
+    #     ('后置三元质量检测', '后置三元质量检测'),
+    #     ('解除装夹', '解除装夹'), ('切割', '切割'), ('表面工艺', '表面工艺')
+    # ], string="工序类型", compute='_compute_route_workcenter_id')
+    #
+    # @api.depends('route_workcenter_id')
+    # def _compute_route_workcenter_id(self):
+    #     for record in self:
+    #         if record:
+    #             record.routing_type = record.route_workcenter_id.routing_type
+
     routing_type = fields.Selection(string="工序类型", related='route_workcenter_id.routing_type')
+
     workcenter_ids = fields.Many2many('mrp.workcenter', required=False, related='route_workcenter_id.workcenter_ids')
     product_model_type_id = fields.Many2one('sf.model.type')
 
@@ -44,7 +57,24 @@ class EmbryoModelTypeRoutingSort(models.Model):
     sequence = fields.Integer('Sequence')
     route_workcenter_id = fields.Many2one('mrp.routing.workcenter', domain=[('routing_type', 'in', ['切割'])])
     is_repeat = fields.Boolean('重复', related='route_workcenter_id.is_repeat')
+
+    # routing_type = fields.Selection([
+    #     ('获取CNC加工程序', '获取CNC加工程序'),
+    #     ('装夹', '装夹'),
+    #     ('前置三元定位检测', '前置三元定位检测'),
+    #     ('CNC加工', 'CNC加工'),
+    #     ('后置三元质量检测', '后置三元质量检测'),
+    #     ('解除装夹', '解除装夹'), ('切割', '切割'), ('表面工艺', '表面工艺')
+    # ], string="工序类型", compute='_compute_route_workcenter_id')
+    #
+    # @api.depends('route_workcenter_id')
+    # def _compute_route_workcenter_id(self):
+    #     for record in self:
+    #         if record:
+    #             record.routing_type = record.route_workcenter_id.routing_type
+
     routing_type = fields.Selection(string="工序类型", related='route_workcenter_id.routing_type')
+
     workcenter_ids = fields.Many2many('mrp.workcenter', required=False, related='route_workcenter_id.workcenter_ids')
     embryo_model_type_id = fields.Many2one('sf.model.type')
 
@@ -60,7 +90,24 @@ class SurfaceTechnicsModelTypeRoutingSort(models.Model):
     sequence = fields.Integer('Sequence')
     route_workcenter_id = fields.Many2one('mrp.routing.workcenter', domain=[('routing_type', 'in', ['表面工艺'])])
     is_repeat = fields.Boolean('重复', related='route_workcenter_id.is_repeat')
+
+    # routing_type = fields.Selection([
+    #     ('获取CNC加工程序', '获取CNC加工程序'),
+    #     ('装夹', '装夹'),
+    #     ('前置三元定位检测', '前置三元定位检测'),
+    #     ('CNC加工', 'CNC加工'),
+    #     ('后置三元质量检测', '后置三元质量检测'),
+    #     ('解除装夹', '解除装夹'), ('切割', '切割'), ('表面工艺', '表面工艺')
+    # ], string="工序类型", compute='_compute_route_workcenter_id')
+    #
+    # @api.depends('route_workcenter_id')
+    # def _compute_route_workcenter_id(self):
+    #     for record in self:
+    #         if record:
+    #             record.routing_type = record.route_workcenter_id.routing_type
+
     routing_type = fields.Selection(string="工序类型", related='route_workcenter_id.routing_type')
+
     workcenter_ids = fields.Many2many('mrp.workcenter', required=False, related='route_workcenter_id.workcenter_ids')
     surface_technics_model_type_id = fields.Many2one('sf.model.type')
 
@@ -69,18 +116,3 @@ class SurfaceTechnicsModelTypeRoutingSort(models.Model):
             'route_model_type_uniq', 'unique (route_workcenter_id,surface_technics_model_type_id)',
             '表面工艺工序不能重复!')
     ]
-
-class ManualProductModelTypeRoutingSort(models.Model):
-    _name = 'sf.manual.product.model.type.routing.sort'
-    _description = '成品工序排序（人工线下加工）'
-
-    sequence = fields.Integer('Sequence')
-    route_workcenter_id = fields.Many2one('mrp.routing.workcenter')
-    is_repeat = fields.Boolean('重复', related='route_workcenter_id.is_repeat')
-    routing_type = fields.Selection(string="工序类型", related='route_workcenter_id.routing_type')
-    workcenter_ids = fields.Many2many('mrp.workcenter', required=False, related='route_workcenter_id.workcenter_ids')
-    manual_product_model_type_id = fields.Many2one('sf.model.type')
-
-    _sql_constraints = [
-        ('route_model_type_uniq', 'unique (route_workcenter_id,manual_product_model_type_id)', '成品工序不能重复!')
-    ]

sf_manufacturing/models/mrp_production.py

@@ -18,7 +18,7 @@ class MrpProduction(models.Model):
     _inherit = 'mrp.production'
     _description = "制造订单"
     _order = 'create_date desc'
-    deadline_of_delivery = fields.Date('订单交期', tracking=True, compute='_compute_deadline_of_delivery')
+
     # tray_ids = fields.One2many('sf.tray', 'production_id', string="托盘")
     maintenance_count = fields.Integer(compute='_compute_maintenance_count', string="Number of maintenance requests")
     request_ids = fields.One2many('maintenance.request', 'production_id')
@@ -34,118 +34,6 @@ class MrpProduction(models.Model):
     tool_state_remark = fields.Text(string='功能刀具状态备注(缺刀)', compute='_compute_tool_state_remark', store=True)
     tool_state_remark2 = fields.Text(string='功能刀具状态备注(无效刀)', readonly=True)
 
-    @api.depends('procurement_group_id.mrp_production_ids.move_dest_ids.group_id.sale_id')
-    def _compute_deadline_of_delivery(self):
-        for production in self:
-            # 确保 procurement_group_id 和相关字段存在
-            if production.procurement_group_id:
-                # 获取相关的 sale_id
-                sale_order_id = production.procurement_group_id.mrp_production_ids.mapped(
-                    'move_dest_ids.group_id.sale_id')
-
-                # 确保 sale_order_id 是有效的 ID 列表
-                if sale_order_id:
-                    # 获取 sale.order 记录
-                    sale_id = self.env['sale.order'].sudo().browse(sale_order_id.ids)  # 使用 mapped 返回的 ID 列表
-
-                    # 处理 sale_id
-                    if sale_id:
-                        # 假设我们只需要第一个 sale_id
-                        production.deadline_of_delivery = sale_id[0].deadline_of_delivery if sale_id else False
-                else:
-                    production.deadline_of_delivery = False
-            else:
-                production.deadline_of_delivery = False
-
-    def _compute_default_delivery_status(self):
-        try:
-            if self.state == 'cancel':
-                return False
-            if not self.deadline_of_delivery:
-                return False
-            hours = self.get_hours_diff()
-            if hours >= 48:
-                return '正常'
-            elif hours > 0 and hours < 48 and self.state != 'done':
-                return '预警'
-            elif hours > 0 and hours < 48 and self.state == 'done':
-                return '正常'
-            else:
-                return '已逾期'
-        except Exception as e:
-            logging.error("Error processing production ID {}: {}".format(self.id, e))
-            raise e
-
-    @api.depends('state', 'deadline_of_delivery')
-    def _compute_delivery_status(self):
-        for production in self:
-            delivery_status = production._compute_default_delivery_status()
-            if delivery_status and production.delivery_status != delivery_status:
-                production.delivery_status = delivery_status
-
-    delivery_status = fields.Selection([('正常', '正常'), ('预警', '预警'), ('已逾期', '已逾期')], string='交期状态',
-                                       store=True,
-                                       compute='_compute_delivery_status',
-                                       default=lambda self: self._compute_default_delivery_status())
-
-    def get_page_all_records(self, model_name, func, domain, page_size=100):
-        # 获取模型对象
-        model = self.env[model_name].sudo()
-
-        # 初始化分页参数
-        page_number = 1
-        while True:
-            # 计算偏移量
-            offset = (page_number - 1) * page_size
-
-            # 获取当前页的数据
-            records = model.search(domain, limit=page_size, offset=offset)
-
-            # 如果没有更多记录，退出循环
-            if not records:
-                break
-
-            # 将当前页的数据添加到结果列表
-            func(records)
-            # 增加页码
-            page_number += 1
-
-    def run_compute_delivery_status(self, records):
-        records._compute_delivery_status()
-
-    def _corn_update_delivery_status(self):
-        need_list = [
-            'draft',
-            'technology_to_confirmed',
-            'confirmed',
-            'pending_cam',
-            'progress',
-            'rework',
-            'scrap',
-            'to_close',
-        ]
-        # previous_workorder = self.env['mrp.production'].search([('state', 'in', need_list)])
-        self.get_page_all_records('mrp.production', self.run_compute_delivery_status,
-                                  [('state', 'in', need_list)], 100)
-
-    def get_hours_diff(self):
-        # 获取当前日期和时间
-        current_datetime = fields.Datetime.now()
-
-        # 将 date_field 转换为 datetime 对象
-        if self.deadline_of_delivery:
-            date_obj = fields.Date.from_string(self.deadline_of_delivery)
-            # 将 date 对象转换为 datetime 对象，设置时间为 00:00:00
-            date_obj = datetime.datetime.combine(date_obj, datetime.time.min)
-
-            # 计算两个日期之间的差值
-            delta = date_obj - current_datetime
-
-            # 返回差值的小时数
-            return int(delta.total_seconds() / 3600)
-        else:
-            return 0.0
-
     @api.depends('workorder_ids.tool_state_remark')
     def _compute_tool_state_remark(self):
         for item in self:
@@ -187,7 +75,6 @@ class MrpProduction(models.Model):
     # ])
     state = fields.Selection([
         ('draft', '草稿'),
-        ('technology_to_confirmed', '待工艺确认'),
         ('confirmed', '待排程'),
         ('pending_cam', '待加工'),
         ('progress', '加工中'),
@@ -231,14 +118,10 @@ class MrpProduction(models.Model):
     ], string='工序状态', default='待装夹')
 
     # 零件图号
-    part_number = fields.Char('零件图号', related='product_id.part_number', readonly=True)
+    part_number = fields.Char('零件图号')
 
     # 上传零件图纸
-    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_drawing = fields.Binary('零件图纸')
 
     @api.depends('product_id.manual_quotation')
     def _compute_manual_quotation(self):
@@ -250,8 +133,6 @@ class MrpProduction(models.Model):
     is_remanufacture = fields.Boolean('是否重新制造', default=False)
     remanufacture_count = fields.Integer("重新制造订单数量", compute='_compute_remanufacture_production_ids')
     remanufacture_production_id = fields.Many2one('mrp.production', string='')
-    technology_design_ids = fields.One2many('sf.technology.design', 'production_id', string='工艺设计')
-    is_adjust = fields.Boolean('是否退回调整', default=False)
 
     @api.depends('remanufacture_production_id')
     def _compute_remanufacture_production_ids(self):
@@ -278,7 +159,7 @@ class MrpProduction(models.Model):
 
     @api.depends(
         'move_raw_ids.state', 'move_raw_ids.quantity_done', 'move_finished_ids.state', 'tool_state',
-        'workorder_ids.state', 'product_qty', 'qty_producing', 'schedule_state', 'programming_state')
+        'workorder_ids.state', 'product_qty', 'qty_producing', 'schedule_state')
     def _compute_state(self):
         for production in self:
             if not production.state or not production.product_uom_id:
@@ -308,17 +189,16 @@ class MrpProduction(models.Model):
                                        precision_rounding=move.product_uom.rounding or move.product_id.uom_id.rounding)
                      for move in production.move_raw_ids if move.product_id):
                 production.state = 'progress'
-            # 新添加的状态逻辑
+
+            # # 新添加的状态逻辑
             if (
                     production.state == 'to_close' or production.state == 'progress') and production.schedule_state == '未排':
-                if not production.workorder_ids or production.is_adjust is True:
-                    production.state = 'technology_to_confirmed'
-                else:
-                    production.state = 'confirmed'
+                production.state = 'confirmed'
             elif production.state == 'pending_cam' and production.schedule_state == '未排':
                 production.state = 'confirmed'
             elif production.state == 'to_close' and production.schedule_state == '已排':
                 production.state = 'pending_cam'
+
             if production.state == 'progress':
                 if all(wo_state not in ('progress', 'done', 'rework', 'scrap') for wo_state in
                        production.workorder_ids.mapped('state')):
@@ -347,99 +227,6 @@ class MrpProduction(models.Model):
             if production.tool_state == '2':
                 production.state = 'rework'
 
-    # 退回调整
-    def technology_back_adjust(self):
-        process_parameters = []
-        domain = [('state', '=', 'confirmed'), ('origin', '=', self.origin)]
-        if self.production_type == '自动化产线加工':
-            cloud_programming = self._cron_get_programming_state()
-            if cloud_programming['send_state'] == 'sending':
-                raise UserError(_("编程文件正在下发中，请稍后重试"))
-            domain += [('programming_no', '=', self.programming_no)]
-        # 带排程的制造订单
-        production_confirmed = self.env['mrp.production'].search(domain)
-        for special in production_confirmed.technology_design_ids:
-            if special.process_parameters_id:
-                product_production_process = self.env['product.template'].search(
-                    [('server_product_process_parameters_id', '=', special.process_parameters_id.id)])
-                if not product_production_process:
-                    if special.process_parameters_id not in process_parameters:
-                        process_parameters.append(special.process_parameters_id.display_name)
-        if process_parameters:
-            raise UserError(_("【工艺设计】-【参数】为%s的在【产品】中不存在，请先创建", ", ".join(process_parameters)))
-        if production_confirmed:
-            return {
-                'name': _('退回调整'),
-                'type': 'ir.actions.act_window',
-                'view_mode': 'form',
-                'res_model': 'sf.production.technology.re_adjust.wizard',
-                'target': 'new',
-                'context': {
-                    'default_production_id': self.id,
-                    'default_origin': self.origin,
-                }}
-
-    # 工艺确认
-    def technology_confirm(self):
-        process_parameters = []
-        account_moves = []
-        special_design = self.technology_design_ids.filtered(
-            lambda a: a.routing_tag == 'special' and a.is_auto is False)
-        for special in special_design:
-            if special.process_parameters_id:
-                product_production_process = self.env['product.template'].search(
-                    [('server_product_process_parameters_id', '=', special.process_parameters_id.id)])
-                if not product_production_process:
-                    if special.process_parameters_id not in process_parameters:
-                        process_parameters.append(special.process_parameters_id.display_name)
-            purchase = self.env['purchase.order'].search([('origin', '=', special.production_id.name)])
-            account = self.env['account.move'].search([('id', 'in', purchase.invoice_ids)])
-            if account.state not in ['cancel', False]:
-                if purchase.name not in account_moves:
-                    account_moves.append(purchase.name)
-        if account_moves:
-            raise UserError(_("请联系工厂生产经理对采购订单为%s生成的账单进行取消", ", ".join(account_moves)))
-        if process_parameters:
-            raise UserError(_("【工艺设计】-【参数】为%s的在【产品】中不存在，请先创建", ", ".join(process_parameters)))
-        # 判断同一个加工面的标准工序的顺序是否依次排序
-        error_panel = []
-        technology_design = self.technology_design_ids.filtered(lambda a: a.routing_tag == 'standard').sorted(
-            key=lambda m: m.sequence)
-        for index, design in enumerate(technology_design):
-            routing_type = design.route_id.routing_type
-            if index < len(technology_design) - 1:
-                next_index = index + 1
-                next_design = technology_design[next_index]
-                next_design_routing_type = next_design.route_id.routing_type
-                # logging.info('当前工序和加工面: %s-%s' % (design.route_id.name, design.panel))
-                # logging.info('下一个工序和加工面: %s-%s' % (next_design.route_id.name, next_design.panel))
-                if design.panel is not False:
-                    if design.panel != next_design.panel:
-                        if index == 0:
-                            raise UserError('【加工面】为%s的标准工序里含有其他加工面的工序，请调整后重试' % design.panel)
-                        if routing_type not in ['解除装夹']:
-                            raise UserError('【加工面】为%s的标准工序顺序有误，请调整后重试' % design.panel)
-                    if design.panel == next_design.panel:
-                        if (routing_type == '装夹预调' and next_design_routing_type == '解除装夹') or (
-                                routing_type == 'CNC加工' and next_design_routing_type == '装夹预调'):
-                            if design.panel not in error_panel:
-                                error_panel.append(design.panel)
-            else:
-                if not error_panel and not process_parameters:
-                    return {
-                        'name': _('工艺确认'),
-                        'type': 'ir.actions.act_window',
-                        'view_mode': 'form',
-                        'res_model': 'sf.production.technology.wizard',
-                        'target': 'new',
-                        'context': {
-                            'default_production_id': self.id,
-                            'default_origin': self.origin,
-                        }}
-        if error_panel:
-            raise UserError(_("【加工面】为%s的标准工序顺序有误，请调整后重试", ", ".join(error_panel)))
-        return True
-
     def action_check(self):
         """
         审核启用
@@ -509,13 +296,8 @@ class MrpProduction(models.Model):
     # 编程单更新
     def update_programming_state(self):
         try:
-            manufacturing_type = 'rework'
-            if self.is_scrap:
-                manufacturing_type = 'scrap'
-            elif self.tool_state == '2':
-                manufacturing_type = 'invalid_tool_rework'
             res = {'programming_no': self.programming_no,
-                   'manufacturing_type': manufacturing_type}
+                   'manufacturing_type': 'rework' if self.is_scrap is False else 'scrap'}
             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'])
@@ -677,76 +459,121 @@ class MrpProduction(models.Model):
                         'operation_id': operation.id,
                         'state': 'pending',
                     }]
-            if production.product_id.categ_id.type in ['成品', '坯料']:
-                # # 根据工序设计生成工单
-                for route in production.technology_design_ids:
-                    workorder_has = self.env['mrp.workorder'].search(
-                        [('name', '=', route.route_id.name), ('production_id', '=', production.id)])
-                    if not workorder_has:
-                        if route.route_id.routing_type not in ['表面工艺']:
+            if production.product_id.categ_id.type == '成品':
+                # # 根据加工面板的面数及对应的工序模板生成工单
+                i = 0
+                processing_panel_len = len(production.product_id.model_processing_panel.split(','))
+                for k in (production.product_id.model_processing_panel.split(',')):
+                    product_routing_workcenter = self.env['sf.product.model.type.routing.sort'].search(
+                        [('product_model_type_id', '=', production.product_id.product_model_type_id.id)],
+                        order='sequence asc'
+                    )
+                    i += 1
+                    for route in product_routing_workcenter:
+                        if route.is_repeat is True:
                             workorders_values.append(
-                                self.env['mrp.workorder'].json_workorder_str(production, route))
-                        else:
+                                self.env['mrp.workorder'].json_workorder_str(k, production, route, item))
+                        # if i == processing_panel_len and route.routing_type == '解除装夹':
+                        #     workorders_values.append(
+                        #         self.env['mrp.workorder'].json_workorder_str(k, production, route))
+                # 表面工艺工序
+                # 获取表面工艺id
+                # 工序id
+                surface_technics_arr = []
+                route_workcenter_arr = []
+                for item in production.product_id.product_model_type_id.surface_technics_routing_tmpl_ids:
+                    if item.route_workcenter_id.surface_technics_id.id:
+                        for process_param in production.product_id.model_process_parameters_ids:
+                            logging.info('process_param:%s%s' % (process_param.id, process_param.name))
+                            if item.route_workcenter_id.surface_technics_id == process_param.process_id:
+                                logging.info(
+                                    'surface_technics_id:%s%s' % (item.route_workcenter_id.surface_technics_id.id,
+                                                                  item.route_workcenter_id.surface_technics_id.name))
+                                surface_technics_arr.append(item.route_workcenter_id.surface_technics_id.id)
+                                route_workcenter_arr.append(item.route_workcenter_id.id)
+                if surface_technics_arr:
+                    production_process = self.env['sf.production.process'].search(
+                        [('id', 'in', surface_technics_arr)],
+                        order='sequence asc'
+                    )
+                    for p in production_process:
+                        logging.info('production_process:%s' % p.name)
+                        # if production_process:
+                        process_parameter = production.product_id.model_process_parameters_ids.filtered(
+                            lambda pm: pm.process_id.id == p.id)
+                        if process_parameter:
+                            # 产品为表面工艺服务的供应商
                             product_production_process = self.env['product.template'].search(
-                                [('server_product_process_parameters_id', '=', route.process_parameters_id.id)])
-                            workorders_values.append(
-                                self.env[
-                                    'mrp.workorder']._json_workorder_surface_process_str(
-                                    production, route, product_production_process.seller_ids[0].partner_id.id))
+                                [('server_product_process_parameters_id', '=', process_parameter.id)])
+                            if product_production_process:
+                                route_production_process = self.env[
+                                    'mrp.routing.workcenter'].search(
+                                    [('surface_technics_id', '=', p.id),
+                                     ('id', 'in', route_workcenter_arr)])
+                                if route_production_process:
+                                    workorders_values.append(
+                                        self.env[
+                                            'mrp.workorder']._json_workorder_surface_process_str(
+                                            production, route_production_process,
+                                            process_parameter,
+                                            product_production_process.seller_ids[0].partner_id.id))
+            elif production.product_id.categ_id.type == '坯料':
+                embryo_routing_workcenter = self.env['sf.embryo.model.type.routing.sort'].search(
+                    [('embryo_model_type_id', '=', production.product_id.embryo_model_type_id.id)],
+                    order='sequence asc'
+                )
+                for route in embryo_routing_workcenter:
+                    workorders_values.append(
+                        self.env['mrp.workorder'].json_workorder_str('', production, route))
             production.workorder_ids = workorders_values
-            for workorder in production.workorder_ids:
-                workorder.duration_expected = workorder._get_duration_expected()
-
-    # 外协出入库单处理
-    def get_subcontract_pick_purchase(self):
-        production_all = self.sorted(lambda x: x.id)
-        product_id_to_production_names = {}
-        grouped_product_ids = {k: list(g) for k, g in
-                               groupby(production_all, key=lambda x: x.product_id.id)}
-        for product_id, pd in grouped_product_ids.items():
-            product_id_to_production_names[product_id] = [p.name for p in pd]
-        for production in production_all:
+            # for production_item in productions:
             process_parameter_workorder = self.env['mrp.workorder'].search(
                 [('surface_technics_parameters_id', '!=', False), ('production_id', '=', production.id),
-                 ('is_subcontract', '=', True)], order='sequence asc')
+                 ('is_subcontract', '=', True)])
             if process_parameter_workorder:
+                is_pick = False
                 consecutive_workorders = []
-                sorted_workorders = sorted(process_parameter_workorder, key=lambda w: w.sequence)
-                for i, workorder in enumerate(sorted_workorders):
-                    # 检查当前工作订单和下一个工作订单是否连续，并且供应商相同
-                    if i == 0:
-                        consecutive_workorders.append(workorder)
-                    elif workorder.sequence == sorted_workorders[
-                        i - 1].sequence + 1 and workorder.supplier_id.id == sorted_workorders[i - 1].supplier_id.id:
-                        consecutive_workorders.append(workorder)
+                m = 0
+                sorted_workorders = sorted(process_parameter_workorder, key=lambda w: w.id)
+                for i in range(len(sorted_workorders) - 1):
+                    if m == 0:
+                        is_pick = False
+                    if sorted_workorders[i].supplier_id.id == sorted_workorders[i + 1].supplier_id.id and \
+                            sorted_workorders[i].is_subcontract == sorted_workorders[i + 1].is_subcontract and \
+                            sorted_workorders[i].id == sorted_workorders[i + 1].id - 1:
+                        if sorted_workorders[i] not in consecutive_workorders:
+                            consecutive_workorders.append(sorted_workorders[i])
+                        consecutive_workorders.append(sorted_workorders[i + 1])
+                        m += 1
+                        continue
                     else:
-                        # 处理连续组，如果它不为空
-                        if consecutive_workorders:
-                            # 创建外协出入库单和采购订单
-                            self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, production)
-                            self.env['purchase.order'].get_purchase_order(consecutive_workorders, production,
-                                                                          product_id_to_production_names)
-                            if i < len(sorted_workorders) - 1:
-                                # 重置连续组，并添加当前工作订单
-                                consecutive_workorders = [workorder]
-                            else:
-                                # 判断最后一笔:
-                                if workorder.sequence == sorted_workorders[
-                                    i - 1].sequence and workorder.supplier_id.id == sorted_workorders[
-                                    i - 1].supplier_id.id:
-                                    consecutive_workorders = [workorder]
-                                else:
-                                    # 立即创建外协出入库单和采购订单
-                                    self.env['stock.picking'].create_outcontract_picking(workorder, production)
-                                    self.env['purchase.order'].get_purchase_order(workorder, production,
-                                                                                  product_id_to_production_names)
-                                    consecutive_workorders = []
-
-                # 处理最后一个组，即使它可能只有一个工作订单
-                if consecutive_workorders:
+                        if m == len(consecutive_workorders) - 1 and m != 0:
+                            self.env['stock.picking'].create_outcontract_picking(consecutive_workorders,
+                                                                                 production)
+                            if sorted_workorders[i] in consecutive_workorders:
+                                is_pick = True
+                            consecutive_workorders = []
+                            m = 0
+                        # 当前面的连续工序生成对应的外协出入库单再生成当前工序的外协出入库单
+                        if is_pick is False:
+                            self.env['stock.picking'].create_outcontract_picking(sorted_workorders[i],
+                                                                                 production)
+                    if m == len(consecutive_workorders) - 1 and m != 0:
+                        self.env['stock.picking'].create_outcontract_picking(consecutive_workorders,
+                                                                             production)
+                        if sorted_workorders[i] in consecutive_workorders:
+                            is_pick = True
+                        consecutive_workorders = []
+                        m = 0
+                if m == len(consecutive_workorders) - 1 and m != 0:
                     self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, production)
-                    self.env['purchase.order'].get_purchase_order(consecutive_workorders, production,
-                                                                  product_id_to_production_names)
+                if is_pick is False and m == 0:
+                    if len(sorted_workorders) == 1:
+                        self.env['stock.picking'].create_outcontract_picking(sorted_workorders, production)
+                    else:
+                        self.env['stock.picking'].create_outcontract_picking(sorted_workorders[i], production)
+            for workorder in production.workorder_ids:
+                workorder.duration_expected = workorder._get_duration_expected()
 
     # 工单排序
     def _reset_work_order_sequence1(self, k):
@@ -814,73 +641,7 @@ class MrpProduction(models.Model):
         self._reset_work_order_sequence1(k)
         return True
 
-    # 需对不连续工单对应的采购单和外协出入库单做处理
-    def _reset_subcontract_pick_purchase(self):
-        production_all = self.sorted(lambda x: x.id)
-        product_id_to_production_names = {}
-        grouped_product_ids = {k: list(g) for k, g in
-                               groupby(production_all, key=lambda x: x.product_id.id)}
-        for product_id, pd in grouped_product_ids.items():
-            product_id_to_production_names[product_id] = [p.name for p in pd]
-        for item in production_all:
-            production_process = product_id_to_production_names.get(item.product_id.id)
-            workorder_sf = item.workorder_ids.filtered(lambda sf: sf.routing_type == '表面工艺')
-            for i, workorder in enumerate(workorder_sf):
-                if i == 0:
-                    continue
-                elif workorder.sequence != workorder_sf[i - 1].sequence + 1:
-                    # workorder.picking_ids.move_ids = False
-                    workorder.picking_ids = False
-                    purchase_order = self.env['purchase.order'].search(
-                        [('state', '=', 'draft'), ('origin', '=', ','.join(production_process)),
-                         ('purchase_type', '=', 'consignment')])
-                    for line in purchase_order.order_line:
-                        server_template = self.env['product.template'].search(
-                            [('server_product_process_parameters_id', '=', workorder.surface_technics_parameters_id.id),
-                             ('detailed_type', '=', 'service')])
-                        purchase_order_line = self.env['purchase.order.line'].search(
-                            [('product_id', '=', server_template.product_variant_id.id), ('id', '=', line.id),
-                             ('product_qty', '=', len(production_process))], limit=1, order='id desc')
-                        if purchase_order_line:
-                            line.unlink()
-
     def _reset_work_order_sequence(self):
-        """
-        工单工序排序方法(新)
-        """
-        for rec in self:
-            workorder_ids = rec.workorder_ids
-            technology_design_ids = rec.technology_design_ids
-            if workorder_ids.filtered(lambda item: item.state in ('返工', 'rework')):
-                # 获取返工后新生成的工单
-                work_ids = workorder_ids.filtered(lambda item: item.sequence == 0)
-                # 对工单进行逐个插入
-                for work_id in work_ids:
-                    for order_id in rec.workorder_ids.filtered(lambda item: item.sequence > 0):
-                        if work_id.name == order_id.name:
-                            work_id.sequence = order_id.sequence + 1
-                            break
-                    # 对该工单之后的工单工序进行加一
-                    work_order_ids = rec.workorder_ids.filtered(
-                        lambda item: item.sequence >= work_id.sequence and item.id != work_id.id)
-                    for work in work_order_ids:
-                        work.sequence = work.sequence + 1
-
-            else:
-                # 将工艺设计生成的工单序号赋值给工单的序号
-                for work in workorder_ids:
-                    td_ids = technology_design_ids.filtered(
-                        lambda item: (item.route_id.name in work.name and item.process_parameters_id
-                                      and item.process_parameters_id == work.surface_technics_parameters_id) or
-                                     (item.route_id.name == work.name and item.panel
-                                      and item.panel == work.processing_panel))
-                    if td_ids:
-                        work.sequence = td_ids[0].sequence
-
-    def _reset_work_order_sequence_1(self):
-        """
-        工单工序排序方法（旧）
-        """
         for rec in self:
             workorder_ids = rec.workorder_ids.filtered(lambda item: item.state in ('返工', 'rework'))
             # 产品模型类型
@@ -976,32 +737,52 @@ class MrpProduction(models.Model):
         self._reset_work_order_sequence()
         return True
 
-    def production_process(self, pro_plan):
-        type_map = {'装夹预调': False, 'CNC加工': False, '解除装夹': False}
-        # 最后一次加工结束时间
-        last_time = pro_plan.date_planned_start
-        # 预置时间
-        works = self.workorder_ids
-        for index, work in enumerate(works):
-            count = type_map.get(work.routing_type)
-            date_planned_end = None
-            date_planned_start = None
-            if self.production_type == '自动化产线加工':
-                date_planned_start, date_planned_end, last_time = work.auto_production_process(last_time, count,
-                                                                                               type_map)
-            elif self.production_type == '':
-                date_planned_start, date_planned_end, last_time = work.manual_offline_process(last_time, index)
-            work.update_work_start_end(date_planned_start, date_planned_end)
-
-    # def
     def process_range_time(self):
         for production in self:
             works = production.workorder_ids
             pro_plan = self.env['sf.production.plan'].search([('production_id', '=', production.id)], limit=1)
             if not pro_plan:
                 continue
-            if production.production_type:
-                production.production_process(pro_plan)
+            type_map = {'装夹预调': False, 'CNC加工': False, '解除装夹': False}
+            # 最后一次加工结束时间
+            last_time = pro_plan.date_planned_start
+            # 预置时间
+            for work in works:
+                count = type_map.get(work.routing_type)
+                date_planned_end = None
+                date_planned_start = None
+                duration_expected = datetime.timedelta(minutes=work.duration_expected)
+                reserve_time = datetime.timedelta(minutes=work.reserved_duration)
+                if not count:
+                    # 第一轮加工
+                    if work.routing_type == '装夹预调':
+                        date_planned_end = last_time - reserve_time
+                        date_planned_start = date_planned_end - duration_expected
+                    elif work.routing_type == 'CNC加工':
+                        date_planned_start = last_time
+                        date_planned_end = last_time + duration_expected
+                        last_time = date_planned_end
+                    else:
+                        date_planned_start = last_time + reserve_time
+                        date_planned_end = date_planned_start + duration_expected
+                        last_time = date_planned_end
+                    type_map.update({work.routing_type: True})
+                else:
+                    date_planned_start = last_time + reserve_time
+                    date_planned_end = date_planned_start + duration_expected
+                    last_time = date_planned_end
+                work.leave_id.write({
+                    'date_from': date_planned_start,
+                    'date_to': date_planned_end,
+                })
+                # work.write({'date_planned_start': date_planned_start, 'date_planned_finished': date_planned_end})
+                work.date_planned_start = date_planned_start
+                work.date_planned_finished = date_planned_end
+                routing_workcenter = self.env['mrp.routing.workcenter'].sudo().search(
+                    [('name', '=', work.routing_type)])
+
+                work.write({'date_planned_start': date_planned_start, 'date_planned_finished': date_planned_end,
+                            'duration_expected': routing_workcenter.time_cycle})
 
     # 修改标记已完成方法
     def button_mark_done1(self):
@@ -1025,7 +806,6 @@ class MrpProduction(models.Model):
         backorders = backorders - productions_to_backorder
 
         productions_not_to_backorder._post_inventory(cancel_backorder=True)
-        # 查出最后一张工单完成入库操作
         # if self.workorder_ids.filtered(lambda w: w.routing_type in ['表面工艺']):
         #     move_finish = self.env['stock.move'].search([('created_production_id', '=', self.id)])
         #     if move_finish:
@@ -1126,14 +906,6 @@ class MrpProduction(models.Model):
         cloud_programming = None
         if self.programming_state in ['已编程']:
             cloud_programming = self._cron_get_programming_state()
-        result_ids = self.detection_result_ids.filtered(lambda dr: dr.handle_result == '待处理')
-        work_ids = []
-        if result_ids:
-            for result_id in result_ids:
-                work_ids.append(self.workorder_ids.filtered(
-                    lambda wk: (wk.name == result_id.routing_type
-                                and wk.processing_panel == result_id.processing_panel
-                                and wk.state == 'done')).id)
         return {
             'name': _('返工'),
             'type': 'ir.actions.act_window',
@@ -1142,7 +914,6 @@ class MrpProduction(models.Model):
             'target': 'new',
             'context': {
                 'default_production_id': self.id,
-                'default_workorder_ids': work_ids,
                 'default_reprogramming_num': cloud_programming['reprogramming_num'],
                 'default_programming_state': cloud_programming['programming_state'],
                 'default_is_reprogramming': True if cloud_programming['programming_state'] in ['已下发'] else False
@@ -1172,8 +943,6 @@ class MrpProduction(models.Model):
             if production.programming_no in program_to_production_names:
                 productions_not_delivered = self.env['mrp.production'].search(
                     [('programming_no', '=', production.programming_no), ('programming_state', '=', '已编程未下发')])
-                productions = self.env['mrp.production'].search(
-                    [('programming_no', '=', production.programming_no), ('state', 'not in', ('cancel', 'done'))])
                 rework_workorder = production.workorder_ids.filtered(lambda m: m.state == 'rework')
                 if rework_workorder:
                     for rework_item in rework_workorder:
@@ -1186,13 +955,6 @@ class MrpProduction(models.Model):
                             productions_not_delivered.write(
                                 {'state': 'progress', 'programming_state': '已编程', 'is_rework': False})
 
-                    # 对制造订单所以面的cnc工单的程序用刀进行校验
-                    try:
-                        logging.info(f'已更新制造订单：{productions_not_delivered}')
-                        productions.production_cnc_tool_checkout()
-                    except Exception as e:
-                        logging.info(f'对cnc工单的程序用刀进行校验报错：{e}')
-
     # 从cloud获取重新编程过的最新程序
     def get_new_program(self, processing_panel):
         try:
@@ -1298,13 +1060,11 @@ class MrpProduction(models.Model):
                 [('origin', '=', self.origin)], order='id desc', limit=1)
             move = self.env['stock.move'].search([('origin', '=', productions.name)], order='id desc')
             for mo in move:
-                domain = []
                 if mo.procure_method == 'make_to_order' and mo.name != productions.name:
                     if mo.name == '/':
                         domain = [('barcode', '=', 'WH-PC'), ('sequence_code', '=', 'PC')]
                     elif mo.name == '拉':
                         domain = [('barcode', '=', 'WH-INTERNAL'), ('sequence_code', '=', 'INT')]
-                if domain:
                     picking_type = self.env['stock.picking.type'].search(domain)
                     mo.write({'picking_type_id': picking_type.id})
                     mo._assign_picking()
@@ -1356,6 +1116,7 @@ class MrpProduction(models.Model):
                                 if purchase_orders.origin.find(productions.name) == -1:
                                     purchase_orders.origin += ',' + productions.name
             if item['is_reprogramming'] is False:
+                productions._create_workorder(item)
                 productions.programming_state = '已编程'
             else:
                 productions.programming_state = '编程中'
@@ -1385,70 +1146,6 @@ class MrpProduction(models.Model):
                                  'user_id': production.user_id.id}
         return production_values_str
 
-    # 增加制造订单类型
-    production_type = fields.Selection(
-        [('自动化产线加工', '自动化产线加工'), ('人工线下加工', '人工线下加工')],
-        string='制造类型',
-        compute='_compute_production_type',
-        store=True
-    )
-
-    @api.depends('product_id.is_manual_processing')
-    def _compute_production_type(self):
-        for production in self:
-            production.production_type = '自动化产线加工' if not production.product_id.is_manual_processing else '人工线下加工'
-    
-    @api.model_create_multi
-    def create(self, vals_list):
-        """
-            重载创建制造订单的方法，单个制造订单，同一成品只创建一个采购组，用于后续单据的创建
-        """
-        product_group_id = {}
-        for vals in vals_list:
-            if not vals.get('name', False) or vals['name'] == _('New'):
-                picking_type_id = vals.get('picking_type_id')
-                if not picking_type_id:
-                    picking_type_id = self._get_default_picking_type_id(vals.get('company_id', self.env.company.id))
-                    vals['picking_type_id'] = picking_type_id
-                vals['name'] = self.env['stock.picking.type'].browse(picking_type_id).sequence_id.next_by_id()
-            if not vals.get('procurement_group_id'):
-                product_id = self.env['product.product'].browse(vals['product_id'])
-                if product_id.product_tmpl_id.single_manufacturing: 
-                    if product_id.id not in product_group_id.keys():
-                        procurement_group_vals = self._prepare_procurement_group_vals(vals)
-                        group_id = self.env["procurement.group"].create(procurement_group_vals).id
-                        vals['procurement_group_id'] = group_id
-                        product_group_id[product_id.id] = group_id
-                    else:
-                        vals['procurement_group_id'] = product_group_id[product_id.id]
-        return super(MrpProduction, self).create(vals_list)
-
-    @api.depends('procurement_group_id.stock_move_ids.created_purchase_line_id.order_id', 'procurement_group_id.stock_move_ids.move_orig_ids.purchase_line_id.order_id')
-    def _compute_purchase_order_count(self):
-        for production in self:
-            # 找到来源的第一张制造订单的采购组
-            if production.product_id.product_tmpl_id.single_manufacturing == True:
-                first_production = self.env['mrp.production'].search([('origin', '=', production.origin), ('product_id', '=', production.product_id.id)], limit=1, order='id asc')
-                production.purchase_order_count = len(first_production.procurement_group_id.stock_move_ids.created_purchase_line_id.order_id |
-                                                  first_production.procurement_group_id.stock_move_ids.move_orig_ids.purchase_line_id.order_id)
-            else:
-                production.purchase_order_count = len(production.procurement_group_id.stock_move_ids.created_purchase_line_id.order_id |
-                                                  production.procurement_group_id.stock_move_ids.move_orig_ids.purchase_line_id.order_id)                                
-
-    @api.depends('procurement_group_id', 'procurement_group_id.stock_move_ids.group_id')
-    def _compute_picking_ids(self):
-        for order in self:
-            if order.product_id.product_tmpl_id.single_manufacturing == True:
-                first_order = self.env['mrp.production'].search([('origin', '=', order.origin), ('product_id', '=', order.product_id.id)], limit=1, order='id asc')
-                order.picking_ids = self.env['stock.picking'].search([
-                    ('group_id', '=', first_order.procurement_group_id.id), ('group_id', '!=', False),
-                ])
-                order.delivery_count = len(first_order.picking_ids)
-            else:
-                order.picking_ids = self.env['stock.picking'].search([
-                    ('group_id', '=', order.procurement_group_id.id), ('group_id', '!=', False),
-                ])
-                order.delivery_count = len(order.picking_ids)
 
 class sf_detection_result(models.Model):
     _name = 'sf.detection.result'
@@ -1478,6 +1175,10 @@ class sf_detection_result(models.Model):
             'type': 'ir.actions.act_window',
             'res_id': self.id,
             'views': [(self.env.ref('sf_manufacturing.sf_test_report_form').id, 'form')],
+            # 'view_mode': 'form',
+            # 'context': {
+            #     'default_id': self.id
+            # },
             'target': 'new'
         }
 

sf_manufacturing/models/mrp_routing_workcenter.py

@@ -7,25 +7,21 @@ class ResMrpRoutingWorkcenter(models.Model):
     _inherit = 'mrp.routing.workcenter'
 
     routing_type = fields.Selection([
+        # ('获取CNC加工程序', '获取CNC加工程序'),
         ('装夹预调', '装夹预调'),
+        # ('前置三元定位检测', '前置三元定位检测'),
         ('CNC加工', 'CNC加工'),
+        # ('后置三元质量检测', '后置三元质量检测'),
         ('解除装夹', '解除装夹'),
         ('切割', '切割'),
-        ('表面工艺', '表面工艺'),
-        ('线切割', '线切割'),
-        ('人工线下加工', '人工线下加工')
+        ('表面工艺', '表面工艺')
     ], string="工序类型")
-    routing_tag = fields.Selection([
-        ('standard', '标准'),
-        ('special', '特殊')
-    ], string="标签")
     is_repeat = fields.Boolean('重复', default=False)
     workcenter_id = fields.Many2one('mrp.workcenter', required=False)
     workcenter_ids = fields.Many2many('mrp.workcenter', 'rel_workcenter_route', required=True)
     bom_id = fields.Many2one('mrp.bom', required=False)
     surface_technics_id = fields.Many2one('sf.production.process', string="表面工艺")
     reserved_duration = fields.Float('预留时长', default=30, tracking=True)
-
     def get_no(self):
         international_standards = self.search(
             [('code', '!=', ''), ('active', 'in', [True, False])],
@@ -44,7 +40,7 @@ class ResMrpRoutingWorkcenter(models.Model):
     def get_company_id(self):
         self.company_id = self.env.user.company_id.id
 
-    company_id = fields.Many2one('res.company', compute="get_company_id", related=False, store=True)
+    company_id = fields.Many2one('res.company', compute="get_company_id", related=False)
 
     # 排产的时候, 根据坯料的长宽高比对一下机床的最大加工尺寸.不符合就不要分配给这个加工中心(机床).
     # 工单对应的工作中心，根据工序中的工作中心去匹配，
@@ -82,13 +78,3 @@ class ResMrpRoutingWorkcenter(models.Model):
                 else:
                     workcenter_id = workcenter_ids[0]
                 return workcenter_id
-
-    @api.model
-    def _name_search(self, name, args=None, operator='ilike', limit=100, name_get_uid=None):
-        if self._context.get('production_id'):
-            technology_design = self.env['sf.technology.design'].search(
-                [('production_id', '=', self._context.get('production_id'))])
-            route_ids = [t.route_id.id for t in technology_design]
-            domain = [('id', 'not in', route_ids)]
-            return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
-        return super()._name_search(name, args, operator, limit, name_get_uid)

sf_manufacturing/models/mrp_workcenter.py

@@ -231,13 +231,13 @@ class ResWorkcenter(models.Model):
             default_capacity = round(
                 self.production_line_hour_capacity * date_planned_working_hours, 2)
             _logger.info('排程日期:%s,计划数量:%s,日产能:%s,日工时:%s' % (
-                date_planned, sum_qty, default_capacity, date_planned_working_hours))
+            date_planned, sum_qty, default_capacity, date_planned_working_hours))
             if sum_qty >= default_capacity:
                 return False
         return True
 
     # 处理排程是否超过小时产能
-    def deal_available_single_machine_capacity(self, date_planned, count):
+    def deal_available_single_machine_capacity(self, date_planned):
 
         date_planned_start = date_planned.strftime('%Y-%m-%d %H:00:00')
         date_planned_end = date_planned + timedelta(hours=1)
@@ -249,11 +249,7 @@ class ResWorkcenter(models.Model):
 
         if plan_ids:
             sum_qty = sum([p.product_qty for p in plan_ids])
-            production_line_hour_capacity = self.production_line_hour_capacity
-            if sum_qty >= production_line_hour_capacity:
-                message = '当前计划开始时间不能预约排程,超过生产线小时产能(%d件)%d件' % (
-                    production_line_hour_capacity, count)
-                raise UserError(message)
+            if sum_qty >= self.production_line_hour_capacity:
                 return False
         return True
 

sf_manufacturing/models/mrp_workorder.py

@@ -38,10 +38,13 @@ class ResMrpWorkOrder(models.Model):
     processing_panel = fields.Char('加工面')
     sequence = fields.Integer(string='工序')
     routing_type = fields.Selection([
+        # ('获取CNC加工程序', '获取CNC加工程序'),
         ('装夹预调', '装夹预调'),
+        # ('前置三元定位检测', '前置三元定位检测'),
         ('CNC加工', 'CNC加工'),
+        # ('后置三元质量检测', '后置三元质量检测'),
         ('解除装夹', '解除装夹'),
-        ('切割', '切割'), ('表面工艺', '表面工艺'), ('线切割', '线切割'), ('人工线下加工', '人工线下加工')
+        ('切割', '切割'), ('表面工艺', '表面工艺')
     ], string="工序类型")
     results = fields.Char('结果')
     state = fields.Selection([
@@ -56,8 +59,7 @@ class ResMrpWorkOrder(models.Model):
         compute='_compute_state', store=True,
         default='pending', copy=False, readonly=True, recursive=True, index=True, tracking=True)
 
-    delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效',
-                                        tracking=True)
+    # state = fields.Selection(selection_add=[('to be detected', "待检测"), ('rework', '返工')], tracking=True)
 
     @api.depends('production_id.manual_quotation')
     def _compute_manual_quotation(self):
@@ -143,107 +145,21 @@ class ResMrpWorkOrder(models.Model):
     is_trayed = fields.Boolean(string='是否绑定托盘', default=False)
 
     tag_type = fields.Selection([("重新加工", "重新加工")], string="标签", tracking=True)
-    technology_design_id = fields.Many2one('sf.technology.design')
-
-    def _compute_default_construction_period_status(self):
-        need_list = ['pending', 'waiting', 'ready', 'progress', 'to be detected', 'done']
-        try:
-            if self.state not in need_list:
-                return False
-            if not self.date_planned_finished:
-                return False
-            hours = self.get_hours_diff()
-            if hours >= 12:
-                return '正常'
-            elif hours > 0 and hours < 12 and self.state != 'done':
-                return '预警'
-            elif hours > 0 and hours < 12 and self.state == 'done':
-                return '正常'
-            else:
-                return '已逾期'
-        except Exception as e:
-            logging.error("Error processing production ID {}: {}".format(self.id, e))
-            raise e
-
-    @api.depends('state', 'date_planned_finished')
-    def _compute_construction_period_status(self):
-        for worker in self:
-            construction_period_status = worker._compute_default_construction_period_status()
-            if construction_period_status and worker.construction_period_status != construction_period_status:
-                worker.construction_period_status = construction_period_status
-
-    construction_period_status = fields.Selection([('正常', '正常'), ('预警', '预警'), ('已逾期', '已逾期')],
-                                                  string='工期状态',
-                                                  store=True,
-                                                  compute='_compute_construction_period_status',
-                                                  default=lambda
-                                                      self: self._compute_default_construction_period_status())
-
-    def get_page_all_records(self, model_name, func, domain, page_size=100):
-        # 获取模型对象
-        model = self.env[model_name].sudo()
-
-        # 初始化分页参数
-        page_number = 1
-        while True:
-            # 计算偏移量
-            offset = (page_number - 1) * page_size
-
-            # 获取当前页的数据
-            records = model.search(domain, limit=page_size, offset=offset)
-
-            # 如果没有更多记录，退出循环
-            if not records:
-                break
-
-            # 将当前页的数据添加到结果列表
-            func(records)
-            # 增加页码
-            page_number += 1
-
-    def run_compute_construction_period_status(self, records):
-        records._compute_construction_period_status()
-
-    def _corn_update_construction_period_status(self):
-        need_list = ['pending', 'waiting', 'ready', 'progress', 'to be detected']
-        # need_list = [
-        #     'progress',
-        #     'to be detected']
-        self.get_page_all_records('mrp.workorder', self.run_compute_construction_period_status,
-                                  [('state', 'in', need_list)], 100)
-
-    def get_hours_diff(self):
-        # 获取当前日期和时间
-        current_datetime = fields.Datetime.now()
-
-        # 将 date_field 转换为 datetime 对象
-        if self.date_planned_finished:
-            date_obj = fields.Datetime.from_string(self.date_planned_finished)
-            # 将 date 对象转换为 datetime 对象，设置时间为 00:00:00
-            # date_obj = datetime.datetime.combine(date_obj, datetime.time.min)
-
-            # 计算两个日期之间的差值
-            delta = date_obj - current_datetime
-
-            # 返回差值的小时数
-            return int(delta.total_seconds() / 3600)
-        else:
-            return 0.0
 
     @api.depends('name', 'production_id.name')
     def _compute_surface_technics_picking_ids(self):
         for workorder in self:
             if workorder.routing_type == '表面工艺':
-                domain = [('origin', '=', workorder.production_id.name), ('state', 'not in', ['cancel']),
-                          ('partner_id', '!=', False)]
+                domain = [('origin', '=', workorder.production_id.name)]
                 previous_workorder = self.env['mrp.workorder'].search(
                     [('sequence', '=', workorder.sequence - 1), ('routing_type', '=', '表面工艺'),
                      ('production_id', '=', workorder.production_id.id)])
                 if previous_workorder:
-                    if previous_workorder.supplier_id != workorder.supplier_id:
-                        process_product = self.env['product.template']._get_process_parameters_product(
-                            previous_workorder.surface_technics_parameters_id)
-                        domain += [('partner_id', '=', process_product.partner_id.id)]
+                    process_product = self.env['product.template']._get_process_parameters_product(
+                        previous_workorder.surface_technics_parameters_id)
+                    domain += [('partner_id', '=', process_product.partner_id.id)]
+                else:
+                    domain += [('surface_technics_parameters_id', '=', workorder.surface_technics_parameters_id.id)]
                 picking_ids = self.env['stock.picking'].search(domain, order='id asc')
                 workorder.surface_technics_picking_count = len(picking_ids)
                 workorder.picking_ids = picking_ids.ids
@@ -268,47 +184,24 @@ class ResMrpWorkOrder(models.Model):
     def _compute_surface_technics_purchase_ids(self):
         for order in self:
             if order.routing_type == '表面工艺':
-                if order.production_id.production_type == '自动化产线加工':
-                    domain = [('programming_no', '=', order.production_id.programming_no)]
-                else:
-                    domain = [('origin', '=', order.production_id.origin)]
-                production_programming = self.env['mrp.production'].search(domain, order='name asc')
-                production_list = [production.name for production in production_programming]
+                production_programming = self.env['mrp.production'].search(
+                    [('programming_no', '=', order.production_id.programming_no)], order='name asc')
                 production_no_remanufacture = production_programming.filtered(lambda a: a.is_remanufacture is False)
-                # technology_design = self.env['sf.technology.design'].search(
-                #     [('process_parameters_id', '=', order.surface_technics_parameters_id.id),
-                #      ('production_id', '=', order.production_id.id)])
-                # if technology_design.is_auto is False:
-                #     domain = [('origin', '=', order.production_id.name)]
-                # else:
-                domain = [('purchase_type', '=', 'consignment'),('origin', '=', ','.join(production_list))]
-                purchase = self.env['purchase.order'].search(domain)
-                if not purchase:
-                    order.surface_technics_purchase_count = 0
+                production_list = [production.name for production in production_programming]
+                purchase = self.env['purchase.order'].search([('origin', '=', ','.join(production_list))])
                 for line in purchase.order_line:
-                    if line.product_id.server_product_process_parameters_id == order.surface_technics_parameters_id:
-                        if line.product_qty == len(production_no_remanufacture):
-                            order.surface_technics_purchase_count = len(purchase)
+                    if line.product_id.server_product_process_parameters_id == order.surface_technics_parameters_id and line.product_qty == len(
+                            production_no_remanufacture):
+                        order.surface_technics_purchase_count = len(purchase)
             else:
                 order.surface_technics_purchase_count = 0
 
     def action_view_surface_technics_purchase(self):
         self.ensure_one()
-        if self.routing_type == '表面工艺':
-            if self.production_id.production_type == '自动化产线加工':
-                domain = [('programming_no', '=', self.production_id.programming_no)]
-            else:
-                domain = [('origin', '=', self.production_id.origin)]
-        production_programming = self.env['mrp.production'].search(domain, order='name asc')
+        production_programming = self.env['mrp.production'].search(
+            [('programming_no', '=', self.production_id.programming_no)], order='name asc')
         production_list = [production.name for production in production_programming]
-        # technology_design = self.env['sf.technology.design'].search(
-        #     [('process_parameters_id', '=', self.surface_technics_parameters_id.id),
-        #      ('production_id', '=', self.production_id.id)])
-        # if technology_design.is_auto is False:
-        #     domain = [('origin', '=', self.production_id.name)]
-        # else:
-        domain = [('origin', '=', ','.join(production_list)), ('purchase_type', '=', 'consignment')]
-        purchase_orders = self.env['purchase.order'].search(domain)
+        purchase_orders = self.env['purchase.order'].search([('origin', '=', ','.join(production_list))])
         result = {
             "type": "ir.actions.act_window",
             "res_model": "purchase.order",
@@ -332,10 +225,6 @@ class ResMrpWorkOrder(models.Model):
     material_height = fields.Float(string='高')
     # 零件图号
     part_number = fields.Char(related='production_id.part_number', string='零件图号')
-    machining_drawings = fields.Binary('2D加工图纸', related='production_id.part_drawing', readonly=True)
-    quality_standard = fields.Binary('质检标准', related='production_id.quality_standard', readonly=True)
-    part_name = fields.Char(related='production_id.part_name', string='零件名称')
-
     # 工序状态
     process_state = fields.Selection([
         ('待装夹', '待装夹'),
@@ -386,11 +275,8 @@ class ResMrpWorkOrder(models.Model):
         保存名称
         """
         for record in self:
-            if record.processing_panel:
-                tem_name = record.production_id.name.replace('/', '_')
-                record.save_name = tem_name + '_' + record.processing_panel
-            else:
-                record.save_name = ''
+            tem_name = record.production_id.name.replace('/', '_')
+            record.save_name = tem_name + '_' + record.processing_panel
 
     schedule_state = fields.Selection(related='production_id.schedule_state', store=True)
     # 工件装夹信息
@@ -416,7 +302,6 @@ class ResMrpWorkOrder(models.Model):
     is_delivery = fields.Boolean('是否配送完成', default=False)
     rfid_code = fields.Char('RFID码')
     rfid_code_old = fields.Char('RFID码(已解除)')
-    is_test_env = fields.Boolean('测试环境', default=False)
 
     production_line_id = fields.Many2one('sf.production.line', related='production_id.production_line_id',
                                          string='生产线', store=True, tracking=True)
@@ -432,13 +317,9 @@ class ResMrpWorkOrder(models.Model):
     detailed_reason = fields.Text('详细原因')
     is_rework = fields.Boolean(string='是否返工', default=False)
 
-    def button_change_env(self):
-        self.is_test_env = not self.is_test_env
-
     @api.constrains('blocked_by_workorder_ids')
     def _check_no_cyclic_dependencies(self):
-        if self.production_id.state not in ['rework', 'technology_to_confirmed', 'confirmed'] and self.state not in [
-            'rework']:
+        if self.production_id.state not in ['rework'] and self.state not in ['rework']:
             if not self._check_m2m_recursion('blocked_by_workorder_ids'):
                 raise ValidationError(_("您不能创建周期性的依赖关系."))
 
@@ -449,9 +330,8 @@ class ResMrpWorkOrder(models.Model):
         for workorder in self.blocked_by_workorder_ids:
             if workorder.state in ['done', 'cancel', 'rework']:
                 continue
-            if workorder.production_id.state not in ['technology_to_confirmed', 'confirmed']:
-                workorder._plan_workorder(replan)
-                start_date = max(start_date, workorder.date_planned_finished)
+            workorder._plan_workorder(replan)
+            start_date = max(start_date, workorder.date_planned_finished)
         # Plan only suitable workorders
         if self.state not in ['pending', 'waiting', 'ready']:
             return
@@ -781,14 +661,35 @@ class ResMrpWorkOrder(models.Model):
             }}
 
     # 拼接工单对象属性值
-    def json_workorder_str(self, production, route):
+    def json_workorder_str(self, k, production, route, item):
         # 计算预计时长duration_expected
         routing_types = ['切割', '装夹预调', 'CNC加工', '解除装夹']
-        if route.route_id.routing_type in routing_types:
+        if route.routing_type in routing_types:
             routing_workcenter = self.env['mrp.routing.workcenter'].sudo().search(
-                [('name', '=', route.routing_type if hasattr(route, 'routing_type') else route.route_id.routing_type)])
+                [('name', '=', route.routing_type)])
             duration_expected = routing_workcenter.time_cycle
             reserved_duration = routing_workcenter.reserved_duration
+        # if route.routing_type == '切割':
+        #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
+        #         [('name', '=', '切割')]).time_cycle
+        # # elif route.routing_type == '获取CNC加工程序':
+        # #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
+        # #         [('name', '=', '获取CNC加工程序')]).time_cycle
+        # elif route.routing_type == '装夹预调':
+        #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
+        #         [('name', '=', '装夹预调')]).time_cycle
+        # # elif route.routing_type == '前置三元定位检测':
+        # #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
+        # #         [('name', '=', '前置三元定位检测')]).time_cycle
+        # elif route.routing_type == 'CNC加工':
+        #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
+        #         [('name', '=', 'CNC加工')]).time_cycle
+        # # elif route.routing_type == '后置三元质量检测':
+        # #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
+        # #         [('name', '=', '后置三元质量检测')]).time_cycle
+        # elif route.routing_type == '解除装夹':
+        #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
+        #         [('name', '=', '解除装夹')]).time_cycle
         else:
             duration_expected = 60
             reserved_duration = 30
@@ -796,22 +697,26 @@ class ResMrpWorkOrder(models.Model):
             'product_uom_id': production.product_uom_id.id,
             'qty_producing': 0,
             'operation_id': False,
-            'name': route.name if hasattr(route, 'routing_type') else route.route_id.name,
-            'processing_panel': False if hasattr(route, 'routing_type') else route.panel,
-            'sequence': route.sequence,
-            'quality_point_ids': False if hasattr(route, 'routing_type') else route.route_id.quality_point_ids,
-            'routing_type': route.routing_type if hasattr(route, 'routing_type') else route.route_id.routing_type,
-            'workcenter_id': False if hasattr(route, 'routing_type') else self.env[
-                'mrp.routing.workcenter'].get_workcenter(route.route_id.workcenter_ids.ids,
-                                                         route.route_id.routing_type,
-                                                         production.product_id),
+            'name': route.route_workcenter_id.name,
+            'processing_panel': k,
+            'quality_point_ids': route.route_workcenter_id.quality_point_ids,
+            'routing_type': route.routing_type,
+            # 'work_state': '待发起',
+            'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,
+                                                                               route.routing_type,
+                                                                               production.product_id),
             # 设定初始化值，避免出现变成bool问题
             'date_planned_start': datetime.now(),
             'date_planned_finished': datetime.now() + timedelta(days=1),
             'duration_expected': duration_expected,
             'duration': 0,
-            'technology_design_id': route.id,
-            # 'tag_type': '重新加工' if item is False else False,
+            'tag_type': '重新加工' if item is False else False,
+            'cnc_ids': False if route.routing_type != 'CNC加工' else self.env['sf.cnc.processing']._json_cnc_processing(
+                k, item),
+            'cmm_ids': False if route.routing_type != 'CNC加工' else self.env['sf.cmm.program']._json_cmm_program(k,
+                                                                                                                  item),
+            # 'workpiece_delivery_ids': False if not route.routing_type == '装夹预调' else self._json_workpiece_delivery_list(
+            #     production)
             'reserved_duration': reserved_duration,
         }]
         return workorders_values_str
@@ -842,24 +747,22 @@ class ResMrpWorkOrder(models.Model):
         ]
 
     # 拼接工单对象属性值(表面工艺)
-    def _json_workorder_surface_process_str(self, production, route, supplier_id):
+    def _json_workorder_surface_process_str(self, production, route, process_parameter, supplier_id):
         workorders_values_str = [0, '', {
             'product_uom_id': production.product_uom_id.id,
             'qty_producing': 0,
             'operation_id': False,
-            'name': route.process_parameters_id.display_name,
+            'name': '%s-%s' % (route.name, process_parameter.name),
             'processing_panel': '',
-            'sequence': route.sequence,
-            'technology_design_id': route.id,
             'routing_type': '表面工艺',
-            'surface_technics_parameters_id': route.process_parameters_id.id,
+            'surface_technics_parameters_id': process_parameter.id,
             'work_state': '',
             'supplier_id': supplier_id,
-            'is_subcontract': True if route.process_parameters_id.gain_way == '外协' else False,
+            'is_subcontract': True if process_parameter.gain_way == '外协' else False,
             'workcenter_id': self.env[
-                'mrp.workcenter'].get_process_outsourcing_workcenter() if route.process_parameters_id.gain_way == '外协' else
-            self.env['mrp.routing.workcenter'].get_workcenter(route.route_id.workcenter_ids.ids,
-                                                              route.route_id.routing_type,
+                'mrp.workcenter'].get_process_outsourcing_workcenter() if process_parameter.gain_way == '外协' else
+            self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,
+                                                              route.routing_type,
                                                               production.product_id),
             'date_planned_start': datetime.now(),
             'date_planned_finished': datetime.now() + timedelta(days=1),
@@ -1011,169 +914,171 @@ class ResMrpWorkOrder(models.Model):
         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')
+                 'production_id.tool_state')
     def _compute_state(self):
-        # super()._compute_state()
+        super()._compute_state()
         for workorder in self:
-            if workorder.sequence != 1:
-                previous_workorder = self.env['mrp.workorder'].search(
-                    [('production_id', '=', workorder.production_id.id),
-                     ('sequence', '=', workorder.sequence - 1)])
-            if workorder.state == 'pending':
-                if all([wo.state in ('done', 'cancel') for wo in workorder.blocked_by_workorder_ids]):
-                    if workorder.production_id.reservation_state == 'assigned' and workorder.production_id.schedule_state == '已排':
-                        if ((workorder.sequence == 1 and not workorder.blocked_by_workorder_ids)
-                                or (workorder.blocked_by_workorder_ids.state in ('done', 'cancel')
-                                    and workorder.blocked_by_workorder_ids.test_results not in ['报废', '返工'])
-                                or (previous_workorder.state in ('done', 'cancel')
-                                    and not workorder.blocked_by_workorder_ids
-                                    and previous_workorder.test_results not in ['报废', '返工'])
-                        ):
-                            workorder.state = 'ready'
-                continue
-            if workorder.production_id.schedule_state == '未排' and workorder.state in ('waiting', 'ready'):
-                if workorder.sequence != 1:
-                    workorder.state = 'pending'
-                continue
-            if workorder.state not in ('waiting', 'ready'):
-                continue
-            if workorder.state in (
-                    'waiting') and workorder.sequence == 1 and workorder.production_id.schedule_state == '已排':
-                workorder.state = 'ready'
-                continue
-            if not all([wo.state in ('done', 'cancel') for wo in workorder.blocked_by_workorder_ids]):
-                workorder.state = 'pending'
-                if workorder.state in ['waiting']:
-                    if previous_workorder.state == 'waiting':
-                        workorder.state = 'pending'
-                if workorder.sequence == 1 and workorder.state == 'pending':
-                    workorder.state = 'waiting'
-                continue
-            if workorder.production_id.reservation_state not in ('waiting', 'confirmed', 'assigned'):
-                continue
-            if workorder.production_id.reservation_state == 'assigned' and workorder.state == 'waiting' and workorder.production_id.schedule_state == '已排':
-                workorder.state = 'ready'
-            elif workorder.production_id.reservation_state != 'assigned' and workorder.state == 'ready':
-                workorder.state = 'waiting'
+            re_work = self.env['mrp.workorder'].search([('production_id', '=', workorder.production_id.id),
+                                                        ('processing_panel', '=', workorder.processing_panel),
+                                                        ('is_rework', '=', True), ('state', 'in', ['done', 'rework'])])
+            cnc_workorder = self.env['mrp.workorder'].search(
+                [('production_id', '=', workorder.production_id.id),
+                 ('processing_panel', '=', workorder.processing_panel),
+                 ('routing_type', '=', 'CNC加工'), ('state', 'in', ['done', 'rework']),
+                 ('test_results', '=', '返工')])
+            cnc_workorder_pending = self.env['mrp.workorder'].search(
+                [('production_id', '=', workorder.production_id.id),
+                 ('processing_panel', '=', workorder.processing_panel),
+                 ('routing_type', '=', 'CNC加工'), ('state', 'in', ['pending'])])
+            unclamp_workorder = self.env['mrp.workorder'].search(
+                [('production_id', '=', workorder.production_id.id),
+                 ('sequence', '=', workorder.sequence - 1),
+                 ('state', 'in', ['done'])])
+            if workorder.state not in ['cancel', 'progress', 'rework']:
+                if workorder.production_id.state == 'rework':
+                    if workorder.routing_type == '装夹预调' and workorder.state not in ['done', 'rework',
+                                                                                        'cancel']:
+                        # # 有返工工单
+                        # if re_work:
+                        # 新工单
+                        if workorder.is_rework is False:
+                            if workorder.production_id.programming_state == '已编程' and workorder.production_id.is_rework is False:
+                                if re_work or cnc_workorder:
+                                    workorder.state = 'ready'
+                            else:
+                                if workorder.production_id.is_rework is True:
+                                    if re_work or cnc_workorder:
+                                        workorder.state = 'waiting'
 
-        for workorder in self:
-            # 如果工单的工序没有进行排序则跳出循环
-            if workorder.production_id.workorder_ids.filtered(lambda wk: wk.sequence == 0):
-                continue
-            # ===== 对所有按序号排序的非[进行中、完成、返工、取消]状态的工单，除了第一条之外的工单状态都设置为[等待其他工单] =====
-            logging.info(workorder.state)
-            work_ids = workorder.production_id.workorder_ids.filtered(
-                lambda wk: wk.state not in ['done', 'rework', 'cancel'])
-            if not work_ids:
-                continue
-            min_sequence_wk = min(work_ids, key=lambda wk: wk.sequence)
-            if workorder.state in ['done', 'rework', 'cancel', 'progress', 'to be detected']:
-                continue
-            else:
-                if workorder != min_sequence_wk:
-                    if workorder.state != 'pending':
-                        workorder.state = 'pending'
-                    continue
-            # ================= 如果制造订单刀具状态为[无效刀、缺刀] 或者 制造订单状态为[返工]==========================
-            if (workorder.production_id.tool_state in ['1', '2'] or workorder.production_id.state == 'rework'
-                    or workorder.production_id.schedule_state != '已排'
-                    or len(
-                        workorder.production_id.picking_ids.filtered(lambda w: w.state not in ['done', 'cancel'])) != 0
-                    or workorder.production_id.workorder_ids.filtered(
-                        lambda wk: wk.sequence == workorder.sequence - 1).test_results in ['报废', '返工']):
-                if workorder.state != 'waiting':
-                    workorder.state = 'waiting'
-                continue
-            if workorder.production_id.programming_state == '已编程':
-                workorder.state = 'ready'
-            elif workorder.state != 'waiting':
-                workorder.state = 'waiting'
-            # =========== 特殊工艺工单处理 ===================
-            # if workorder.routing_type == '表面工艺' and workorder.is_subcontrac:
-            #     purchase_order = self.env['purchase.order'].search(
-            #         [('origin', 'ilike', workorder.production_id.name)])
-            #     if purchase_order.picking_ids.filtered(lambda p: p.state in ['waiting', 'confirmed', 'assigned']):
-            #         workorder.state = 'waiting'
-            #         continue
-            if workorder.technology_design_id.routing_tag == 'special':
-                if workorder.is_subcontract is False:
-                    workorder.state = 'ready'
-                else:
-                    production_programming = self.env['mrp.production'].search(
-                        [('origin', '=', self.production_id.origin)], order='name asc')
-                    production_no_remanufacture = production_programming.filtered(
-                        lambda a: a.is_remanufacture is False)
-                    production_list = [production.name for production in production_programming]
-                    purchase_orders = self.env['purchase.order'].search(
-                        [('origin', 'ilike', ','.join(production_list))])
-                    for line in purchase_orders.order_line:
-                        if (
-                                line.product_id.server_product_process_parameters_id == workorder.surface_technics_parameters_id
-                                and line.product_qty == len(production_no_remanufacture)):
-                            if purchase_orders.state == 'purchase':
+                    elif workorder.routing_type == 'CNC加工' and workorder.state not in ['done', 'rework', 'cancel']:
+                        pre_workorder = self.env['mrp.workorder'].search(
+                            [('production_id', '=', workorder.production_id.id),
+                             ('processing_panel', '=', workorder.processing_panel),
+                             ('routing_type', '=', '装夹预调'), ('state', '=', 'done')])
+                        if pre_workorder:
+                            if re_work:
+                                workorder.state = 'waiting'
+                    elif workorder.routing_type == '解除装夹' and workorder.state not in ['done', 'rework', 'cancel']:
+                        if cnc_workorder:
+                            if not cnc_workorder_pending or unclamp_workorder.test_results == '报废':
+                                workorder.state = 'waiting'
+                    # else:
+                    #     if workorder.production_id.is_rework is True:
+                    #         workorder.state = 'waiting'
+                elif workorder.production_id.state == 'progress':
+                    if workorder.routing_type == '装夹预调' and workorder.production_id.programming_state == '已编程' and \
+                            workorder.is_rework is False and workorder.state not in [
+                        'done', 'rework',
+                        'cancel']:
+                        if workorder.production_id.is_rework is False:
+                            if re_work or cnc_workorder or unclamp_workorder:
+                                workorder.state = 'ready'
+                        # if (re_work or cnc_workorder) and workorder.production_id.is_rework is False:
+                        #     workorder.state = 'ready'
+                    if workorder.routing_type == '表面工艺' and workorder.state not in ['done', 'progress']:
+                        if unclamp_workorder:
+                            if workorder.is_subcontract is False:
                                 workorder.state = 'ready'
                             else:
+                                production_programming = self.env['mrp.production'].search(
+                                    [('programming_no', '=', self.production_id.programming_no)], order='name asc')
+                                production_no_remanufacture = production_programming.filtered(
+                                    lambda a: a.is_remanufacture is False)
+                                production_list = [production.name for production in production_programming]
+                                purchase_orders = self.env['purchase.order'].search(
+                                    [('origin', 'ilike', ','.join(production_list))])
+                                for line in purchase_orders.order_line:
+                                    if line.product_id.server_product_process_parameters_id == workorder.surface_technics_parameters_id and line.product_qty == len(
+                                            production_no_remanufacture):
+                                        if purchase_orders.state == 'purchase':
+                                            workorder.state = 'ready'
+                                        else:
+                                            workorder.state = 'waiting'
+                elif workorder.production_id.state == 'scrap':
+                    if workorder.routing_type == '解除装夹' and unclamp_workorder.test_results == '报废':
+                        workorder.state = 'waiting'
+                if workorder.routing_type == '装夹预调' and workorder.state in ['waiting', 'ready', 'pending']:
+                    workorder_ids = workorder.production_id.workorder_ids
+                    work_bo = True
+                    for wo in workorder_ids.filtered(lambda a: a.routing_type == '装夹预调' and a.state == 'rework'):
+                        if not workorder_ids.filtered(
+                                lambda a: (a.routing_type == '装夹预调' and a.state not in ['rework', 'cancel']
+                                           and a.processing_panel == wo.processing_panel)):
+                            work_bo = False
+                            break
+                    if (workorder.production_id.programming_state == '已编程' and work_bo
+                            and not workorder_ids.filtered(lambda a: a.sequence == 0)):
+                        # 当工单对应制造订单的功能刀具状态为 【无效刀】时，先对的第一个装夹预调工单状态设置为 【等待组件】
+                        if workorder.production_id.tool_state in ['1', '2']:
+                            if workorder.state in ['ready']:
                                 workorder.state = 'waiting'
+                                continue
+                            elif workorder.state in ['waiting']:
+                                continue
+                            elif workorder.state == 'pending' and workorder == self.search(
+                                    [('production_id', '=', workorder.production_id.id),
+                                     ('routing_type', '=', '装夹预调'),
+                                     ('state', 'not in', ['rework', 'done', 'cancel'])],
+                                    limit=1,
+                                    order="sequence"):
+                                workorder.state = 'waiting'
+                                continue
+                        elif workorder.production_id.tool_state in ['0']:
+                            if workorder_ids.filtered(lambda a: a.state == 'rework'):
+                                if not workorder_ids.filtered(
+                                        lambda a: (a.routing_type not in ['装夹预调'] and
+                                                   a.state not in ['pending', 'done', 'rework', 'cancel'])):
+                                    # 查询工序最小的非完工、非返工的装夹预调工单
+                                    work_id = self.search(
+                                        [('production_id', '=', workorder.production_id.id),
+                                         ('state', 'not in', ['rework', 'done', 'cancel'])],
+                                        limit=1,
+                                        order="sequence")
+                                    if work_id.routing_type == '装夹预调':
+                                        if workorder == work_id:
+                                            if workorder.production_id.reservation_state == 'assigned':
+                                                workorder.state = 'ready'
+                                            elif workorder.production_id.reservation_state != 'assigned':
+                                                workorder.state = 'waiting'
+                                                continue
+                                        elif (workorder.name == '装夹预调' and
+                                              workorder.state not in ['rework', 'done', 'cancel']):
+                                            if workorder.state != 'pending':
+                                                workorder.state = 'pending'
+                    if workorder.production_id.tool_state in ['1', '2'] and workorder.state == 'ready':
+                        workorder.state = 'waiting'
+                        continue
 
-            # re_work = self.env['mrp.workorder'].search([('production_id', '=', workorder.production_id.id),
-            #                                             ('processing_panel', '=', workorder.processing_panel),
-            #                                             ('is_rework', '=', True), ('state', 'in', ['done', 'rework'])])
-            # cnc_workorder = self.env['mrp.workorder'].search(
-            #     [('production_id', '=', workorder.production_id.id),
-            #      ('processing_panel', '=', workorder.processing_panel),
-            #      ('routing_type', '=', 'CNC加工'), ('state', 'in', ['done', 'rework']),
-            #      ('test_results', '=', '返工')])
-            # cnc_workorder_pending = self.env['mrp.workorder'].search(
-            #     [('production_id', '=', workorder.production_id.id),
-            #      ('processing_panel', '=', workorder.processing_panel),
-            #      ('routing_type', '=', 'CNC加工'), ('state', 'in', ['pending'])])
-            # unclamp_workorder = self.env['mrp.workorder'].search(
-            #     [('production_id', '=', workorder.production_id.id),
-            #      ('sequence', '=', workorder.sequence - 1),
-            #      ('state', 'in', ['done'])])
-            # if workorder.state not in ['cancel', 'progress', 'rework']:
-            #     if workorder.production_id.state == 'rework':
-            #         if workorder.routing_type == '装夹预调':
-            #             # # 有返工工单
-            #             # if re_work:
-            #             # 新工单
-            #             if workorder.is_rework is False:
-            #                 if (workorder.production_id.programming_state == '已编程'
-            #                         and workorder.production_id.is_rework is False):
-            #                     if re_work or cnc_workorder:
-            #                         workorder.state = 'ready'
-            #                 else:
-            #                     if workorder.production_id.is_rework is True:
-            #                         if re_work or cnc_workorder:
-            #                             workorder.state = 'waiting'
-            #
-            #         elif workorder.routing_type == 'CNC加工':
-            #             pre_workorder = self.env['mrp.workorder'].search(
-            #                 [('production_id', '=', workorder.production_id.id),
-            #                  ('processing_panel', '=', workorder.processing_panel),
-            #                  ('routing_type', '=', '装夹预调'), ('state', '=', 'done')])
-            #             if pre_workorder:
-            #                 if re_work:
-            #                     workorder.state = 'waiting'
-            #         elif workorder.routing_type == '解除装夹':
-            #             if cnc_workorder:
-            #                 if not cnc_workorder_pending or unclamp_workorder.test_results == '报废':
-            #                     workorder.state = 'waiting'
-            #         # else:
-            #         #     if workorder.production_id.is_rework is True:
-            #         #         workorder.state = 'waiting'
-            #     elif workorder.production_id.state == 'progress':
-            #         if (workorder.routing_type == '装夹预调' and workorder.production_id.programming_state == '已编程'
-            #                 and workorder.is_rework is False and workorder.state not in ['done', 'rework', 'cancel']):
-            #             if workorder.production_id.is_rework is False:
-            #                 if re_work or cnc_workorder or unclamp_workorder:
-            #                     workorder.state = 'ready'
-            #             # if (re_work or cnc_workorder) and workorder.production_id.is_rework is False:
-            #             #     workorder.state = 'ready'
-            #     elif workorder.production_id.state == 'scrap':
-            #         if workorder.routing_type == '解除装夹' and unclamp_workorder.test_results == '报废':
-            #             workorder.state = 'waiting'
+            # elif workorder.routing_type == 'CNC加工' and workorder.state not in ['done', 'cancel', 'progress',
+            #                                                                      'rework']:
+            #     per_work = self.env['mrp.workorder'].search(
+            #         [('routing_type', '=', '装夹预调'), ('production_id', '=', workorder.production_id.id),
+            #          ('processing_panel', '=', workorder.processing_panel), ('is_rework', '=', True)])
+            #     if per_work:
+            #         workorder.state = 'waiting'
+            # if workorder.routing_type == 'CNC加工' and workorder.state == 'progress':
+            #     workorder.state = 'to be detected'
+
+        # for workorder in self:
+        #     if workorder.is_rework is True and workorder.state == 'done':
+        #         cnc_work = self.env['mrp.workorder'].search([('routing_type','=','CNC加工'),('production_id','=',workorder.production_id.id)])
+        #         if cnc_work:
+        #             cnc_work.state = 'waiting'
+        #     if workorder.state == 'pending':
+        #         if all([wo.state in ('done', 'cancel') for wo in workorder.blocked_by_workorder_ids]):
+        #             workorder.state = 'ready' if workorder.production_id.reservation_state == 'assigned' else 'waiting'
+        #             continue
+        #     if workorder.state not in ('waiting', 'ready'):
+        #         continue
+        #     if not all([wo.state in ('done', 'cancel') for wo in workorder.blocked_by_workorder_ids]):
+        #         workorder.state = 'pending'
+        #         continue
+        #     if workorder.production_id.reservation_state not in ('waiting', 'confirmed', 'assigned'):
+        #         continue
+        #     if workorder.production_id.reservation_state == 'assigned' and workorder.state == 'waiting':
+        #         workorder.state = 'ready'
+        #     elif workorder.production_id.reservation_state != 'assigned' and workorder.state == 'ready':
+        #         workorder.state = 'waiting'
 
     # 重写工单开始按钮方法
     def button_start(self):
@@ -1183,14 +1088,12 @@ class ResMrpWorkOrder(models.Model):
                 'actual_start_time': datetime.now()
             })
 
-        if self.sequence == 1:
+        if self.routing_type == '装夹预调':
             # 判断是否有坯料的序列号信息
             boolean = False
-            if self.production_id.move_raw_ids:
-                if self.production_id.move_raw_ids[0].move_line_ids:
-                    if self.production_id.move_raw_ids[0].move_line_ids:
-                        if self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
-                            boolean = True
+            if self.production_id.move_raw_ids[0].move_line_ids:
+                if self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
+                    boolean = True
             if not boolean:
                 raise UserError('制造订单【%s】缺少组件的序列号信息！' % self.production_id.name)
             self.pro_code = self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name
@@ -1294,8 +1197,8 @@ class ResMrpWorkOrder(models.Model):
                 if record.is_rework is False:
                     if not record.material_center_point:
                         raise UserError("坯料中心点为空，请检查")
-                # if record.X_deviation_angle <= 0:
-                #     raise UserError("X偏差角度小于等于0，请检查！本次计算的X偏差角度为：%s" % record.X_deviation_angle)
+                    if record.X_deviation_angle <= 0:
+                        raise UserError("X偏差角度小于等于0，请检查！本次计算的X偏差角度为：%s" % record.X_deviation_angle)
                 record.process_state = '待加工'
                 # record.write({'process_state': '待加工'})
                 record.production_id.process_state = '待加工'
@@ -1325,10 +1228,23 @@ class ResMrpWorkOrder(models.Model):
                 '''
                 record.date_finished = datetime.now()
             if record.routing_type == '表面工艺':
+                logging.info('record.picking_ids:%s' % record.picking_ids)
+                logging.info('record.picking_out:%s' % record.picking_ids[0])
                 if record.picking_ids:
-                    picks = record.picking_ids.filtered(lambda p: p.state not in ('done'))
-                    if picks:
-                        raise UserError('请先完成该工单的工艺外协再进行操作')
+                    for pick_item in record.picking_ids:
+                        if pick_item.state not in ['done']:
+                            raise UserError(
+                                '请先完成该工单的工艺外协再进行操作')
+                    picking_out = record.env['stock.move.line'].search(
+                        [('picking_id', '=', record.picking_ids[0].id)])
+                    logging.info('picking_out:%s' % picking_out.picking_id.name)
+                    # if picking_out:
+                    #     order_line_ids = []
+                    #     logging.info('surface_technics_parameters_id:%s' % record.surface_technics_parameters_id.name)
+                    #
+                    #     else:
+                    #         raise UserError(
+                    #             '请先在产品中配置表面工艺为%s相关的外协服务产品' % item.surface_technics_parameters_id.name)
             tem_date_planned_finished = record.date_planned_finished
             tem_date_finished = record.date_finished
             logging.info('routing_type:%s' % record.routing_type)
@@ -2019,56 +1935,3 @@ class CMMprogram(models.Model):
                         'program_create_date': datetime.strptime(item['program_create_date'], '%Y-%m-%d %H:%M:%S'),
                     }))
         return cmm_program
-
-    def update_work_start_end(self, date_planned_start, date_planned_end):
-        self.leave_id.write({
-            'date_from': date_planned_start,
-            'date_to': date_planned_end,
-        })
-        self.date_planned_finished = datetime.datetime.today() + datetime.timedelta(days=100)
-        self.date_planned_start = date_planned_start
-        self.date_planned_finished = date_planned_end
-        routing_workcenter = self.env['mrp.routing.workcenter'].sudo().search(
-            [('name', '=', self.routing_type)])
-
-        self.write({'date_planned_start': date_planned_start, 'date_planned_finished': date_planned_end,
-                    'duration_expected': routing_workcenter.time_cycle})
-
-    def auto_production_process(self, last_time, is_first, type_map):
-        date_planned_end = None
-        date_planned_start = None
-        duration_expected = datetime.timedelta(minutes=self.duration_expected)
-        reserve_time = datetime.timedelta(minutes=self.reserved_duration)
-        if is_first:
-            # 第一轮加工
-            if self.routing_type == '装夹预调':
-                date_planned_end = last_time - reserve_time
-                date_planned_start = date_planned_end - duration_expected
-            elif self.routing_type == 'CNC加工':
-                date_planned_start = last_time
-                date_planned_end = last_time + duration_expected
-                last_time = date_planned_end
-            else:
-                date_planned_start = last_time + reserve_time
-                date_planned_end = date_planned_start + duration_expected
-                last_time = date_planned_end
-            type_map.update({self.routing_type: True})
-        else:
-            date_planned_start = last_time + reserve_time
-            date_planned_end = date_planned_start + duration_expected
-            last_time = date_planned_end
-        return date_planned_start, date_planned_end, last_time
-
-    def manual_offline_process(self, last_time, is_first):
-        date_planned_end = None
-        date_planned_start = None
-        duration_expected = datetime.timedelta(minutes=self.duration_expected)
-        reserve_time = datetime.timedelta(minutes=self.reserved_duration)
-        if is_first:
-            date_planned_start = last_time
-            date_planned_end = last_time + duration_expected
-
-        else:
-            date_planned_start = last_time + reserve_time
-            date_planned_end = date_planned_start + duration_expected
-        return date_planned_start, date_planned_end, last_time

sf_manufacturing/models/product_template.py

@@ -16,12 +16,6 @@ from OCC.Extend.DataExchange import write_stl_file
 class ResProductMo(models.Model):
     _inherit = 'product.template'
 
-    def _get_machining_precision(self):
-        machinings = self.env['sf.machining.accuracy'].sudo().search([])
-
-        list = [(m.sync_id, m.name) for m in machinings]
-        return list
-
     model_file = fields.Binary('模型文件')
     categ_type = fields.Selection(string='产品的类别', related='categ_id.type', store=True)
     model_name = fields.Char('模型名称')
@@ -29,7 +23,12 @@ class ResProductMo(models.Model):
     model_width = fields.Float('模型宽(mm)', digits=(16, 3))
     model_height = fields.Float('模型高(mm)', digits=(16, 3))
     model_volume = fields.Float('模型体积(m³)')
-    model_machining_precision = fields.Selection(selection=_get_machining_precision, string='加工精度')
+    model_machining_precision = fields.Selection([
+        ('0.10', '±0.10mm'),
+        ('0.05', '±0.05mm'),
+        ('0.03', '±0.03mm'),
+        ('0.02', '±0.02mm'),
+        ('0.01', '±0.01mm')], string='加工精度')
     model_processing_panel = fields.Char('模型加工面板')
     model_remark = fields.Char('模型备注说明')
     length = fields.Float('长(mm)', digits=(16, 3))
@@ -141,11 +140,11 @@ class ResProductMo(models.Model):
     cutting_tool_coarse_medium_fine = fields.Selection(related='cutting_tool_model_id.integral_coarse_medium_fine', string='粗/中/精')
     # cutting_tool_model_id.integral_coarse_medium_fine
     # cutting_tool_run_out_accuracy_max = fields.Float('端跳精度max', digits=(6, 1))
-    cutting_tool_run_out_accuracy_max = fields.Char(related='cutting_tool_model_id.integral_run_out_accuracy_max', string='端跳精度max')
+    cutting_tool_run_out_accuracy_max = fields.Char(related='cutting_tool_model_id.integral_run_out_accuracy_max', string='端跳精度max', digits=(6, 1))
     # cutting_tool_model_id.integral_run_out_accuracy_max
     # cutting_tool_run_out_accuracy_min = fields.Float('端跳精度min', digits=(6, 1))
     cutting_tool_run_out_accuracy_min = fields.Char(related='cutting_tool_model_id.integral_run_out_accuracy_min',
-                                                       string='端跳精度min')
+                                                       string='端跳精度min', digits=(6, 1))
     # cutting_tool_model_id.integral_run_out_accuracy_min
     # cutting_tool_blade_tip_working_size = fields.Char('刀尖倒角度(°)', size=20)
     cutting_tool_blade_tip_working_size = fields.Char(related='specification_id.blade_tip_working_size',
@@ -775,9 +774,6 @@ class ResProductMo(models.Model):
     # bfm下单
     manual_quotation = fields.Boolean('人工编程', default=False, readonly=True)
     part_number = fields.Char(string='零件图号', readonly=True)
-    machining_drawings = fields.Binary('2D加工图纸', readonly=True)
-    quality_standard = fields.Binary('质检标准', readonly=True)
-    part_name = fields.Char(string='零件名称', readonly=True)
 
     @api.constrains('tool_length')
     def _check_tool_length_size(self):
@@ -839,34 +835,22 @@ class ResProductMo(models.Model):
         else:
             return self.env.ref('sf_dlm.product_uom_cubic_millimeter')
 
-    def attachment_update(self, name, res_id, res_field, mimetype):
-        attachment_info = self.env['ir.attachment'].sudo().search(
-            [('res_id', '=', res_id), ('res_field', '=', res_field)], limit=1)
-        attachment_info.write({'name': name, 'mimetype': mimetype})
-
     # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品
     def product_create(self, product_id, item, order_id, order_number, i):
         copy_product_id = product_id.with_user(self.env.ref("base.user_admin")).copy()
         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'])
-        # 获取坯料冗余配置
-        if not item.get('embryo_redundancy'):
-            embryo_redundancy_id = model_type.embryo_tolerance_id
-        else:
-            embryo_redundancy_id = item.get('embryo_redundancy')
-        if not embryo_redundancy_id:
-            raise UserError('请先配置模型类型内的坯料冗余')
         vals = {
             'name': '%s-%s-%s' % ('P', order_id.name, i),
-            'model_long': item['model_long'] + embryo_redundancy_id.long,
-            'model_width': item['model_width'] + embryo_redundancy_id.width,
-            'model_height': item['model_height'] + embryo_redundancy_id.height,
-            'model_volume': (item['model_long'] + embryo_redundancy_id.long) * (
-                    item['model_width'] + embryo_redundancy_id.width) * (
-                                    item['model_height'] + embryo_redundancy_id.height),
+            'model_long': item['model_long'] + model_type.embryo_tolerance,
+            'model_width': item['model_width'] + model_type.embryo_tolerance,
+            'model_height': item['model_height'] + model_type.embryo_tolerance,
+            'model_volume': (item['model_long'] + model_type.embryo_tolerance) * (
+                    item['model_width'] + model_type.embryo_tolerance) * (
+                                    item['model_height'] + model_type.embryo_tolerance),
             'product_model_type_id': model_type.id,
-            'model_processing_panel': item['processing_panel_detail'],
+            # 'model_processing_panel': 'R',
             'model_machining_precision': item['model_machining_precision'],
             'model_code': item['barcode'],
             'length': item['model_long'],
@@ -889,10 +873,6 @@ class ResProductMo(models.Model):
             'manual_quotation': item['manual_quotation'] or False,
             'part_number': item.get('part_number') or '',
             'active': True,
-            'machining_drawings': '' if not item['machining_drawings'] else base64.b64decode(
-                item['machining_drawings']),
-            'quality_standard': '' if not item['quality_standard'] else base64.b64decode(item['quality_standard']),
-            'part_name': item['part_name'],
         }
         tax_id = self.env['account.tax'].sudo().search(
             [('type_tax_use', '=', 'sale'), ('amount', '=', item.get('tax')), ('price_include', '=', 'True')])
@@ -900,12 +880,6 @@ class ResProductMo(models.Model):
             vals.update({'taxes_id': [(6, 0, [int(tax_id)])]})
         copy_product_id.sudo().write(vals)
         product_id.product_tmpl_id.active = False
-        if item['machining_drawings'] and item['machining_drawings_name'] and item['machining_drawings_mimetype']:
-            self.attachment_update(item['machining_drawings_name'], copy_product_id.product_tmpl_id.id,
-                                   'machining_drawings', item['machining_drawings_mimetype'])
-        if item['quality_standard'] and item['quality_standard_name'] and item['quality_standard_mimetype']:
-            self.attachment_update(item['quality_standard_name'], copy_product_id.product_tmpl_id.id,
-                                   'quality_standard', item['quality_standard_mimetype'])
         return copy_product_id
 
     def _get_ids(self, param):
@@ -941,40 +915,31 @@ class ResProductMo(models.Model):
         #     if surface_technology:
         #         no_bom_copy_product_id.route_ids |= surface_technology
         no_bom_copy_product_id.product_tmpl_id.active = True
-        logging.info('no_bom_copy_product_id[is_manual_processing]:%s' % no_bom_copy_product_id.is_manual_processing)
         materials_id = self.env['sf.production.materials'].search(
             [('materials_no', '=', item['texture_code'])])
         materials_type_id = self.env['sf.materials.model'].search(
             [('materials_no', '=', item['texture_type_code'])])
         model_type = self.env['sf.model.type'].search([], limit=1)
         supplier = self.env['mrp.bom'].get_supplier(materials_type_id)
-         # 获取坯料冗余配置
-        if not item.get('embryo_redundancy_id'):
-            embryo_redundancy_id = model_type.embryo_tolerance_id
-        else:
-            embryo_redundancy_id = item.get('embryo_redundancy_id')
-        if not embryo_redundancy_id:
-            raise UserError('请先配置模型类型内的坯料冗余')
         logging.info('no_bom_copy_product_supplier-vals:%s' % supplier)
         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),
+                                                       item['model_long'] + model_type.embryo_tolerance,
+                                                       item['model_width'] + model_type.embryo_tolerance,
+                                                       item['model_height'] + model_type.embryo_tolerance),
+            'length': item['model_long'] + model_type.embryo_tolerance,
+            'width': item['model_width'] + model_type.embryo_tolerance,
+            'height': item['model_height'] + model_type.embryo_tolerance,
+            'volume': (item['model_long'] + model_type.embryo_tolerance) * (
+                    item['model_width'] + model_type.embryo_tolerance) * (
+                              item['model_height'] + model_type.embryo_tolerance),
             'embryo_model_type_id': model_type.id,
             'list_price': item['price'],
             'materials_id': materials_id.id,
             'materials_type_id': materials_type_id.id,
-            'single_manufacturing': product_id.single_manufacturing,
             'is_bfm': True,
-            'active': True,
+            'active': True
         }
         # 外协和采购生成的坯料需要根据材料型号绑定供应商
         if route_type == 'subcontract' or route_type == 'purchase':