From 1a0e96bbdd063c833e454dfccd6bad1dbd779a18 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Fri, 17 May 2024 14:56:15 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=87=87=E8=B4=AD=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=E7=9A=84=E8=8B=B1=E6=96=87=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E6=94=B9=E4=B8=BA=E4=B8=AD=E6=96=87?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=9B=E5=BD=93=E5=AE=A1=E6=89=B9=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=90=8E=E9=9A=90=E8=97=8F=E5=8F=96=E6=B6=88=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=8C=89=E9=94=AE=EF=BC=9B2=E3=80=81=E5=88=80?=
 =?UTF-8?q?=E5=85=B7=E6=B3=A8=E5=86=8C=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3=E6=8F=90=E7=A4=BA=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_oca/models/tier_validation.py              |   6 -
 .../templates/tier_validation_templates.xml   | 140 ++++--------------
 .../models/functional_tool_enroll.py          |  12 ++
 3 files changed, 38 insertions(+), 120 deletions(-)

diff --git a/sf_oca/models/tier_validation.py b/sf_oca/models/tier_validation.py
index 1ca4c29c..02581609 100644
--- a/sf_oca/models/tier_validation.py
+++ b/sf_oca/models/tier_validation.py
@@ -1,13 +1,7 @@
 # Copyright 2017-19 ForgeFlow S.L. (https://www.forgeflow.com)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from ast import literal_eval
-
-from lxml import etree
-
 from odoo import _, api, fields, models
-from odoo.exceptions import ValidationError
-from odoo.tools.misc import frozendict
 
 
 class TierValidation(models.AbstractModel):
diff --git a/sf_oca/templates/tier_validation_templates.xml b/sf_oca/templates/tier_validation_templates.xml
index 24108bcc..8ec96ca7 100644
--- a/sf_oca/templates/tier_validation_templates.xml
+++ b/sf_oca/templates/tier_validation_templates.xml
@@ -1,122 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <template id="tier_validation_buttons">
-        <div>
-            <button
-                name="request_validation"
-                string="发起审批"
-                t-attf-attrs="{'invisible': ['|','|',('need_validation', '!=', True),('rejected','=',True),('#{state_field}', '#{state_operator}', #{state_value})]}"
-                type="object"
-            />
-            <button
-                name="restart_validation"
-                string="取消审批"
-                t-attf-attrs="{'invisible': ['|',('review_ids', '=', []),('#{state_field}', '#{state_operator}', #{state_value})]}"
-                type="object"
-            />
-        </div>
+    <template id="tier_validation_buttons_sf"
+              inherit_id="base_tier_validation.tier_validation_buttons">
+        <xpath expr="//button[@name='request_validation']" position="attributes">
+            <attribute name="string">发起审批</attribute>
+        </xpath>
+        <xpath expr="//button[@name='restart_validation']" position="attributes">
+            <attribute name="string">取消审批</attribute>
+            <attribute name="t-attf-attrs">{'invisible': ['|','|',('review_ids', '=', []),('#{state_field}',
+                '#{state_operator}', #{state_value}), ('validated', '=', True)]}
+            </attribute>
+        </xpath>
     </template>
-    <template id="tier_validation_label">
-        <div>
-        <field name="need_validation" invisible="1" />
-        <field name="validated" invisible="1" />
-        <field name="rejected" invisible="1" />
-        <div
-                class="alert alert-warning"
-                role="alert"
-                t-attf-attrs="{'invisible': ['|', '|', '|',
-             ('validated', '=', True), ('#{state_field}', '#{state_operator}', #{state_value}),
-             ('rejected', '=', True), ('review_ids', '=', [])]}"
-                style="margin-bottom:0px;"
-            >
+    <template id="tier_validation_label_sf"
+              inherit_id="base_tier_validation_forward.tier_validation_label_forward">
+        <xpath expr="//p/i[@class='fa fa-info-circle']" position="replace">
+            <i class="fa fa-info-circle"/>
+            这个单据需要验证.
+        </xpath>
+        <xpath expr="//div[@class='alert alert-success'][@role='alert']/p" position="replace">
             <p>
-                <i class="fa fa-info-circle" />
-                这个单据需要验证.
-                <field name="can_review" invisible="1" />
-                <button
-                        name="validate_tier"
-                        string="验证"
-                        attrs="{'invisible': [('can_review', '=', False)]}"
-                        type="object"
-                        class="oe_inline oe_button btn-success"
-                        icon="fa-thumbs-up"
-                    />
-                <button
-                        name="reject_tier"
-                        string="拒绝"
-                        attrs="{'invisible': [('can_review', '=', False)]}"
-                        type="object"
-                        class="btn-icon btn-danger"
-                        icon="fa-thumbs-down"
-                    />
-                <br /><field name="next_review" readonly="1" />
+                <i class="fa fa-thumbs-up"/>
+                审批已通过.
             </p>
-        </div>
-        <div
-                class="alert alert-success"
-                role="alert"
-                t-attf-attrs="{'invisible': ['|', '|', ('validated', '!=', True), ('#{state_field}', '#{state_operator}', #{state_value}), ('review_ids', '=', [])]}"
-                style="margin-bottom:0px;"
-            >
-            <p>
-                <i class="fa fa-thumbs-up" />
-                Operation has been
-                <b>validated</b>
-                !
-            </p>
-        </div>
-        <div
-                class="alert alert-danger"
-                role="alert"
-                t-attf-attrs="{'invisible': ['|', '|', ('rejected', '!=', True), ('#{state_field}', '#{state_operator}', #{state_value}), ('review_ids', '=', [])]}"
-                style="margin-bottom:0px;"
-            >
-            <p>
-                <i class="fa fa-thumbs-down" />
-                Operation has been
-                <b>rejected</b>
-                .
-            </p>
-        </div>
-        </div>
-    </template>
-    <template id="tier_validation_reviews">
-        <field
-            name="review_ids"
-            widget="tier_validation"
-            attrs="{'invisible':[('review_ids', '=', [])]}"
-            style="width:100%%; margin-top: 10px;"
-        >
-        <tree>
-            <field name="id" />
-            <field name="name" />
-            <field name="sequence" />
-            <field name="requested_by" />
-            <field name="status" />
-            <field name="todo_by" />
-            <field name="done_by" />
-            <field name="reviewed_date" />
-            <field name="reviewed_formated_date" />
-            <field name="comment" />
-        </tree>
-            </field>
-    </template>
-
-
-    <template
-        id="tier_validation_label_forward"
-        inherit_id="sf_oca.tier_validation_label"
-    >
-        <xpath expr="//button[@name='reject_tier']" position="after">
-            <field name="can_forward" invisible="1" />
-            <button
-                name="forward_tier"
-                string="Forward"
-                attrs="{'invisible': [('can_forward', '=', False)]}"
-                type="object"
-                class="oe_inline oe_button btn-warning"
-                icon="fa-arrow-circle-right"
-            />
+        </xpath>
+        <xpath expr="//button[@name='validate_tier']" position="attributes">
+            <attribute name="string">验证</attribute>
+        </xpath>
+        <xpath expr="//button[@name='reject_tier']" position="attributes">
+            <attribute name="string">拒绝</attribute>
         </xpath>
     </template>
 </odoo>
diff --git a/sf_tool_management/models/functional_tool_enroll.py b/sf_tool_management/models/functional_tool_enroll.py
index 61ca4731..8a2a7965 100644
--- a/sf_tool_management/models/functional_tool_enroll.py
+++ b/sf_tool_management/models/functional_tool_enroll.py
@@ -60,6 +60,7 @@ class StockLot(models.Model):
     _description = '刀具物料序列号注册'
 
     def enroll_tool_material_stock(self):
+        logging.info('调用刀具物料序列号注册接口: enroll_tool_material_stock()')
         sf_sync_config = self.env['res.config.settings'].get_values()
         token = sf_sync_config['token']
         sf_secret_key = sf_sync_config['sf_secret_key']
@@ -69,6 +70,7 @@ class StockLot(models.Model):
         self._get_sync_stock_lot(objs_all, str_url, token, headers)
 
     def sync_enroll_tool_material_stock_all(self):
+        logging.info('调用刀具物料序列号注册接口: sync_enroll_tool_material_stock_all()')
         sf_sync_config = self.env['res.config.settings'].get_values()
         token = sf_sync_config['token']
         sf_secret_key = sf_sync_config['sf_secret_key']
@@ -104,6 +106,7 @@ class ToolMaterial(models.Model):
     crea_url = '/api/tool_material/create'
 
     def enroll_tool_material(self):
+        logging.info('调用刀具物料注册接口: enroll_tool_material()')
         sf_sync_config = self.env['res.config.settings'].get_values()
         token = sf_sync_config['token']
         sf_secret_key = sf_sync_config['sf_secret_key']
@@ -113,6 +116,7 @@ class ToolMaterial(models.Model):
         self._get_sync_tool_material_search(objs_all, str_url, token, headers)
 
     def sync_enroll_tool_material_all(self):
+        logging.info('调用刀具物料注册接口: sync_enroll_tool_material_all()')
         sf_sync_config = self.env['res.config.settings'].get_values()
         token = sf_sync_config['token']
         sf_secret_key = sf_sync_config['sf_secret_key']
@@ -163,6 +167,7 @@ class FunctionalCuttingToolEntity(models.Model):
 
     # 注册同步功能刀具列表
     def enroll_functional_tool_entity(self):
+        logging.info('调用功能刀具列表注册接口: enroll_functional_tool_entity()')
         sf_sync_config = self.env['res.config.settings'].get_values()
         token = sf_sync_config['token']
         sf_secret_key = sf_sync_config['sf_secret_key']
@@ -172,6 +177,7 @@ class FunctionalCuttingToolEntity(models.Model):
         self._get_sync_functional_cutting_tool_entity(objs_all, str_url, token, headers)
 
     def esync_enroll_functional_tool_entity_all(self):
+        logging.info('调用功能刀具列表注册接口: esync_enroll_functional_tool_entity_all()')
         sf_sync_config = self.env['res.config.settings'].get_values()
         token = sf_sync_config['token']
         sf_secret_key = sf_sync_config['sf_secret_key']
@@ -256,6 +262,7 @@ class FunctionalToolWarning(models.Model):
 
     # 注册同步功能刀具预警
     def enroll_functional_tool_warning(self):
+        logging.info('调用功能刀具预警注册接口: enroll_functional_tool_warning()')
         sf_sync_config = self.env['res.config.settings'].get_values()
         token = sf_sync_config['token']
         sf_secret_key = sf_sync_config['sf_secret_key']
@@ -265,6 +272,7 @@ class FunctionalToolWarning(models.Model):
         self.get_sync_functional_tool_warning(objs_all, str_url, token, headers)
 
     def sync_enroll_functional_tool_warning_all(self):
+        logging.info('调用功能刀具预警注册接口: sync_enroll_functional_tool_warning_all()')
         sf_sync_config = self.env['res.config.settings'].get_values()
         token = sf_sync_config['token']
         sf_secret_key = sf_sync_config['sf_secret_key']
@@ -329,6 +337,7 @@ class StockMoveLine(models.Model):
 
     # 注册同步功能刀具出入库记录
     def enroll_functional_tool_move(self):
+        logging.info('调用功能刀具出入库记录注册接口: enroll_functional_tool_move()')
         sf_sync_config = self.env['res.config.settings'].get_values()
         token = sf_sync_config['token']
         sf_secret_key = sf_sync_config['sf_secret_key']
@@ -338,6 +347,7 @@ class StockMoveLine(models.Model):
         self.get_sync_stock_move_line(objs_all, str_url, token, headers)
 
     def sync_enroll_functional_tool_move_all(self):
+        logging.info('调用功能刀具出入库记录注册接口: sync_enroll_functional_tool_move_all()')
         sf_sync_config = self.env['res.config.settings'].get_values()
         token = sf_sync_config['token']
         sf_secret_key = sf_sync_config['sf_secret_key']
@@ -393,6 +403,7 @@ class RealTimeDistributionFunctionalTools(models.Model):
 
     # 注册同步功能刀具预警
     def enroll_functional_tool_real_time_distribution(self):
+        logging.info('调用功能刀具安全库存注册接口: enroll_functional_tool_real_time_distribution()')
         sf_sync_config = self.env['res.config.settings'].get_values()
         token = sf_sync_config['token']
         sf_secret_key = sf_sync_config['sf_secret_key']
@@ -402,6 +413,7 @@ class RealTimeDistributionFunctionalTools(models.Model):
         self.get_sync_real_time_distribution_functional_tools(objs_all, str_url, token, headers)
 
     def sync_enroll_functional_tool_real_time_distribution_all(self):
+        logging.info('调用功能刀具安全库存注册接口: sync_enroll_functional_tool_real_time_distribution_all()')
         sf_sync_config = self.env['res.config.settings'].get_values()
         token = sf_sync_config['token']
         sf_secret_key = sf_sync_config['sf_secret_key']