From 3226942ed3d0e1b7b2532e35768ec0e32a725c47 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Fri, 19 Jan 2024 15:45:15 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BA=A7=E5=93=81=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E5=92=8C=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?2.=E4=BC=98=E5=8C=96bfm=E6=B4=BE=E5=8D=95=E8=87=B3sf=E7=9A=84?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E6=B5=81=E7=A8=8B3.?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=A2=9E=E5=8A=A0=E7=BC=96=E7=A0=81=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_dlm/data/product_data.xml                  |  1 +
 sf_manufacturing/data/stock_data.xml          |  7 +++
 .../models/mrp_routing_workcenter.py          |  9 ++-
 sf_manufacturing/models/product_template.py   |  4 +-
 .../views/mrp_routing_workcenter_view.xml     |  3 +
 sf_sale/models/auto_quatotion_common.py       |  2 +-
 sf_sale/models/quick_easy_order.py            |  4 +-
 sf_sale/models/sale_order.py                  |  6 +-
 sf_sale/security/ir.model.access.csv          |  2 +-
 sf_sale/views/sale_order_view.xml             |  2 +-
 sf_warehouse/models/model.py                  | 24 -------
 sf_warehouse/views/view.xml                   | 63 -------------------
 12 files changed, 26 insertions(+), 101 deletions(-)

diff --git a/sf_dlm/data/product_data.xml b/sf_dlm/data/product_data.xml
index f4a256bd..95d19c39 100644
--- a/sf_dlm/data/product_data.xml
+++ b/sf_dlm/data/product_data.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
+    <data>
         <record id="product_category_embryo_sf" model="product.category">
             <field name="name">坯料</field>
             <field name="type">坯料</field>
diff --git a/sf_manufacturing/data/stock_data.xml b/sf_manufacturing/data/stock_data.xml
index 74d02b4a..6bd0fe53 100644
--- a/sf_manufacturing/data/stock_data.xml
+++ b/sf_manufacturing/data/stock_data.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
+         <record id="sequence_routing_workcenter" model="ir.sequence">
+            <field name="name">工序编码规则</field>
+            <field name="code">mrp.routing.workcenter</field>
+            <field name="padding">4</field>
+            <field name="company_id" eval="False"/>
+        </record>
+
         <record id="sequence_stock_picking_out" model="ir.sequence">
             <field name="name">YourCompany Sequence ocout</field>
             <field name="prefix">WH/OCOUT/</field>
diff --git a/sf_manufacturing/models/mrp_routing_workcenter.py b/sf_manufacturing/models/mrp_routing_workcenter.py
index c8e7d8aa..95c70533 100644
--- a/sf_manufacturing/models/mrp_routing_workcenter.py
+++ b/sf_manufacturing/models/mrp_routing_workcenter.py
@@ -1,5 +1,6 @@
 import logging
-from odoo import fields, models
+from odoo import fields, models, api
+from odoo.exceptions import UserError
 
 
 class ResMrpRoutingWorkcenter(models.Model):
@@ -21,13 +22,17 @@ class ResMrpRoutingWorkcenter(models.Model):
     bom_id = fields.Many2one('mrp.bom', required=False)
     surface_technics_id = fields.Many2one('sf.production.process', string="表面工艺")
 
+    def generate_code(self):
+        return self.env['ir.sequence'].next_by_code('mrp.routing.workcenter')
+
+    code = fields.Char('编码', default=generate_code)
+
     # 获得当前登陆者公司
     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)
 
-
     # 排产的时候, 根据坯料的长宽高比对一下机床的最大加工尺寸.不符合就不要分配给这个加工中心(机床).
     # 工单对应的工作中心，根据工序中的工作中心去匹配，
     # 如果只配置了一个工作中心，则默认采用该工作中心；
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 7a341c36..42a392e2 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -6,8 +6,8 @@ import os
 from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
 from odoo.modules import get_resource_path
-# from OCC.Extend.DataExchange import read_step_file
-# from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 
 
 class ResProductMo(models.Model):
diff --git a/sf_manufacturing/views/mrp_routing_workcenter_view.xml b/sf_manufacturing/views/mrp_routing_workcenter_view.xml
index d0db3a7b..5ab745db 100644
--- a/sf_manufacturing/views/mrp_routing_workcenter_view.xml
+++ b/sf_manufacturing/views/mrp_routing_workcenter_view.xml
@@ -6,6 +6,9 @@
             <field name="model">mrp.routing.workcenter</field>
             <field name="inherit_id" ref="mrp.mrp_routing_workcenter_form_view"/>
             <field name="arch" type="xml">
+                <field name="name" position="before">
+                    <field name="code" readonly="1"/>
+                </field>
                 <field name="workcenter_id" position="replace">
                     <field name="workcenter_ids" widget="many2many_tags" string="工作中心" required="0"/>
                     <field name="surface_technics_id"
diff --git a/sf_sale/models/auto_quatotion_common.py b/sf_sale/models/auto_quatotion_common.py
index 10b83aed..09ea3f0f 100644
--- a/sf_sale/models/auto_quatotion_common.py
+++ b/sf_sale/models/auto_quatotion_common.py
@@ -2,7 +2,7 @@
 import logging
 from odoo.modules import get_resource_path
 from odoo import fields, models, api
-# from quatotion import readSql, feature_recognize, auto_quatotion
+from quatotion import readSql, feature_recognize, auto_quatotion
 
 __author__ = 'jinling.yang'
 _logger = logging.getLogger(__name__)
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index 7419cc9a..1e5f274c 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -5,8 +5,8 @@ import os
 import json
 from datetime import datetime
 import requests
-# from OCC.Extend.DataExchange import read_step_file
-# from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 from odoo import models, fields, api
 from odoo.modules import get_resource_path
 from odoo.exceptions import ValidationError, UserError
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 7c2fc260..7e991132 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -94,7 +94,7 @@ class ReSaleOrder(models.Model):
             'product_uom_qty': item['number'],
             'model_glb_file': base64.b64decode(item['model_file']),
         }
-        return self.env['sale.order.line'].create(vals)
+        return self.env['sale.order.line'].with_context(skip_procurement=True).create(vals)
 
     @api.constrains('order_line')
     def check_order_line(self):
@@ -122,10 +122,6 @@ class ResaleOrderLine(models.Model):
     model_glb_file = fields.Binary('模型的glb文件')
     check_status = fields.Selection(related='order_id.check_status')
 
-    def create(self, vals_list):
-        lines = super(ResaleOrderLine, self).create(vals_list)
-        return lines
-
 
 class RePurchaseOrder(models.Model):
     _inherit = 'purchase.order'
diff --git a/sf_sale/security/ir.model.access.csv b/sf_sale/security/ir.model.access.csv
index 403d4874..25b2dce0 100644
--- a/sf_sale/security/ir.model.access.csv
+++ b/sf_sale/security/ir.model.access.csv
@@ -12,7 +12,7 @@ access_product_product_group_sale_salemanager,product_product_group_sale_saleman
 access_product_product_group_sale_director,product_product_group_sale_director,product.model_product_product,sf_base.group_sale_director,1,1,1,0
 access_product_product_group_purchase,product_product_group_purchase,product.model_product_product,sf_base.group_purchase,1,0,0,0
 access_product_product_group_purchase_director,product_product_group_purchase_director,product.model_product_product,sf_base.group_purchase_director,1,1,1,0
-access_product_template_group_sale_salemanager,product_product_group_sale_salemanager,product.model_product_template,sf_base.group_sale_salemanager,1,0,0,0
+access_product_template_group_sale_salemanager,product_template_group_sale_salemanager,product.model_product_template,sf_base.group_sale_salemanager,1,0,0,0
 access_product_template_group_sale_director,product_template_group_sale_director,product.model_product_template,sf_base.group_sale_director,1,1,1,0
 access_product_template_group_purchase,product_template_group_purchase,product.model_product_template,sf_base.group_purchase,1,0,0,0
 access_product_template_group_purchase_director,product_template_group_purchase_director,product.model_product_template,sf_base.group_purchase_director,1,1,1,0
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index 38dbd853..f6bef6a6 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -84,7 +84,7 @@
                 <xpath expr="//form/header/button[@name='action_confirm'][2]" position="replace">
                     <button name="action_confirm" data-hotkey="v"
                             string="确认" type="object" context="{'validate_analytic': True}"
-                            attrs="{'invisible': ['|','&amp;',('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel']),'&amp;',('check_status', '=', 'approved'),('state', 'in', ['sale','cancel'])]}"/>
+                            attrs="{'invisible': ['|','&amp;',('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel']),'&amp;','&amp;',('check_status', '=', 'approved'),('state', 'in', ['sale','cancel']),('schedule_status', 'not in', False)]}"/>
                 </xpath>
                 <xpath expr="//form/header/button[@name='action_cancel']" position="attributes">
                     <attribute name="attrs">{'invisible': ['|',('state', 'in', ['cancel']),('check_status', 'in',
diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py
index b78ab04c..d03789cd 100644
--- a/sf_warehouse/models/model.py
+++ b/sf_warehouse/models/model.py
@@ -567,30 +567,6 @@ class SfPickingType(models.Model):
         self.check_state = 'enable'
 
 
-class SfProductCategory(models.Model):
-    _inherit = 'product.category'
-
-    check_state = fields.Selection([
-        ('enable', '启用'),
-        ('close', '关闭')
-    ], string='审核状态', default='close')
-
-    def action_check(self):
-        self.check_state = 'enable'
-
-
-class SfUomCategory(models.Model):
-    _inherit = 'uom.category'
-
-    check_state = fields.Selection([
-        ('enable', '启用'),
-        ('close', '关闭')
-    ], string='审核状态', default='close')
-
-    def action_check(self):
-        self.check_state = 'enable'
-
-
 class SfBarcodeNomenclature(models.Model):
     _inherit = 'barcode.nomenclature'
 
diff --git a/sf_warehouse/views/view.xml b/sf_warehouse/views/view.xml
index e4a2ea85..7f315363 100644
--- a/sf_warehouse/views/view.xml
+++ b/sf_warehouse/views/view.xml
@@ -312,69 +312,6 @@
             </field>
         </record>
 
-
-        <!--产品类别根据权限增加审核按钮-->
-        <record id="view_product_category_form_sf_inherit" model="ir.ui.view">
-            <field name="name">product.category.form.sf.inherit</field>
-            <field name="model">product.category</field>
-            <field name="inherit_id" ref="product.product_category_form_view"/>
-            <field name="arch" type="xml">
-                <xpath expr="//sheet" position="before">
-                    <header>
-                        <field name="check_state" invisible="1"/>
-                        <button name="action_check" string="审核" type="object"
-                                attrs="{'invisible': [('check_state','=', 'enable')]}"
-                                groups="sf_warehouse.group_sf_stock_manager"
-                                class="oe_highlight"/>
-                    </header>
-
-                </xpath>
-            </field>
-        </record>
-
-        <record id="view_product_category_tree_sf_inherit" model="ir.ui.view">
-            <field name="name">product.category.tree.sf.inherit</field>
-            <field name="model">product.category</field>
-            <field name="inherit_id" ref="product.product_category_list_view"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[last()]" position="after">
-                    <field name="check_state" widget="label_selection"
-                           options="{'classes': {'unchecked':'warning','checked': 'success'}}"/>
-                </xpath>
-            </field>
-        </record>
-
-        <!--计量单位类别根据权限增加审核按钮-->
-        <record id="view_uom_category_form_sf_inherit" model="ir.ui.view">
-            <field name="name">uom.category.form.sf.inherit</field>
-            <field name="model">uom.category</field>
-            <field name="inherit_id" ref="uom.product_uom_categ_form_view"/>
-            <field name="arch" type="xml">
-                <xpath expr="//sheet" position="before">
-                    <header>
-                        <field name="check_state" invisible="1"/>
-                        <button name="action_check" string="审核" type="object"
-                                attrs="{'invisible': [('check_state','=', 'enable')]}"
-                                groups="sf_warehouse.group_sf_stock_manager"
-                                class="oe_highlight"/>
-                    </header>
-
-                </xpath>
-            </field>
-        </record>
-
-        <record id="view_uom_category_tree_sf_inherit" model="ir.ui.view">
-            <field name="name">uom.category.tree.sf.inherit</field>
-            <field name="model">uom.category</field>
-            <field name="inherit_id" ref="uom.product_uom_categ_tree_view"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[last()]" position="after">
-                    <field name="check_state" widget="label_selection"
-                           options="{'classes': {'unchecked':'warning','checked': 'success'}}"/>
-                </xpath>
-            </field>
-        </record>
-
         <!--条码命名规则根据权限增加审核按钮-->
         <record id="view_barcode_nomenclature_form_sf_inherit" model="ir.ui.view">
             <field name="name">barcode.nomenclature.form.sf.inherit</field>