From 6fed64ba2a3e4e2227d5f6f688d43452d7e47378 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 22 Nov 2023 17:55:30 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/stock.py     | 2 +-
 sf_plan/__manifest__.py              | 1 +
 sf_plan/security/ir.model.access.csv | 9 ++-------
 sf_plan/security/rules.xml           | 9 +++++++++
 sf_plan/views/view.xml               | 9 +++++----
 5 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 sf_plan/security/rules.xml

diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 1722886e..baae91e1 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -199,7 +199,7 @@ class StockRule(models.Model):
                 sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)])
                 if sale_order:
                     bb = sale_order.deadline_of_delivery
-                productions = self.env['sf.production.plan'].with_user(SUPERUSER_ID).sudo().with_company(company_id). \
+                productions = self.env['sf.production.plan'].sudo().with_company(company_id). \
                     create({
                     'name': production.name,
                     'order_deadline': sale_order.deadline_of_delivery,
diff --git a/sf_plan/__manifest__.py b/sf_plan/__manifest__.py
index 40b36882..d0cd7bcb 100644
--- a/sf_plan/__manifest__.py
+++ b/sf_plan/__manifest__.py
@@ -16,6 +16,7 @@
     'depends': ['sf_manufacturing'],
     'data': [
         'security/ir.model.access.csv',
+        # 'security/rules.xml',
         'views/view.xml',
     ],
 
diff --git a/sf_plan/security/ir.model.access.csv b/sf_plan/security/ir.model.access.csv
index 3a1a20c9..3123afe9 100644
--- a/sf_plan/security/ir.model.access.csv
+++ b/sf_plan/security/ir.model.access.csv
@@ -1,8 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_sf_production_plan,sf.production.plan,model_sf_production_plan,base.group_user,1,1,1,1
-access_sf_machine_schedule,sf.machine.schedule,model_sf_machine_schedule,base.group_user,1,1,1,1
-
-
-
-
-
+access_sf_production_plan,sf.production.plan,model_sf_production_plan,base.group_user,1,0,0,0
+access_sf_production_plan_for_dispatch,sf.production.plan for dispatch,model_sf_production_plan,sf_base.group_plan_dispatch,1,1,1,0
diff --git a/sf_plan/security/rules.xml b/sf_plan/security/rules.xml
new file mode 100644
index 00000000..7355bc8c
--- /dev/null
+++ b/sf_plan/security/rules.xml
@@ -0,0 +1,9 @@
+<odoo>
+<record id="plan_order_rule_own" model="ir.rule">
+  <field name="name">Own Orders Only</field>
+  <field name="model_id" ref="model_sf_production_plan"/>
+  <field name="groups" eval="[(4, ref('sf_base.group_plan_dispatch'))]"/>
+<!--   <field name="domain_force">[('user_id', '=', user.id)]</field> -->
+  <field name="domain_force">[('create_uid', '=', user.id)]</field>
+</record>
+</odoo>
\ No newline at end of file
diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index 5df9e8db..c2faf029 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -18,8 +18,8 @@
                     <field name="date_planned_start"/>
                     <field name="date_planned_finished"/>
                     <field name="schedule_setting"/>
-                    <button name="do_production_schedule" class="btn schedule_done" string="生产排程" type="object" attrs="{'invisible': [('state', 'not in', ['draft'])]}"/>
-                    <button name="cancel_production_schedule" class="btn schedule_cancel" string="取消排程" type="object" attrs="{'invisible': [('state', 'not in', ['done'])]}"/>
+                    <button name="do_production_schedule" class="btn schedule_done" string="生产排程" type="object" attrs="{'invisible': [('state', 'not in', ['draft'])]}" groups="sf_base.group_plan_dispatch"/>
+                    <button name="cancel_production_schedule" class="btn schedule_cancel" string="取消排程" type="object" attrs="{'invisible': [('state', 'not in', ['done'])]}" groups="sf_base.group_plan_dispatch"/>
                 </tree>
             </field>
         </record>
@@ -31,8 +31,8 @@
                 <form string="订单计划">
                     <header>
 <!--                         <button string="执行排程" name="do_production_schedule" type="object" class="oe_highlight" icon="fa-step-forward"/> -->
-                        <button string="执行排程" name="do_production_schedule" type="object" class="oe_highlight" options='{"calendar_view": true, "date_begin": "2020-01-01", "date_end": "2020-12-31"}'/>
-                        <button string="取消排程" name="cancel_production_schedule" type="object" class="oe_highlight"/>
+                        <button string="执行排程" name="do_production_schedule" type="object" class="oe_highlight" options='{"calendar_view": true, "date_begin": "2020-01-01", "date_end": "2020-12-31"}' groups="sf_base.group_plan_dispatch"/>
+                        <button string="取消排程" name="cancel_production_schedule" type="object" class="oe_highlight" groups="sf_base.group_plan_dispatch"/>
 <!--                         <button string="销售单" name="test_sale_order" type="object" class="oe_highlight"/> -->
 <!--                         <button string="测试流程" name="liucheng_cs" type="object" class="oe_highlight"/> -->
                         <field name="state" widget="statusbar" statusbar_visible="draft,done,processing,finished"/>
@@ -261,6 +261,7 @@
                 name="计划"
                 sequence="150"
                 action="sf_production_plan_action"
+                groups="sf_base.group_plan_dispatch"
         />
 
 <!--         <record model="ir.ui.menu" id="mrp_custom_menu" inherit_id="mrp.menu_mrp_manufacturing"> -->

From f77691251ebb524d1c674b0e359b71b840334d30 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 23 Nov 2023 10:21:42 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=9F=E8=B8=AA=E6=B6=88=E6=81=AF=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8Cform=E8=A7=86=E5=9B=BE=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=BD=92=E6=A1=A3=E5=8F=96=E6=B6=88=E5=BD=92=E6=A1=A3=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=BD=92=E6=A1=A3=E6=9C=AA?=
 =?UTF-8?q?=E5=BD=92=E6=A1=A3=E7=9A=84=E7=AD=9B=E9=80=89=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_plan/models/custom_plan.py | 22 ++++++++++++++++++++++
 sf_plan/views/view.xml        | 21 ++++++++++++++++++---
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/sf_plan/models/custom_plan.py b/sf_plan/models/custom_plan.py
index 5fba575f..075c7e21 100644
--- a/sf_plan/models/custom_plan.py
+++ b/sf_plan/models/custom_plan.py
@@ -11,6 +11,7 @@ from odoo.exceptions import UserError, ValidationError
 class sf_production_plan(models.Model):
     _name = 'sf.production.plan'
     _description = 'sf_production_plan'
+    _inherit = ['mail.thread']
     _order = 'create_date desc'
 
     state = fields.Selection([
@@ -20,6 +21,7 @@ class sf_production_plan(models.Model):
         ('finished', '已完成')
     ], string='工单状态', tracking=True)
     name = fields.Char(string='工单编号')
+    active = fields.Boolean(string='已归档', default=True)
     # selected = fields.Boolean(default=False)
     # order_number = fields.Char(string='订单号')
     order_deadline = fields.Datetime(string='订单交期')
@@ -49,6 +51,26 @@ class sf_production_plan(models.Model):
     sequence = fields.Integer(string='序号', copy=False, readonly=True, index=True)
     current_operation_name = fields.Char(string='当前工序名称', size=64, default='生产计划')
 
+    # @api.model
+    # def _search(self, args, offset=0, limit=None, order=None, count=False, access_rights_uid=None):
+    #     """
+    #     默认修改筛选
+    #     """
+    #     return super(sf_production_plan, self.with_context(active_test=False))._search(
+    #         args, offset, limit, order, count, access_rights_uid)
+
+    def archive(self):
+        """
+        归档
+        """
+        self.write({'active': False})
+
+    def unarchive(self):
+        """
+        取消归档
+        """
+        self.write({'active': True})
+
     @api.model
     def get_import_templates(self):
         """returns the xlsx import template file"""
diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index c2faf029..ee3d441d 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -6,9 +6,6 @@
             <field name="model">sf.production.plan</field>
             <field name="arch" type="xml">
                 <tree string="订单计划">
-<!--                     <field name="selected" widget="boolean_toggle"/> -->
-                    <!--     sequence、pl_no、pl_name、quantity、plan_start_time、plan_end_time、actual_start_time、actual_end_time、state、create_uid、create_date -->
-<!--                     <field name="sequence"/> -->
                     <field name="state" widget="badge" decoration-warning="state == 'draft'" decoration-success="state == 'done'"/>
                     <field name="name"/>
                     <field name="origin"/>
@@ -33,6 +30,9 @@
 <!--                         <button string="执行排程" name="do_production_schedule" type="object" class="oe_highlight" icon="fa-step-forward"/> -->
                         <button string="执行排程" name="do_production_schedule" type="object" class="oe_highlight" options='{"calendar_view": true, "date_begin": "2020-01-01", "date_end": "2020-12-31"}' groups="sf_base.group_plan_dispatch"/>
                         <button string="取消排程" name="cancel_production_schedule" type="object" class="oe_highlight" groups="sf_base.group_plan_dispatch"/>
+                        <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/>
+                        <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/>
+
 <!--                         <button string="销售单" name="test_sale_order" type="object" class="oe_highlight"/> -->
 <!--                         <button string="测试流程" name="liucheng_cs" type="object" class="oe_highlight"/> -->
                         <field name="state" widget="statusbar" statusbar_visible="draft,done,processing,finished"/>
@@ -45,6 +45,7 @@
                         </div>
                         <group>
                             <group string="基本信息">
+                                <field name="active" invisible="1"/>
                                 <field name="production_id" widget="many2one_button"/>
                                 <field name="product_id"/>
                                 <field name="origin"/>
@@ -60,6 +61,17 @@
                                 <field name="actual_end_time"/>
                                 <field name="state"/>
                                 <field name="shift" widget="time"/>
+
+                                <!-- Chatter -->
+<!--                                 <div class="oe_chatter"> -->
+<!--                                     <field name="message_follower_ids" widget="mail_followers"/> -->
+<!--                                     <field name="message_ids" widget="mail_thread"/> -->
+<!--                                     <field name="activity_ids"/> -->
+<!--                                 </div> -->
+                                <div class="oe_chatter">
+                                    <field name="message_follower_ids"/>
+                                    <field name="message_ids"/>
+                                </div>
                             </group>
 <!--                             <group string="规格信息" col="1"> -->
 <!--                                 <group col="3"> -->
@@ -104,6 +116,9 @@
             <field name="model">sf.production.plan</field>
             <field name="arch" type="xml">
                 <search string="订单计划">
+                    <!-- Your other filters go here -->
+                    <filter name="archived" string="已归档" domain="[('active','=',False)]"/>
+                    <filter name="not archived" string="未归档" domain="[('active','=',True)]"/>
                     <field name="name"/>
                     <field name="product_qty"/>
                     <field name="date_planned_start"/>

From fee3572f3800d616ce09b57fa2d718a4734b7ede Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 23 Nov 2023 22:14:12 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_bf_connect/models/process_status.py        | 13 ++++-----
 sf_manufacturing/models/stock.py              | 28 +++++++++----------
 .../static/src/js/kanban_change.js            |  2 +-
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/sf_bf_connect/models/process_status.py b/sf_bf_connect/models/process_status.py
index 3a579920..f7b7dccd 100644
--- a/sf_bf_connect/models/process_status.py
+++ b/sf_bf_connect/models/process_status.py
@@ -3,7 +3,6 @@ import logging
 import requests
 from odoo import fields, models
 
-
 _logger = logging.getLogger(__name__)
 
 
@@ -203,12 +202,12 @@ class FinishStatusChange(models.Model):
                     [('id', 'child_of', self.picking_type_id.warehouse_id.view_location_id.id),
                      ('usage', '!=', 'supplier')])
                 if self.env['stock.move'].search([
-                    ('state', 'in', ['confirmed', 'partially_available', 'waiting', 'assigned']),
-                    ('product_qty', '>', 0),
-                    ('location_id', 'in', wh_location_ids),
-                    ('move_orig_ids', '=', False),
-                    ('picking_id', 'not in', self.ids),
-                    ('product_id', 'in', lines.product_id.ids)], limit=1):
+                        ('state', 'in', ['confirmed', 'partially_available', 'waiting', 'assigned']),
+                        ('product_qty', '>', 0),
+                        ('location_id', 'in', wh_location_ids),
+                        ('move_orig_ids', '=', False),
+                        ('picking_id', 'not in', self.ids),
+                        ('product_id', 'in', lines.product_id.ids)], limit=1):
                     action = self.action_view_reception_report()
                     action['context'] = {'default_picking_ids': self.ids}
                     return action
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index baae91e1..98e98863 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -5,7 +5,7 @@ import logging
 import json
 from re import split as regex_split
 from re import findall as regex_findall
-from datetime import datetime, timedelta
+from datetime import datetime
 import requests
 from odoo import SUPERUSER_ID, _, api, fields, models
 from odoo.tools import float_compare
@@ -148,7 +148,8 @@ class StockRule(models.Model):
             raise ProcurementException(errors)
 
         for company_id, productions_values in productions_values_by_company.items():
-            # create the MO as SUPERUSER because the current user may not have the rights to do it (mto product launched by a sale for example)
+            # create the MO as SUPERUSER because the current user may not have the rights to do it
+            # (mto product launched by a sale for example)
             '''创建制造订单'''
             productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(company_id).create(
                 productions_values)
@@ -198,18 +199,17 @@ class StockRule(models.Model):
 
                 sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)])
                 if sale_order:
-                    bb = sale_order.deadline_of_delivery
-                productions = self.env['sf.production.plan'].sudo().with_company(company_id). \
-                    create({
-                    'name': production.name,
-                    'order_deadline': sale_order.deadline_of_delivery,
-                    'production_id': production.id,
-                    'date_planned_start': production.date_planned_start,
-                    'origin': production.origin,
-                    'product_qty': production.product_qty,
-                    'product_id': production.product_id.id,
-                    'state': 'draft',
-                })
+                    self.env['sf.production.plan'].sudo().with_company(company_id). \
+                        create({
+                            'name': production.name,
+                            'order_deadline': sale_order.deadline_of_delivery,
+                            'production_id': production.id,
+                            'date_planned_start': production.date_planned_start,
+                            'origin': production.origin,
+                            'product_qty': production.product_qty,
+                            'product_id': production.product_id.id,
+                            'state': 'draft',
+                        })
         return True
 
 
diff --git a/sf_manufacturing/static/src/js/kanban_change.js b/sf_manufacturing/static/src/js/kanban_change.js
index 72e7abbe..7e425e3b 100644
--- a/sf_manufacturing/static/src/js/kanban_change.js
+++ b/sf_manufacturing/static/src/js/kanban_change.js
@@ -38,7 +38,7 @@ class CustomKanbanController extends KanbanController {
         const button = ev.currentTarget;
         const id = button.getAttribute('data-id');
 
-        console.log('true_id', id);
+        // console.log('true_id', id);
         // const context = {production_line_show: 'shengchanxian1'}
         this.env.services.rpc('/web/dataset/call_kw', {
             model: 'mrp.workcenter',

From 858c163cbed12e3b5fe938e0bc62f142c767e74d Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 23 Nov 2023 22:14:56 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=B4=A7=E6=9E=B6=E8=B4=A7=E4=BD=8D=E4=B8=BA=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_warehouse/__manifest__.py              |   3 +-
 sf_warehouse/models/model.py              | 115 ++++++++++++-
 sf_warehouse/security/ir.model.access.csv |   2 +-
 sf_warehouse/views/shelf_location.xml     | 201 ++++++++++++++++++++++
 sf_warehouse/views/view.xml               |   2 +
 5 files changed, 318 insertions(+), 5 deletions(-)
 create mode 100644 sf_warehouse/views/shelf_location.xml

diff --git a/sf_warehouse/__manifest__.py b/sf_warehouse/__manifest__.py
index c3cdf682..0f241b90 100644
--- a/sf_warehouse/__manifest__.py
+++ b/sf_warehouse/__manifest__.py
@@ -13,8 +13,9 @@
     'depends': ['stock', 'web', ],
     'data': [
         # 'security/group_security.xml',
-        # 'security/ir.model.access.csv',
+        'security/ir.model.access.csv',
         'views/view.xml',
+        'views/shelf_location.xml',
     ],
     'demo': [
     ],
diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py
index cfa097ce..5e83ff1f 100644
--- a/sf_warehouse/models/model.py
+++ b/sf_warehouse/models/model.py
@@ -12,10 +12,13 @@ class SfLocation(models.Model):
     barcode = fields.Char('Barcode', copy=False, size=15)
 
     # 仓库类别（selection：库区、库位、货位）
+    # location_type = fields.Selection([
+    #     ('库区', '库区'),
+    #     ('货架', '货架'),
+    #     ('货位', '货位')
+    # ], string='存储类型')
     location_type = fields.Selection([
-        ('库区', '库区'),
-        ('货架', '货架'),
-        ('货位', '货位')
+        ('库区', '库区')
     ], string='存储类型')
     # 库区类型（selection：拣货区、存货区、收货区、退货区、次品区）
     area_type = fields.Selection([
@@ -25,6 +28,10 @@ class SfLocation(models.Model):
         ('退货区', '退货区'),
         ('次品区', '次品区')
     ], string='库区类型')
+    # 当前位置
+    current_location_id = fields.Many2one('sf.shelf.location', string='当前位置')
+    # 目的位置
+    destination_location_id = fields.Many2one('sf.shelf.location', string='目的位置')
     # 存储类型（selection：库区、货架）
     # storage_type = fields.Selection([
     #     ('库区', '库区'),
@@ -207,6 +214,108 @@ class SfLocation(models.Model):
     #     + str(j + 1)
 
 
+class ShelfLocation(models.Model):
+    _name = 'sf.shelf.location'
+    _description = '货架货位'
+
+    name = fields.Char('名称', required=True, size=20)
+    barcode = fields.Char('编码', copy=False, size=15)
+
+    # 仓库类别（selection：库区、库位、货位）
+    location_type = fields.Selection([
+        ('货架', '货架'),
+        ('货位', '货位')
+    ], string='存储类型')
+    # 绑定库区
+    location_id = fields.Many2one('stock.location', string='所属库区', domain=[('location_type', '=', '库区')])
+    # 产品类别 （关联：product.category）
+    product_type = fields.Many2many('product.category', string='产品类别')
+    # 货架独有字段：通道、方向、货架高度（m）、货架层数、层数容量
+    channel = fields.Char(string='通道')
+    direction = fields.Selection([
+        ('R', 'R'),
+        ('L', 'L')
+    ], string='方向')
+    shelf_height = fields.Float(string='货架高度(m)')
+    shelf_layer = fields.Integer(string='货架层数')
+    layer_capacity = fields.Integer(string='层数容量')
+
+    # 货位独有字段：货位状态、产品（关联产品对象）、产品序列号（关联产品序列号对象）
+    location_status = fields.Selection([
+        ('空闲', '空闲'),
+        ('占用', '占用'),
+        ('禁用', '禁用')
+    ], string='货位状态', default='空闲')
+    # product_id = fields.Many2one('product.template', string='产品')
+    product_id = fields.Many2one('product.product', string='产品', compute='_compute_product_id', readonly=True)
+    product_sn_id = fields.Many2one('stock.lot', string='产品序列号')
+
+    hide_shelf = fields.Boolean(compute='_compute_hide_what', string='隐藏货架')
+    hide_location = fields.Boolean(compute='_compute_hide_what', string='隐藏货位')
+
+    @api.depends('product_sn_id')
+    def _compute_product_id(self):
+        """
+        根据产品序列号，获取产品
+        """
+        for record in self:
+            if record.product_sn_id:
+                record.product_id = record.product_sn_id.product_id
+                record.location_status = '占用'
+            else:
+                record.product_id = False
+                # record.location_status = '空闲'
+
+    @api.depends('location_type')
+    def _compute_hide_what(self):
+        """
+        根据仓库类别，隐藏不需要的字段
+        :return:
+        """
+        for record in self:
+            record.hide_shelf = False
+            record.hide_location = False
+            if record.location_type and record.location_type == '货架':
+                record.hide_shelf = True
+            elif record.location_type and record.location_type == '货位':
+                record.hide_location = True
+            else:
+                pass
+
+    # 生成货位
+    def create_location(self):
+        """
+        当仓库类型为货架时，自动生成其下面的货位，数量为货架层数*层数容量
+        """
+        if self.location_type == '货架':
+            for i in range(self.shelf_layer):
+                for j in range(self.layer_capacity):
+                    self.create({
+                        'name': self.name + '-' + str(i + 1) + '层' + '-' + str(j + 1) + '位置',
+                        'location_id': self.id,
+                        'location_type': '货位',
+                        'barcode': self.generate_barcode(i, j),
+                        'location_status': '空闲'
+                    })
+
+    def generate_barcode(self, i, j):
+        """
+        生成货位条码
+        """
+        # 这里是你生成barcode的代码
+        # area_type_barcode = self.location_id.barcode
+        area_type_barcode = self.barcode
+        i_str = str(i + 1).zfill(3)  # 确保是两位数，如果不足两位，左侧补0
+        j_str = str(j + 1).zfill(3)  # 确保是两位数，如果不足两位，左侧补0
+        return area_type_barcode + self.channel + self.direction + '-' + self.barcode + '-' + i_str + '-' + j_str
+
+    # def generate_barcode(self, i, j):
+    #     # 这里是你生成barcode的代码
+    #     area_type_barcode = self.location_id.barcode
+    #     return area_type_barcode + self.channel + self.direction + '-' + self.barcode + '-' + str(i + 1) + '-'
+    #     + str(j + 1)
+
+
 class SfProcurementGroup(models.Model):
     _inherit = 'procurement.group'
 
diff --git a/sf_warehouse/security/ir.model.access.csv b/sf_warehouse/security/ir.model.access.csv
index 94ce7d2b..46c1988e 100644
--- a/sf_warehouse/security/ir.model.access.csv
+++ b/sf_warehouse/security/ir.model.access.csv
@@ -1,4 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_stock_location,stock.location,model_stock_location,base.group_user,1,1,1,1
+access_sf_shelf_location,sf.shelf.location,model_sf_shelf_location,base.group_user,1,1,1,1
 
 
diff --git a/sf_warehouse/views/shelf_location.xml b/sf_warehouse/views/shelf_location.xml
new file mode 100644
index 00000000..a7ef00d9
--- /dev/null
+++ b/sf_warehouse/views/shelf_location.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+<data>
+    <record id="view_shelf_location_tree" model="ir.ui.view">
+        <field name="name">Shelf Location tree</field>
+        <field name="model">sf.shelf.location</field>
+        <field name="arch" type="xml">
+            <tree string="Shelf Location">
+                <field name="name" string="名称"/>
+                <field name="barcode" string="编码"/>
+                <field name="location_type"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_shelf_location_form" model="ir.ui.view">
+        <field name="name">Shelf Location form</field>
+        <field name="model">sf.shelf.location</field>
+        <field name="arch" type="xml">
+            <form string="Shelf Location">
+                <header>
+                    <button string="生成货位" name="create_location" type="object" class="oe_highlight" attrs="{'invisible': [('hide_shelf', '=', False)]}"/>
+                </header>
+                <sheet>
+                    <group>
+                        <field name="hide_shelf" invisible="1"/>
+                        <field name="hide_location" invisible="1"/>
+                        <field name="name" string="名称"/>
+                        <field name="barcode" string="编码"/>
+                        <field name="location_type"/>
+                        <field name="location_id"/>
+                        <field name="channel" attrs="{'invisible': [('hide_shelf', '=', False)], 'required': [('hide_shelf', '!=', False)]}"/>
+                        <field name="direction" attrs="{'invisible': [('hide_shelf', '=', False)], 'required': [('hide_shelf', '!=', False)]}"/>
+                        <field name="product_sn_id" attrs="{'invisible': [('hide_location', '=', False)], 'required': [('hide_location', '!=', False), ('location_status', '=', '空闲')]}"/>
+<!--                         <field name="product_type" widget="many2many_tags"/> -->
+                        <field name="shelf_height" attrs="{'invisible': [('hide_shelf', '=', False)], 'required': [('hide_shelf', '!=', False)]}"/>
+                        <field name="shelf_layer" attrs="{'invisible': [('hide_shelf', '=', False)], 'required': [('hide_shelf', '!=', False)]}"/>
+                        <field name="layer_capacity" attrs="{'invisible': [('hide_shelf', '=', False)], 'required': [('hide_shelf', '!=', False)]}"/>
+                        <field name="product_id" attrs="{'invisible': [('hide_location', '=', False)], 'required': [('hide_location', '!=', False), ('location_status', '=', '占用')]}"/>
+                        <field name="location_status" attrs="{'invisible': [('hide_location', '=', False)], 'required': [('hide_location', '!=', False)]}"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+<!--     自己生成 -->
+<!--     <record id="view_shelf_location_search" model="ir.ui.view"> -->
+<!--         <field name="name">Shelf Location</field> -->
+<!--         <field name="model">sf.shelf.location</field> -->
+<!--         <field name="arch" type="xml"> -->
+<!--             <search string="Shelf Location"> -->
+<!--                 <field name="name" string="名称"/> -->
+<!--                 <field name="barcode" string="编码"/> -->
+<!--                 <field name="location_type"/> -->
+<!--                 <field name="channel"/> -->
+<!--                 <field name="direction"/> -->
+<!--                 <field name="shelf_height"/> -->
+<!--                 <field name="shelf_layer"/> -->
+<!--                 <field name="layer_capacity"/> -->
+<!--             </search> -->
+<!--         </field> -->
+<!--     </record> -->
+<!--      -->
+<!--     <record id="view_shelf_location_kanban" model="ir.ui.view"> -->
+<!--         <field name="name">Shelf Location</field> -->
+<!--         <field name="model">sf.shelf.location</field> -->
+<!--         <field name="arch" type="xml"> -->
+<!--             <kanban class="o_kanban_mobile" js_class="custom_kanban"> -->
+<!--                 <field name="name"/> -->
+<!--                 <field name="barcode"/> -->
+<!--                 <field name="location_type"/> -->
+<!--                 <field name="channel"/> -->
+<!--                 <field name="direction"/> -->
+<!--                 <field name="shelf_height"/> -->
+<!--                 <field name="shelf_layer"/> -->
+<!--                 <field name="layer_capacity"/> -->
+<!--             </kanban> -->
+<!--         </field> -->
+<!--     </record> -->
+<!--      -->
+<!--     <record id="action_shelf_location" model="ir.actions.act_window"> -->
+<!--         <field name="name">Shelf Location</field> -->
+<!--         <field name="res_model">sf.shelf.location</field> -->
+<!--         <field name="view_mode">tree,form,kanban</field> -->
+<!--         <field name="search_view_id" ref="view_shelf_location_search"/> -->
+<!--     </record> -->
+<!--      -->
+<!--     <menuitem id="menu_shelf_location" name="Shelf Location" parent="sf_stock.menu_stock" sequence="1"/> -->
+<!--     <menuitem id="menu_shelf_location_tree" name="Shelf Location" parent="menu_shelf_location" action="action_shelf_location" sequence="1"/> -->
+
+
+<!--     <record id="view_location_search_sf_inherit" model="ir.ui.view"> -->
+<!--         <field name="name">stock.location.search.sf.inherit</field> -->
+<!--         <field name="model">stock.location</field> -->
+<!--         <field name="inherit_id" ref="stock.view_location_search"/> -->
+<!--         <field name="arch" type="xml"> -->
+<!--             <xpath expr="//search[1]" position="inside"> -->
+<!--                 <searchpanel class="account_root"> -->
+<!--                     <field name="location_type" icon="fa-filter"/> -->
+<!--                     <field name="location_id" select="multi" domain="[('location_type', '=', '货架')]"/> -->
+<!--                 </searchpanel> -->
+<!--             </xpath> -->
+<!--         </field> -->
+<!--     </record> -->
+<!--     <record id="example_kanban_view" model="ir.ui.view"> -->
+<!--         <field name="name">example.kanban</field> -->
+<!--         <field name="model">stock.location</field> -->
+<!--         <field name="arch" type="xml"> -->
+<!--             <kanban class="o_kanban_mobile" js_class="custom_kanban"> -->
+<!--                 <templates> -->
+<!--                 <t t-name="kanban-box"> -->
+<!--                     <div t-attf-class="oe_kanban_card oe_kanban_global_click -->
+<!--                         #{record.location_status.raw_value == '空闲' ? 'kanban_color_1' : ''} -->
+<!--                         #{record.location_status.raw_value == '占用' ? 'kanban_color_2' : ''} -->
+<!--                         #{record.location_status.raw_value == '禁用' ? 'kanban_color_3' : ''}"> -->
+<!--                          --><!-- 标题 -->
+<!--                         <div class="o_kanban_card_header"> -->
+<!--                             <div class="o_kanban_card_header_title"> -->
+<!--                                 <field name="name"/> -->
+<!--                             </div> -->
+<!--                         </div> -->
+<!--                          --><!-- 内容 -->
+<!--                         <div class="o_kanban_record_bottom"> -->
+<!--                             <field name="location_status"/> -->
+<!--                         </div> -->
+<!--                         <div class="o_kanban_record_bottom"> -->
+<!--                             <field name="product_sn_id"/> -->
+<!--                             <span> | </span> -->
+<!--                             <field name="product_id"/> -->
+<!--                         </div> -->
+<!--                     </div> -->
+<!--                 </t> -->
+<!--                     <t t-name="kanban-box"> -->
+<!--                          <div t-attf-class="oe_kanban_card oe_kanban_global_click -->
+<!--                             #{record.location_status.raw_value == '空闲' ? 'kanban_color_1' : ''} -->
+<!--                             #{record.location_status.raw_value == '占用' ? 'kanban_color_2' : ''} -->
+<!--                             #{record.location_status.raw_value == '禁用' ? 'kanban_color_3' : ''}"> -->
+<!--                              --><!--  --><!-- 看板内容 -->
+<!--                         </div> -->
+<!--                         <div t-attf-class="oe_kanban_card"> -->
+<!--                              --><!--  --><!-- 标题 -->
+<!--                             <div class="o_kanban_card_header"> -->
+<!--                                 <div class="o_kanban_card_header_title"> -->
+<!--                                     <field name="name"/> -->
+<!--                                 </div> -->
+<!--                             </div> -->
+<!--                              --><!--  --><!-- 内容 -->
+<!--                             <div class="o_kanban_record_bottom"> -->
+<!--                                 <field name="location_status"/> -->
+<!--                             </div> -->
+<!--                             <div class="o_kanban_record_bottom"> -->
+<!--                                 <field name="product_sn_id"/> -->
+<!--                                 <span> | </span> -->
+<!--                                 <field name="product_id"/> -->
+<!--                             </div> -->
+<!--                         </div> -->
+<!--                     </t> -->
+<!--                 </templates> -->
+<!--             </kanban> -->
+<!--         </field> -->
+<!--     </record> -->
+
+<!--     <record id="kanban_action_id" model="ir.actions.act_window"> -->
+<!--         <field name="name">货位状态</field> -->
+<!--         <field name="type">ir.actions.act_window</field> -->
+<!--         <field name="res_model">stock.location</field> -->
+<!--         <field name="view_mode">kanban,form</field> -->
+<!--     </record>     -->
+
+    <record id="action_sf_shelf_location" model="ir.actions.act_window">
+        <field name="name">货架货位</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.shelf.location</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+<!--     <record id="example_action" model="ir.actions.act_window"> -->
+<!--     <field name="name">Example</field> -->
+<!--     <field name="type">ir.actions.act_window</field> -->
+<!--     <field name="res_model">stock.location</field> -->
+<!--     <field name="view_mode">kanban</field> -->
+<!--     <field name="searchpanel">true</field> -->
+<!--     <field name="searchpanel_field_label">货架</field> -->
+<!--     <field name="searchpanel_field_name">parent_id</field> -->
+<!--     <field name="searchpanel_field_group_by">['parent_id']</field> -->
+<!--     <field name="domain">[('location_type', '=', '货位')]</field> -->
+<!-- </record> -->
+
+
+<!--     <menuitem id="menu_stock_location" name="货位状态" parent="stock.menu_stock_root" -->
+<!--         sequence="50" -->
+<!--         action="kanban_action_id"/>     -->
+
+    <menuitem id="menu_sf_shelf_location" name="货架货位" parent="stock.menu_warehouse_config"
+        sequence="2"
+        action="action_sf_shelf_location"/>
+
+
+</data>
+</odoo>
diff --git a/sf_warehouse/views/view.xml b/sf_warehouse/views/view.xml
index 56ddc19a..93e55dfb 100644
--- a/sf_warehouse/views/view.xml
+++ b/sf_warehouse/views/view.xml
@@ -32,6 +32,8 @@
                         <field name="product_sn_id" attrs="{'invisible': [('hide_location', '=', False)], 'required': [('hide_location', '!=', False), ('location_status', '=', '空闲')]}"/>
 <!--                        <field name="time_test" widget="timepicker"/>-->
                         <field name="area_type" attrs="{'invisible': [('hide_area', '=', False)], 'required': [('hide_area', '!=', False)]}"/>
+                        <field name="current_location_id" attrs="{'invisible': [('hide_area', '=', False)]}"/>
+                        <field name="destination_location_id" attrs="{'invisible': [('hide_area', '=', False)]}"/>
 
                     </group>
                     <group>

From bf8b45609c114a9b055ca41f5d5f65ba93742f33 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Fri, 24 Nov 2023 17:12:44 +0800
Subject: [PATCH 05/14] =?UTF-8?q?1=E3=80=81=E5=8A=9F=E8=83=BD=E5=88=80?=
 =?UTF-8?q?=E5=85=B7=E5=88=97=E8=A1=A8=E6=A8=A1=E5=9E=8B=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E5=BA=93=E5=AD=98=E5=8A=9F=E8=83=BD=EF=BC=9B2?=
 =?UTF-8?q?=E3=80=81=E9=87=8D=E6=9E=84=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=BA=93=E5=AD=98=E6=A8=A1=E5=9E=8B=EF=BC=9B?=
 =?UTF-8?q?3=E3=80=81=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E7=BB=84?=
 =?UTF-8?q?=E8=A3=85=E5=8D=95=E5=BC=B9=E7=AA=97=E7=95=8C=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99=E6=96=B0=E5=A2=9E=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E5=88=80=E5=85=B7=E6=88=BF=E7=9A=84=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E7=AD=9B=E9=80=89=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/models/base.py            | 181 +++++++-----------
 sf_tool_management/views/tool_base_views.xml | 190 +++++++++----------
 sf_tool_management/wizard/wizard.py          |  76 ++++++--
 3 files changed, 211 insertions(+), 236 deletions(-)

diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 7402632f..35949f47 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -6,11 +6,6 @@ from odoo import SUPERUSER_ID
 from odoo.exceptions import ValidationError
 
 
-# class FunctionalCuttingToolEntity(models.Model):
-#     _name = 'sf.functional.cutting.tool.entity'
-#     _inherit = 'sf.functional.cutting.tool'
-#     _inherits = {'sf.functional.cutting.tool': 'sf_functional_cutting_tool_entity_id'}
-#     _description = '功能刀具管理'
 class FunctionalCuttingToolEntity(models.Model):
     _name = 'sf.functional.cutting.tool.entity'
     _description = '功能刀具列表'
@@ -118,6 +113,14 @@ class FunctionalCuttingToolEntity(models.Model):
         result['domain'] = [('lot_id', '=', self.barcode_id.id), ('qty_done', '>', 0)]
         return result
 
+    def open_safety_stock(self):
+        action = self.env.ref('sf_tool_management.sf_real_time_distribution_of_functional_tools_view_act')
+        result = action.read()[0]
+        result['domain'] = [('name', '=', self.name), ('diameter', '=', self.functional_tool_diameter),
+                            ('knife_tip_r_angle', '=', self.knife_tip_r_angle),
+                            ('coarse_middle_thin', '=', self.coarse_middle_thin)]
+        return result
+
 
 class FunctionalToolWarning(models.Model):
     _name = 'sf.functional.tool.warning'
@@ -178,113 +181,74 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
     _name = 'sf.real.time.distribution.of.functional.tools'
     _description = '功能刀具安全库存'
 
-    functional_cutting_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', readonly=True)
-    mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
-                                               group_expand='_read_mrs_cutting_tool_type_ids',
-                                               store=True,
-                                               compute='_compute_functional_cutting_tool_ids')
+    name = fields.Char('功能刀具名称')
+    sf_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型',
+                                              group_expand='_read_mrs_cutting_tool_type_ids', store=True)
+    diameter = fields.Integer(string='刀具直径(mm)')
+    knife_tip_r_angle = fields.Float(string='刀尖R角(mm)')
+    tool_stock_num = fields.Integer(string='刀具房数量')
+    side_shelf_num = fields.Integer(string='线边刀库数量')
+    on_tool_stock_num = fields.Integer(string='机内刀库数量')
+    tool_stock_total = fields.Integer(string='当前库存量', readonly=True, compute='_compute_tool_stock_total')
+    min_stock_num = fields.Integer('最低库存量')
+    max_stock_num = fields.Integer('最高库存量')
+    batch_replenishment_num = fields.Integer('批次补货量')
+    unit = fields.Char('单位')
+    image = fields.Binary('图片')
+
+    coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精')
+    whether_standard_knife = fields.Boolean(string='是否标准刀', default=True)
+    # 能力特征信息
+    suitable_machining_method_ids = fields.Many2many(
+        'maintenance.equipment.image', 'rel_machining_product_template_distribution', '适合加工方式',
+        domain=[('type', '=', '加工能力')],
+        related='sf_functional_cutting_tool_entity_ids.suitable_machining_method_ids')
+    blade_tip_characteristics_id = fields.Many2many(
+        'maintenance.equipment.image', 'rel_blade_tip_product_template_distribution', '刀尖特征',
+        domain=[('type', '=', '刀尖特征')],
+        related='sf_functional_cutting_tool_entity_ids.blade_tip_characteristics_id')
+    handle_type_ids = fields.Many2many(
+        'maintenance.equipment.image', 'rel_handle_product_template_distribution', '柄部类型',
+        domain=[('type', '=', '柄部类型')], related='sf_functional_cutting_tool_entity_ids.handle_type_ids')
+    cutting_direction_ids = fields.Many2many(
+        'maintenance.equipment.image', 'rel_cutting_product_template_distribution', '走刀方向',
+        domain=[('type', '=', '走刀方向')], related='sf_functional_cutting_tool_entity_ids.cutting_direction_ids')
+    suitable_coolant_ids = fields.Many2many(
+        'maintenance.equipment.image', 'rel_coolant_product_template_distribution', '适合冷却液',
+        domain=[('type', '=', '冷却液')], related='sf_functional_cutting_tool_entity_ids.suitable_coolant_ids')
+
+    sf_functional_cutting_tool_entity_ids = fields.Many2many('sf.functional.cutting.tool.entity',
+                                                             'sf_functional_cutting_tool_entity_ref',
+                                                             string='功能刀具列表信息', readonly=True)
 
     @api.model
     def _read_mrs_cutting_tool_type_ids(self, categories, domain, order):
         mrs_cutting_tool_type_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
         return categories.browse(mrs_cutting_tool_type_ids)
 
-    @api.depends('functional_cutting_tool_id')
-    def _compute_functional_cutting_tool_ids(self):
-        for record in self:
-            if record:
-                record.mrs_cutting_tool_type_id = record.functional_cutting_tool_id.mrs_cutting_tool_type_id.id
-
-    barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
-    name = fields.Char('名称', invisible=True, readonly=True)
-    functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True)
-
-    # 整体式刀具型号
-    cutting_tool_integral_model_id = fields.Many2one(
-        'product.product', string='整体式刀具型号', readonly=True,
-        domain=[('cutting_tool_material_id', '=', '整体式刀具')],
-        related='functional_cutting_tool_id.cutting_tool_integral_model_id')
-
-    # 刀片型号
-    cutting_tool_blade_model_id = fields.Many2one(
-        'product.product', string='刀片型号', readonly=True,
-        domain=[('cutting_tool_material_id', '=', '刀片')],
-        related='functional_cutting_tool_id.cutting_tool_blade_model_id')
-
-    # 刀杆型号
-    cutting_tool_cutterbar_model_id = fields.Many2one(
-        'product.product', string='刀杆型号', readonly=True,
-        domain=[('cutting_tool_material_id', '=', '刀杆')],
-        related='functional_cutting_tool_id.cutting_tool_cutterbar_model_id')
-
-    # 刀盘型号
-    cutting_tool_cutterpad_model_id = fields.Many2one(
-        'product.product', string='刀盘型号', readonly=True,
-        domain=[('cutting_tool_material_id', '=', '刀盘')],
-        related='functional_cutting_tool_id.cutting_tool_cutterpad_model_id')
-
-    # 刀柄型号
-    cutting_tool_cutterhandle_model_id = fields.Many2one(
-        'product.product', string='刀柄型号', readonly=True,
-        domain=[('cutting_tool_material_id', '=', '刀柄')],
-        related='functional_cutting_tool_id.cutting_tool_cutterhandle_model_id')
-
-    # 夹头型号
-    cutting_tool_cutterhead_model_id = fields.Many2one(
-        'product.product', string='夹头型号', readonly=True,
-        domain=[('cutting_tool_material_id', '=', '夹头')],
-        related='functional_cutting_tool_id.cutting_tool_cutterhead_model_id')
-
-    diameter = fields.Float('直径(mm)', readonly=True)
-    tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
-                                  string='刀具等级', readonly=True)
-    machining_accuracy = fields.Float('加工精度(mm)', readonly=True)
-    tool_length = fields.Float('装刀长(mm)', readonly=True)
-    blade_number = fields.Integer('刃数', readonly=True)
-    integral_blade_length = fields.Float('整体刃长(mm)', readonly=True)
-    effective_blade_length = fields.Float('有效刃长(mm)', readonly=True)
-    max_life = fields.Float('最大寿命值', readonly=True)
-    is_standard = fields.Selection([('1', '是'), ('0', '否')], '是否标准刀', readonly=True,
-                                   compute='_compute_functional_cutting_tool_id')
-    applicable_range = fields.Char('适用范围', readonly=True)
-    image = fields.Binary('图片', readonly=True)
-
-    @api.depends('functional_cutting_tool_id')
-    def _compute_functional_cutting_tool_id(self):
-        if self.functional_cutting_tool_id:
-            self.tool_grade = self.functional_cutting_tool_id.tool_grade
-            self.is_standard = self.functional_cutting_tool_id.is_standard
-
-    # 功能刀具实时分布
-    tool_stock_num = fields.Integer(string='刀具房库存数量', readonly=False)
-    side_shelf_num = fields.Integer(string='线边货架货架数量', readonly=False)
-    on_tool_stock_num = fields.Integer(string='机内刀库库存数量', readonly=False)
-    tool_stock_total = fields.Integer(string='合计(库存)', readonly=True, compute='_compute_tool_stock_total')
-    return_reuse_num_re = fields.Integer(string='归还再用数量(精)', readonly=False)
-    return_reuse_num_co = fields.Integer(string='归还再用数量(粗)', readonly=False)
-    return_processing_num = fields.Integer(string='归还需磨削数量', readonly=False)
-    return_total = fields.Integer(string='合计(归还)', readonly=True, compute='_compute_return_total')
-    total = fields.Integer(string='总计', readonly=True, compute='_compute_total')
-    remark = fields.Char(string='备注/说明', readonly=False)
-
     @api.depends('tool_stock_num', 'side_shelf_num', 'on_tool_stock_num')
     def _compute_tool_stock_total(self):
         for record in self:
             if record:
                 self.tool_stock_total = record.tool_stock_num + record.side_shelf_num + record.on_tool_stock_num
 
-    @api.depends('return_reuse_num_re', 'return_reuse_num_co', 'return_processing_num')
-    def _compute_return_total(self):
-        for record in self:
-            if record:
-                self.return_total = (record.return_reuse_num_re + record.return_reuse_num_co +
-                                     record.return_processing_num)
-
-    @api.depends('tool_stock_total', 'return_total')
-    def _compute_total(self):
-        for record in self:
-            if record:
-                self.total = record.tool_stock_total + record.return_total
+    def create_or_edit_safety_stock(self, vals, sf_functional_cutting_tool_entity_ids):
+        """
+        根据传入的信息新增或者更新功能刀具安全库存的信息
+        """
+        print(vals)
+        # 根据功能刀具名称、直径或尖刀R角、粗/中/精查询该功能刀具是否已经存在
+        record = self.env['sf.real.time.distribution.of.functional.tools'].search(
+            [('name', '=', vals['name']), ('sf_cutting_tool_type_id', '=', vals['sf_cutting_tool_type_id']),
+             ('diameter', '=', vals['diameter']), ('knife_tip_r_angle', '=', vals['knife_tip_r_angle']),
+             ('knife_tip_r_angle', '=', vals['knife_tip_r_angle'])])
+        print(record)
+        if len(record) > 0:
+            for obj in record:
+                obj.write({'sf_functional_cutting_tool_entity_ids': [(4, sf_functional_cutting_tool_entity_ids.id)]})
+        else:
+            vals['sf_functional_cutting_tool_entity_ids'] = sf_functional_cutting_tool_entity_ids.ids
+            self.env['sf.real.time.distribution.of.functional.tools'].create(vals)
 
 
 class MachineTableToolChangingApply(models.Model):
@@ -293,6 +257,7 @@ class MachineTableToolChangingApply(models.Model):
     _order = 'cutter_spacing_code_id'
 
     name = fields.Char('名称', related='maintenance_equipment_id.name', store=True)
+    # 设备信息
     maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='CNC机床', required=True, readonly=False,
                                                domain=[('category_id.equipment_type', '=', '机床')])
     production_line_id = fields.Many2one('sf.production.line', string='生产线', readonly=True,
@@ -302,6 +267,7 @@ class MachineTableToolChangingApply(models.Model):
     machine_tool_code = fields.Char(string='机台号', store=True, invisible=True, readonly=True)
     cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=False,
                                              required=True, domain="[('equipment_id', '=', maintenance_equipment_id)]")
+    # 功能刀具信息
     functional_tool_name = fields.Char(string='刀具名称', related='functional_tool_name_id.name', store=True)
     barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', store=True,
                                  domain=[('product_id.name', '=', '功能刀具')],
@@ -407,20 +373,7 @@ class MachineTableToolChangingApply(models.Model):
 
             machine_table_tool_changing_apply.write(
                 {'status': '1',
-                 'sf_functional_tool_assembly_id': sf_functional_tool_assembly})
-
-    # def new_assembly_task(self, vals):
-    #     """
-    #     新建组装任务
-    #     :param vals:
-    #     :return:
-    #     """
-    #     # 增加设置直径的值
-    #     tool_changing_apply = self.env['sf.machine.table.tool.changing.apply'].search(
-    #         [('name', '=', vals['name'])])
-    #     vals['functional_tool_diameter'] = tool_changing_apply.diameter
-    #
-    #     self.env['sf.functional.tool.assembly'].create(vals)
+                 'sf_functional_tool_assembly_id': sf_functional_tool_assembly.id})
 
     def revocation_1(self):
         """
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 674c9faf..a764b896 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -61,6 +61,16 @@
                                     </span>
                                 </div>
                             </button>
+                            <button class="oe_stat_button"
+                                    name="open_safety_stock"
+                                    icon="fa-list-ul"
+                                    type="object">
+                                <div class="o_field_widget o_stat_info">
+                                    <span>
+                                        安全库存
+                                    </span>
+                                </div>
+                            </button>
                         </div>
                         <div class="oe_title">
                             <h1>
@@ -264,126 +274,95 @@
         </record>
 
 
-        <!--  =====================================功能刀具实时分布=============================================================      -->
+        <!--  =====================================功能刀具安全库存===================================================  -->
         <record id="sf_real_time_distribution_of_functional_tools_view_tree" model="ir.ui.view">
-            <field name="name">功能刀具实时分布</field>
+            <field name="name">功能刀具安全库存</field>
             <field name="model">sf.real.time.distribution.of.functional.tools</field>
             <field name="arch" type="xml">
                 <tree create="0" edit="0" delete="0">
-                    <field name="barcode_id"/>
-                    <field name="functional_tool_name_id"/>
-                    <field name="mrs_cutting_tool_type_id"/>
-                    <field name="cutting_tool_integral_model_id" optional="hide"/>
-                    <field name="cutting_tool_blade_model_id" optional="hide"/>
-                    <field name="cutting_tool_cutterbar_model_id" optional="hide"/>
-                    <field name="cutting_tool_cutterpad_model_id" optional="hide"/>
-                    <field name="cutting_tool_cutterhandle_model_id" optional="hide"/>
-                    <field name="cutting_tool_cutterhead_model_id" optional="hide"/>
-
+                    <field name="name"/>
+                    <field name="sf_cutting_tool_type_id" invisible="True"/>
+                    <field name="diameter"/>
+                    <field name="knife_tip_r_angle"/>
                     <field name="tool_stock_num"/>
                     <field name="side_shelf_num"/>
                     <field name="on_tool_stock_num"/>
                     <field name="tool_stock_total"/>
-                    <field name="return_reuse_num_re" optional="hide"/>
-                    <field name="return_reuse_num_co" optional="hide"/>
-                    <field name="return_processing_num" optional="hide"/>
-                    <field name="return_total" optional="hide"/>
-                    <field name="total" optional="hide"/>
-                    <field name="remark"/>
+                    <field name="min_stock_num"/>
+                    <field name="max_stock_num"/>
+                    <field name="batch_replenishment_num"/>
+                    <field name="unit"/>
                 </tree>
             </field>
         </record>
 
         <record id="sf_real_time_distribution_of_functional_tools_view_form" model="ir.ui.view">
-            <field name="name">功能刀具实时分布</field>
+            <field name="name">功能刀具安全库存</field>
             <field name="model">sf.real.time.distribution.of.functional.tools</field>
             <field name="arch" type="xml">
                 <form create="0" edit="0" delete="0">
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="barcode_id" readonly="1"/>
+                                <field name="name"/>
                             </h1>
                         </div>
                         <group>
                             <group>
-                                <field name="functional_tool_name_id" invisible="False"/>
-                                <field name="mrs_cutting_tool_type_id"/>
-
-                                <field name="cutting_tool_integral_model_id"
-                                       options="{'no_create': True, 'no_quick_create': True}"
-                                       attrs="{'invisible': [('cutting_tool_blade_model_id', '!=', False)]}"
-                                />
-                                <field name="cutting_tool_blade_model_id"
-                                       options="{'no_create': True, 'no_quick_create': True}"
-                                       attrs="{'invisible': [('cutting_tool_integral_model_id', '!=', False)]}"
-                                />
-                                <field name="cutting_tool_cutterbar_model_id"
-                                       options="{'no_create': True, 'no_quick_create': True}"
-                                       attrs="{'invisible': ['|',('cutting_tool_cutterpad_model_id','!=',False),('cutting_tool_blade_model_id', '=', False)]}"
-                                />
-                                <field name="cutting_tool_cutterpad_model_id"
-                                       options="{'no_create': True, 'no_quick_create': True}"
-                                       attrs="{'invisible': ['|',('cutting_tool_cutterbar_model_id','!=',False),('cutting_tool_blade_model_id', '=', False)]}"
-                                />
-                                <field name="cutting_tool_cutterhandle_model_id"
-                                       options="{'no_create': True, 'no_quick_create': True}"/>
-                                <field name="cutting_tool_cutterhead_model_id"
-                                       options="{'no_create': True, 'no_quick_create': True}"/>
-
+                                <field name="sf_cutting_tool_type_id"/>
+                                <field name="diameter"/>
+                                <field name="knife_tip_r_angle"/>
+                                <field name="coarse_middle_thin"/>
+                                <field name="whether_standard_knife"/>
                             </group>
                             <group>
-                                <field name="image" nolabel="1" widget="image"/>
+                                <field name="image" widget='image'/>
+                            </group>
+                        </group>
+                        <group col="1">
+                            <group string="适合加工方式">
+                                <field name="suitable_machining_method_ids" string=""
+                                       widget="custom_many2many_checkboxes"
+                                       domain="[('id','in',suitable_machining_method_ids)]"/>
+                            </group>
+                            <group>
+                                <group string="刀尖特征">
+                                    <field name="blade_tip_characteristics_id" string=""
+                                           widget="custom_many2many_checkboxes"
+                                           domain="[('id','in',blade_tip_characteristics_id)]"/>
+                                </group>
+                                <group string="柄部类型">
+                                    <field name="handle_type_ids" string="" widget="custom_many2many_checkboxes"
+                                           domain="[('id','in',handle_type_ids)]"/>
+                                </group>
+                            </group>
+                            <group>
+                                <group string="走刀方向">
+                                    <field name="cutting_direction_ids" string="" widget="custom_many2many_checkboxes"
+                                           domain="[('id','in',cutting_direction_ids)]"/>
+                                </group>
+                                <group string="适合冷却液">
+                                    <field name="suitable_coolant_ids" string="" widget="custom_many2many_checkboxes"
+                                           domain="[('id','in',suitable_coolant_ids)]"/>
+                                </group>
                             </group>
                         </group>
                         <notebook>
-                            <page string="实时分布信息">
-                                <group>
-                                    <group>
-                                        <group>
-                                            <field name="tool_stock_num"/>
-                                            <field name="return_reuse_num_re"/>
-                                        </group>
-                                        <group>
-                                            <field name="side_shelf_num"/>
-                                            <field name="return_reuse_num_co"/>
-                                        </group>
-                                    </group>
-                                    <group>
-                                        <group>
-                                            <field name="on_tool_stock_num"/>
-                                            <field name="return_processing_num"/>
-                                        </group>
-                                        <group>
-                                            <field name="tool_stock_total"/>
-                                            <field name="return_total"/>
-                                            <field name="total"/>
-                                        </group>
-                                    </group>
-                                </group>
-                            </page>
-                            <page string="参数信息">
-                                <group>
-                                    <group>
-                                        <field name="diameter"/>
-                                        <field name="tool_grade"/>
-                                        <field name="machining_accuracy"/>
-                                        <field name="tool_length"/>
-                                        <field name="blade_number"/>
-                                    </group>
-                                    <group>
-                                        <field name="integral_blade_length"/>
-                                        <field name="effective_blade_length"/>
-                                        <field name="max_life"/>
-                                        <field name="is_standard" default="false"/>
-                                        <field name="applicable_range"/>
-                                    </group>
-                                </group>
-                            </page>
-                            <page string="其他信息">
-                                <group>
-                                    <field name="remark"/>
-                                </group>
+                            <page string="刀具信息">
+                                <field name="sf_functional_cutting_tool_entity_ids" widget="many2many">
+                                    <tree>
+                                        <field name="barcode_id"/>
+                                        <field name="functional_tool_name_id"/>
+                                        <field name="new_former"/>
+                                        <field name="tool_loading_length"/>
+                                        <field name="functional_tool_length"/>
+                                        <field name="effective_length"/>
+                                        <field name="max_lifetime_value"/>
+                                        <field name="alarm_value"/>
+                                        <field name="used_value"/>
+                                        <field name="functional_tool_status"/>
+                                    </tree>
+                                </field>
                             </page>
                         </notebook>
                     </sheet>
@@ -392,28 +371,31 @@
         </record>
 
         <record id="sf_real_time_distribution_of_functional_tools_view_search" model="ir.ui.view">
-            <field name="name">功能刀具实时分布</field>
+            <field name="name">功能刀具安全库存</field>
             <field name="model">sf.real.time.distribution.of.functional.tools</field>
             <field name="arch" type="xml">
                 <search>
-                    <field name="barcode_id"/>
-                    <field name="functional_tool_name_id"/>
-                    <field name="mrs_cutting_tool_type_id"/>
-                    <field name="cutting_tool_integral_model_id" optional="hide"/>
-                    <field name="cutting_tool_blade_model_id" optional="hide"/>
-                    <field name="cutting_tool_cutterbar_model_id" optional="hide"/>
-                    <field name="cutting_tool_cutterpad_model_id" optional="hide"/>
-                    <field name="cutting_tool_cutterhandle_model_id" optional="hide"/>
-                    <field name="cutting_tool_cutterhead_model_id" optional="hide"/>
+                    <field name="name"/>
+                    <field name="sf_cutting_tool_type_id" invisible="True"/>
+                    <field name="diameter"/>
+                    <field name="knife_tip_r_angle"/>
+                    <field name="tool_stock_num"/>
+                    <field name="side_shelf_num"/>
+                    <field name="on_tool_stock_num"/>
+                    <field name="tool_stock_total"/>
+                    <field name="min_stock_num"/>
+                    <field name="max_stock_num"/>
+                    <field name="batch_replenishment_num"/>
+                    <field name="unit"/>
                     <searchpanel>
-                        <field name="mrs_cutting_tool_type_id" enable_counters="1" icon="fa-building"/>
+                        <field name="sf_cutting_tool_type_id" enable_counters="1" icon="fa-building"/>
                     </searchpanel>
                 </search>
             </field>
         </record>
 
         <record id="sf_real_time_distribution_of_functional_tools_view_act" model="ir.actions.act_window">
-            <field name="name">功能刀具实时分布</field>
+            <field name="name">功能刀具安全库存</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.real.time.distribution.of.functional.tools</field>
             <field name="view_mode">tree,form,search</field>
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index d667ba33..16ae5259 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -57,12 +57,10 @@ class ToolChangeRequirementInformation(models.TransientModel):
         确认换刀申请（按键）
         :return:
         """
-        print('已运行')
         record = self.env['sf.machine.table.tool.changing.apply'].search(
             [('maintenance_equipment_id', '=', self.maintenance_equipment_id.id),
              ('cutter_spacing_code_id', '=', self.cutter_spacing_code_id.id)
              ])
-        print('运行record_1')
 
         # 功能刀具组装创建新任务(new_assembly_task)
         sf_functional_tool_assembly = self.env['sf.functional.tool.assembly'].sudo().create({
@@ -86,13 +84,11 @@ class ToolChangeRequirementInformation(models.TransientModel):
             'reason_for_applying': self.reason_for_applying,
             'sf_machine_table_tool_changing_apply_id': record.id
         })
-        print('sf_functional_tool_assembly:', sf_functional_tool_assembly)
         # 修改机床换刀申请状态
         record.write({
             'status': '1',
-            'sf_functional_tool_assembly_id': sf_functional_tool_assembly
+            'sf_functional_tool_assembly_id': sf_functional_tool_assembly.id
         })
-        print('运行成功')
 
         # 关闭弹出窗口
         return {'type': 'ir.actions.act_window_close'}
@@ -186,7 +182,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     # 功能刀具组装信息
     # 整体式刀具型号
     integral_code_id = fields.Many2one('stock.lot', string='整体式刀具序列号',
-                                       domain=[('product_id.cutting_tool_material_id.name', '=', '整体式刀具')])
+                                       domain=[('product_id.cutting_tool_material_id.name', '=', '整体式刀具'),
+                                               ('quant_ids.location_id.name', 'in', ['刀具房'])])
     cutting_tool_integral_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='整体式刀具型号',
                                                      readonly=True)
     integral_name = fields.Char('整体式刀具名称', readonly=True)
@@ -194,14 +191,16 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
 
     # 刀片型号
     blade_code_id = fields.Many2one('stock.lot', '刀片序列号',
-                                    domain=[('product_id.cutting_tool_material_id.name', '=', '刀片')])
+                                    domain=[('product_id.cutting_tool_material_id.name', '=', '刀片'),
+                                            ('quant_ids.location_id.name', 'in', ['刀具房'])])
     cutting_tool_blade_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀片型号', readonly=True)
     blade_name = fields.Char('刀片名称', readonly=True)
     sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌', readonly=True)
 
     # 刀杆型号
     bar_code_id = fields.Many2one('stock.lot', '刀杆序列号',
-                                  domain=[('product_id.cutting_tool_material_id.name', '=', '刀杆')])
+                                  domain=[('product_id.cutting_tool_material_id.name', '=', '刀杆'),
+                                          ('quant_ids.location_id.name', 'in', ['刀具房'])])
     cutting_tool_cutterbar_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀杆型号',
                                                       readonly=True)
     bar_name = fields.Char('刀杆名称', readonly=True)
@@ -209,7 +208,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
 
     # 刀盘型号
     pad_code_id = fields.Many2one('stock.lot', '刀盘序列号',
-                                  domain=[('product_id.cutting_tool_material_id.name', '=', '刀盘')])
+                                  domain=[('product_id.cutting_tool_material_id.name', '=', '刀盘'),
+                                          ('quant_ids.location_id.name', 'in', ['刀具房'])])
     cutting_tool_cutterpad_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀盘型号',
                                                       readonly=True)
     pad_name = fields.Char('刀盘名称', readonly=True)
@@ -217,7 +217,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
 
     # 刀柄型号
     handle_code_id = fields.Many2one('stock.lot', '刀柄序列号', required=True,
-                                     domain=[('product_id.cutting_tool_material_id.name', '=', '刀柄')])
+                                     domain=[('product_id.cutting_tool_material_id.name', '=', '刀柄'),
+                                             ('quant_ids.location_id.name', 'in', ['刀具房'])])
     cutting_tool_cutterhandle_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀柄型号',
                                                          readonly=True)
     handle_name = fields.Char('刀柄名称', readonly=True)
@@ -225,7 +226,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
 
     # 夹头型号
     chuck_code_id = fields.Many2one('stock.lot', '夹头序列号', required=True,
-                                    domain=[('product_id.cutting_tool_material_id.name', '=', '夹头')])
+                                    domain=[('product_id.cutting_tool_material_id.name', '=', '夹头'),
+                                            ('quant_ids.location_id.name', 'in', ['刀具房'])])
     cutting_tool_cutterhead_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='夹头型号',
                                                        readonly=True)
     chuck_name = fields.Char('夹头名称', readonly=True, compute='_compute_auto_fill')
@@ -347,6 +349,10 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
         ])
         # 对物料做必填判断
         self.materials_must_be_judged()
+        # # 刀具物料出库
+        # if self.integral_code_id:
+        #     print("已运行1111")
+        #     self.tool_material_out_of_store(self.integral_code_id)
 
         # 创建组装入库单
         # 创建功能刀具批次/序列号记录
@@ -359,14 +365,16 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
         # 创建功能刀具列表记录
         # 封装功能刀具数据
         desc_2 = self.get_desc_2(stock_lot, functional_tool_assembly)
-        # 创建功能刀具列表、功能刀具预警、功能刀具实时分布、功能刀具出入库记录
+        # 创建功能刀具列表记录
         record_1 = self.env['sf.functional.cutting.tool.entity'].create(desc_2)
-        # self.env['sf.real.time.distribution.of.functional.tools'].create({
-        #     'functional_cutting_tool_id': record_1.id
-        # })
-        # self.env['sf.inbound.and.outbound.records.of.functional.tools'].create({
-        #     'functional_cutting_tool_id': record_1.id
-        # })
+        # 创建安全库存信息
+        self.env['sf.real.time.distribution.of.functional.tools'].create_or_edit_safety_stock({
+            'name': self.after_assembly_functional_tool_name,
+            'sf_cutting_tool_type_id': self.after_assembly_functional_tool_type_id.id,
+            'diameter': self.after_assembly_functional_tool_diameter,
+            'knife_tip_r_angle': self.after_assembly_knife_tip_r_angle,
+            'coarse_middle_thin': self.after_assembly_coarse_middle_thin,
+        }, record_1)
 
         # 修改功能刀具组装单信息
         functional_tool_assembly.write(desc_1)
@@ -430,6 +438,38 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
 
         return stock_lot
 
+    # def tool_material_out_of_store(self, tool_material_serial_id):
+    #     """
+    #     刀具物料出库
+    #     """
+    #     # 获取位置
+    #     location_id = self.env['stock.location'].search([('name', '=', 'Stock')])
+    #     location_dest_id = self.env['stock.location'].search([('name', '=', '刀具组装位置')])
+    #     print("已运行2222")
+    #     # 创建库存移动
+    #     stock_move_id = self.env['stock.move'].create({
+    #         'name': '刀具物料出库',
+    #         'lot_id': tool_material_serial_id.id,
+    #         'product_id': tool_material_serial_id.product_id.id,
+    #         'location_id': location_id.id,
+    #         'location_dest_id': location_dest_id.id,
+    #         'product_uom_qty': 1.00,
+    #         'state': 'done'
+    #     })
+    #     print("已运行3333")
+    #     print(stock_move_id)
+    #     # 创建移动历史
+    #     stock_move_line_id = self.env['stock.move.line'].create({
+    #         'product_id': tool_material_serial_id.product_id.id,
+    #         'lot_id': tool_material_serial_id.id,
+    #         'move_id': stock_move_id.id,
+    #         'install_tool_time': fields.Datetime.now(),
+    #         'qty_done': 1.0,
+    #         'state': 'done'
+    #     })
+    #
+    #     return stock_move_id, stock_move_line_id
+
     def create_stock_quant(self, product_id, stock_lot, functional_tool_assembly):
         """
             创建功能刀具该批次/序列号 库存移动和移动历史

From 54912f15b91f8894f25969709f27e9d6e778f6e2 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 27 Nov 2023 12:17:57 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=89=A9=E6=B5=81?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=95=E7=AD=89=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_bf_connect/__manifest__.py   |  4 +--
 sf_bf_connect/models/jd_eclp.py | 13 ++++++----
 sf_bf_connect/views/view.xml    | 43 +++++++++++++++++----------------
 3 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/sf_bf_connect/__manifest__.py b/sf_bf_connect/__manifest__.py
index 46ca09f8..ce938272 100644
--- a/sf_bf_connect/__manifest__.py
+++ b/sf_bf_connect/__manifest__.py
@@ -10,10 +10,10 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.cs.jikimo.com',
-    'depends': ['sf_base'],
+    'depends': ['sf_base', 'delivery'],
     'data': [
         'views/res_partner_view.xml',
-        # 'views/view.xml',
+        'views/view.xml',
         'report/bill_report.xml',
     ],
     'demo': [
diff --git a/sf_bf_connect/models/jd_eclp.py b/sf_bf_connect/models/jd_eclp.py
index dfcb20f8..493e739f 100644
--- a/sf_bf_connect/models/jd_eclp.py
+++ b/sf_bf_connect/models/jd_eclp.py
@@ -83,6 +83,7 @@ class JdEclp(models.Model):
         # sale_order_id = self.env['sale.order'].search([('name', '=', self.origin)])
 
         # if self.carrier_id == '京东物流':
+        config = self.env['res.config.settings'].get_values()
         createTime = str(datetime.now())
         json1 = {
             'params': {
@@ -106,7 +107,7 @@ class JdEclp(models.Model):
             },
         }
         _logger.info('准备调接口1')
-        url1 = 'https://bfm.cs.jikimo.com/api/create/jd/order'
+        url1 = config['bfm_url'] + '/api/create/jd/order'
         requests.post(url1, json=json1, data=None)
         _logger.info('调用成功1')
         _logger.info('准备调接口2')
@@ -115,7 +116,7 @@ class JdEclp(models.Model):
                 'orderNo': self.origin,
             },
         }
-        url2 = 'https://bfm.cs.jikimo.com/api/get/jd/no'
+        url2 = config['bfm_url'] + '/api/get/jd/no'
         response = requests.post(url2, json=json2, data=None)
         # _logger.info('调用成功2', response.json()['result']['wbNo'])
         self.carrier_tracking_ref = response.json()['result']['wbNo']
@@ -124,12 +125,16 @@ class JdEclp(models.Model):
         #     raise UserError("选择京东物流才能下单呦")
 
     def get_bill(self):
+        """
+        获取物流面单
+        """
+        config = self.env['res.config.settings'].get_values()
         json1 = {
             'params': {
                 'no': self.origin,
             },
         }
-        url1 = 'https://bfm.cs.jikimo.com/api/create/jd/bill'
+        url1 = config['bfm_url'] + '/api/create/jd/bill'
         response = requests.post(url1, json=json1, data=None)
         # _logger.info('调用成功2', response.json())
 
@@ -152,5 +157,3 @@ class JdEclp(models.Model):
             # 'model_name': 'stock.picking',
         })
         _logger.info(attachment)
-        # _logger.info(attachment.datas)
-        # _logger.info(attachment.datas_fname)
diff --git a/sf_bf_connect/views/view.xml b/sf_bf_connect/views/view.xml
index ec6dc394..a8236456 100644
--- a/sf_bf_connect/views/view.xml
+++ b/sf_bf_connect/views/view.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0"?>
 <odoo>
+
+    <record id="custom_view_picking_form" model="ir.ui.view">
+        <field name="name">物流</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.view_picking_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//form//header" position="inside">
+                <button string="京东物流下单" name="create_order" type="object" confirm="是否确认物流下单" class="btn-primary"/>
+                <button string="获取物流面单" name="get_bill" type="object" confirm="是否获取物流面单" class="btn-primary"/>
+            </xpath>
+        </field>
+    </record>
+
     <record id="tracking_view" model="ir.ui.view">
         <field name="name">tracking</field>
         <field name="model">stock.picking</field>
@@ -21,31 +34,19 @@
                 <field name="grossWeight"/>
                 <field name="grossVolume"/>
                 <field name="pickupBeginTime"/>
-                <field name="bill"/>
-
+                <field name="bill_show"/>
             </xpath>
             <xpath expr="//group//field[@name='group_id']" position="after">
                 <field name="bill_show" widget="pdf_viewer"/>
-
             </xpath>
-            <xpath expr="//group[@name='other_infos']" position="after">
-<!--                <group>-->
-                    <div>
-                        <button string="京东物流下单" name="create_order" type="object" confirm="是否确认物流下单" class="btn-primary"/>
-                    </div>
-
-<!--                </group>-->
-<!--                <group>-->
-                    <div>
-                        <button string="获取物流面单" name="get_bill" type="object" confirm="是否获取物流面单" class="btn-primary"/>
-
-                    </div>
-
-<!--                </group>-->
-
-            </xpath>
-
-
+<!--             <xpath expr="//group[@name='other_infos']" position="after"> -->
+<!--                 <div> -->
+<!--                     <button string="京东物流下单" name="create_order" type="object" confirm="是否确认物流下单" class="btn-primary"/> -->
+<!--                 </div> -->
+<!--                 <div> -->
+<!--                     <button string="获取物流面单" name="get_bill" type="object" confirm="是否获取物流面单" class="btn-primary"/> -->
+<!--                 </div> -->
+<!--             </xpath> -->
         </field>
     </record>
 </odoo>
\ No newline at end of file

From 96df8f971c99ea282864b9fbe558517daea3294e Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 27 Nov 2023 15:40:16 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E7=89=A9=E6=B5=81=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E5=8F=AF=E8=A7=81=E6=80=A7=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/src/list/custom_width.js           |  4 +-
 sf_bf_connect/models/jd_eclp.py               |  7 +++
 sf_bf_connect/views/view.xml                  | 51 ++++++++++++-------
 3 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/jikimo_frontend/static/src/list/custom_width.js b/jikimo_frontend/static/src/list/custom_width.js
index 31fd23ca..785bedb5 100644
--- a/jikimo_frontend/static/src/list/custom_width.js
+++ b/jikimo_frontend/static/src/list/custom_width.js
@@ -66,8 +66,8 @@ patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', {
         // }
 
         // 判断 this.state.columns 是否存在且长度大于零
-        if (this.state.columns && this.state.columns.length > 0 &&
-            this.state.columns[0].name === "sequence") {
+        if (this.state.columns && this.state.columns.length > 0
+            && this.state.columns[0].name === "sequence") {
           widths[1] = { type: "relative", value: 0.1 };
         }
 
diff --git a/sf_bf_connect/models/jd_eclp.py b/sf_bf_connect/models/jd_eclp.py
index 493e739f..1b3c10ab 100644
--- a/sf_bf_connect/models/jd_eclp.py
+++ b/sf_bf_connect/models/jd_eclp.py
@@ -40,6 +40,13 @@ class JdEclp(models.Model):
     # bill = fields.Many2one('ir.attachment', string='物流面单', compute='query_bill_pdf')
     # bill_show = fields.Binary(string='物流面单展示', readonly=True, related='self.bill.datas')
     bill_show = fields.Binary(string='物流面单展示', readonly=True)
+    check_out = fields.Char(string='查询是否为出库单', compute='_check_is_out')
+
+    @api.depends('name')
+    def _check_is_out(self):
+        if self.name:
+            is_check_out = self.name.split('/')
+            self.check_out = is_check_out[1]
 
     @api.depends('carrier_tracking_ref')
     def query_bill_pdf(self):
diff --git a/sf_bf_connect/views/view.xml b/sf_bf_connect/views/view.xml
index a8236456..c4f0e446 100644
--- a/sf_bf_connect/views/view.xml
+++ b/sf_bf_connect/views/view.xml
@@ -1,14 +1,27 @@
 <?xml version="1.0"?>
 <odoo>
 
+    <record id="add_check_out_view_picking_form" model="ir.ui.view">
+        <field name="name">增加一个check_out字段</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.view_picking_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//form//sheet//div[@name='button_box']" position="inside">
+                <field name="check_out" invisible="True"/>
+            </xpath>
+        </field>
+    </record>
+
     <record id="custom_view_picking_form" model="ir.ui.view">
         <field name="name">物流</field>
         <field name="model">stock.picking</field>
         <field name="inherit_id" ref="stock.view_picking_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//form//header" position="inside">
-                <button string="京东物流下单" name="create_order" type="object" confirm="是否确认物流下单" class="btn-primary"/>
-                <button string="获取物流面单" name="get_bill" type="object" confirm="是否获取物流面单" class="btn-primary"/>
+            <xpath expr="//form//header//button[@name='action_assign']" position="after">
+                <button string="京东物流下单" name="create_order" type="object" confirm="是否确认物流下单" class="btn-primary"
+                attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <button string="获取物流面单" name="get_bill" type="object" confirm="是否获取物流面单" class="btn-primary"
+                attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
             </xpath>
         </field>
     </record>
@@ -20,24 +33,24 @@
         <field name="arch" type="xml">
             <xpath expr="//group//field[@name='carrier_id']" position="after">
 <!--                 <field name="senderNickName" domain="[('self.name', 'like', '%OUT%')]"/> -->
-                <field name="senderNickName" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
-                <field name="expressItemName" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
-                <field name="deliveryType" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
-                <field name="receiverName" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
-                <field name="receiverMobile" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
-                <field name="receiverProvinceName" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
-                <field name="receiverCityName" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
-                <field name="receiverCountyName" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
-                <field name="receiverTownName" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
-                <field name="receiverCompany" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
-                <field name="remark" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
-                <field name="grossWeight"/>
-                <field name="grossVolume"/>
-                <field name="pickupBeginTime"/>
-                <field name="bill_show"/>
+                <field name="senderNickName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="expressItemName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="deliveryType" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="receiverName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="receiverMobile" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="receiverProvinceName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="receiverCityName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="receiverCountyName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="receiverTownName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="receiverCompany" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="remark" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="grossWeight" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="grossVolume" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="pickupBeginTime" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="bill_show" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
             </xpath>
             <xpath expr="//group//field[@name='group_id']" position="after">
-                <field name="bill_show" widget="pdf_viewer"/>
+                <field name="bill_show" widget="pdf_viewer" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
             </xpath>
 <!--             <xpath expr="//group[@name='other_infos']" position="after"> -->
 <!--                 <div> -->

From c78ea6fbe5ee830217cf761f06be0ea7de7b0d9a Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Mon, 27 Nov 2023 17:08:11 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9coding=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=89=AB=E6=8F=8F=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/models/ftp_client.py       |  4 ----
 sf_machine_connect/models/ftp_operate.py      |  2 --
 .../sf_equipment_maintenance_standards.py     |  4 ++--
 sf_maintenance/models/sf_maintenance.py       |  4 ++--
 .../models/sf_maintenance_requests.py         |  2 +-
 sf_manufacturing/__manifest__.py              |  8 -------
 sf_manufacturing/models/mrp_workorder.py      |  2 +-
 sf_sale/models/auto_quatotion_common.py       | 24 +++++++++----------
 sf_tool_management/__manifest__.py            |  2 +-
 sf_warehouse/models/model.py                  |  3 +--
 .../controllers/main.py                       |  1 -
 .../models/login_image.py                     |  2 +-
 .../models/res_config_settings.py             |  2 +-
 zpl_print/controllers/report.py               |  4 +---
 zpl_print/models/common.py                    |  2 +-
 15 files changed, 24 insertions(+), 42 deletions(-)

diff --git a/sf_machine_connect/models/ftp_client.py b/sf_machine_connect/models/ftp_client.py
index 7ca0ad06..8a3eb95f 100644
--- a/sf_machine_connect/models/ftp_client.py
+++ b/sf_machine_connect/models/ftp_client.py
@@ -3,9 +3,7 @@ import os
 import time
 import json
 import base64
-import shutil
 import logging
-import hashlib
 from io import BytesIO
 from zipfile import ZipFile
 from datetime import datetime, timedelta
@@ -13,8 +11,6 @@ import requests
 from odoo.http import request
 from odoo import fields, models, api, _
 from odoo.exceptions import UserError
-from odoo.exceptions import MissingError
-from odoo.exceptions import ValidationError
 from odoo.addons.sf_machine_connect.models import py2opcua, ftp_operate
 
 _logger = logging.getLogger(__name__)
diff --git a/sf_machine_connect/models/ftp_operate.py b/sf_machine_connect/models/ftp_operate.py
index 457ef6ed..29ee69a1 100644
--- a/sf_machine_connect/models/ftp_operate.py
+++ b/sf_machine_connect/models/ftp_operate.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import os
 import logging
 from ftplib import FTP
 
@@ -20,7 +19,6 @@ class FTP_P(FTP):
         cmd = 'LIST'
         templist = []
         tempdic = {}
-        func = None
         if args[-1:] and type(args[-1]) != type(''):
             args, func = args[:-1], args[-1]
         for arg in args:
diff --git a/sf_maintenance/models/sf_equipment_maintenance_standards.py b/sf_maintenance/models/sf_equipment_maintenance_standards.py
index 2892cac4..92a94c0e 100644
--- a/sf_maintenance/models/sf_equipment_maintenance_standards.py
+++ b/sf_maintenance/models/sf_equipment_maintenance_standards.py
@@ -1,6 +1,6 @@
 # -*-coding:utf-8-*-
-from odoo import api, fields, models, SUPERUSER_ID, _
-from odoo.exceptions import UserError
+from odoo import api, fields, models
+
 
 
 class SfEquipmentSaintenanceStandards(models.Model):
diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py
index 0bd64991..d7eb3d55 100644
--- a/sf_maintenance/models/sf_maintenance.py
+++ b/sf_maintenance/models/sf_maintenance.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 import json
 import base64
-from datetime import date, datetime, timedelta
+from datetime import timedelta
 import requests
 from odoo.addons.sf_base.commons.common import Common
-from odoo import api, fields, models, SUPERUSER_ID, _
+from odoo import api, fields, models, _
 from odoo.exceptions import UserError
 
 
diff --git a/sf_maintenance/models/sf_maintenance_requests.py b/sf_maintenance/models/sf_maintenance_requests.py
index 4c9e8fde..8686926b 100644
--- a/sf_maintenance/models/sf_maintenance_requests.py
+++ b/sf_maintenance/models/sf_maintenance_requests.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import base64
 
-from odoo import api, fields, models, SUPERUSER_ID, _
+from odoo import api, fields, models, _
 from odoo.exceptions import UserError
 
 
diff --git a/sf_manufacturing/__manifest__.py b/sf_manufacturing/__manifest__.py
index 69004216..d963ab3e 100644
--- a/sf_manufacturing/__manifest__.py
+++ b/sf_manufacturing/__manifest__.py
@@ -41,14 +41,6 @@
     ],
     'qweb': [
     ],
-    'assets': {
-        'web.assets_backend': [
-            'sf_manufacturing/static/src/js/kanban_change.js',
-            'sf_manufacturing/static/src/scss/kanban_change.scss',
-            'sf_manufacturing/static/src/xml/kanban_change.xml',
-        ],
-
-    },
     'license': 'LGPL-3',
     'installable': True,
     'application': False,
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 133c1ec0..8d3bf6c2 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -616,7 +616,7 @@ class CNCprocessing(models.Model):
         logging.info('folder_name:%s' % folder_name)
         serverdir = os.path.join('/tmp', folder_name, 'return', processing_panel)
         logging.info('serverdir:%s' % serverdir)
-        for root, dirs, files in os.walk(serverdir):
+        for root, files in os.walk(serverdir):
             for f in files:
                 logging.info('f:%s' % f)
                 if os.path.splitext(f)[1] == ".pdf":
diff --git a/sf_sale/models/auto_quatotion_common.py b/sf_sale/models/auto_quatotion_common.py
index d1bdb65a..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__)
@@ -24,14 +24,14 @@ class AutoQuatotion(models.Model):
     def get_process_time_db_path(self):
         return get_resource_path('sf_sale', 'models', 'process_time.db')
 
-    # def get_auto_quatotion(self, stp_url, feature_full_path, process_time_db_path, model_code):
-    #     '''
-    #     通过打包好的.so库，
-    #     以调用autoQuatotion库中Quatotion类，
-    #     初始化后调用类的analyseShape方法对模型文件进行价格预测
-    #     '''
-    #     # 初始化自动报价类(输入特征数据库和加工时间数据库)
-    #     reader = auto_quatotion.Quatotion(feature_full_path, process_time_db_path)
-    #     # 获取价格、加工时间、尺寸、XYZ、翻面次数
-    #     feature_info = reader.analyseShape(stp_url, InfoJson={})
-    #     return feature_info
+    def get_auto_quatotion(self, stp_url, feature_full_path, process_time_db_path, model_code):
+        '''
+        通过打包好的.so库，
+        以调用autoQuatotion库中Quatotion类，
+        初始化后调用类的analyseShape方法对模型文件进行价格预测
+        '''
+        # 初始化自动报价类(输入特征数据库和加工时间数据库)
+        reader = auto_quatotion.Quatotion(feature_full_path, process_time_db_path)
+        # 获取价格、加工时间、尺寸、XYZ、翻面次数
+        feature_info = reader.analyseShape(stp_url, InfoJson={})
+        return feature_info
diff --git a/sf_tool_management/__manifest__.py b/sf_tool_management/__manifest__.py
index d59c6b34..20bf2b2a 100644
--- a/sf_tool_management/__manifest__.py
+++ b/sf_tool_management/__manifest__.py
@@ -12,7 +12,7 @@
     'website': 'https://www.sf.jikimo.com',
     'depends': ['sf_base', 'sf_manufacturing'],
     'data': [
-        # 'security/group_security.xml',
+        'security/group_security.xml',
         'security/ir.model.access.csv',
         # 'views/tool_base_views.xml',
         #         # 'views/menu_view.xml',
diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py
index cfa097ce..3e6f52d0 100644
--- a/sf_warehouse/models/model.py
+++ b/sf_warehouse/models/model.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
-import logging
-from odoo import SUPERUSER_ID, _, api, fields, models
+from odoo import api, fields, models
 from odoo.osv import expression
 
 
diff --git a/yizuo_login_background_and_styles/controllers/main.py b/yizuo_login_background_and_styles/controllers/main.py
index 6412ba67..d1271133 100644
--- a/yizuo_login_background_and_styles/controllers/main.py
+++ b/yizuo_login_background_and_styles/controllers/main.py
@@ -23,7 +23,6 @@ try:
     import httpagentparser
 except ImportError:
     pass
-from time import gmtime, strftime
 from odoo.addons.web.controllers import home
 from odoo.http import request
 from odoo.exceptions import Warning
diff --git a/yizuo_login_background_and_styles/models/login_image.py b/yizuo_login_background_and_styles/models/login_image.py
index 5b3b19fe..c8a36e0d 100644
--- a/yizuo_login_background_and_styles/models/login_image.py
+++ b/yizuo_login_background_and_styles/models/login_image.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from odoo import models, fields, api, _
+from odoo import models, fields
 
 
 class LoginImage(models.Model):
diff --git a/yizuo_login_background_and_styles/models/res_config_settings.py b/yizuo_login_background_and_styles/models/res_config_settings.py
index 66394f9e..cefc659f 100644
--- a/yizuo_login_background_and_styles/models/res_config_settings.py
+++ b/yizuo_login_background_and_styles/models/res_config_settings.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from odoo import api, fields, models, modules
+from odoo import api, fields, models
 
 
 class ResConfigSettings(models.TransientModel):
diff --git a/zpl_print/controllers/report.py b/zpl_print/controllers/report.py
index ade1c26f..7d9041de 100644
--- a/zpl_print/controllers/report.py
+++ b/zpl_print/controllers/report.py
@@ -8,11 +8,9 @@ import werkzeug.exceptions
 import werkzeug.utils
 import werkzeug.wrappers
 import werkzeug.wsgi
-from werkzeug.urls import url_parse
 
 from odoo import http
-from odoo.http import content_disposition, request
-from odoo.tools.safe_eval import safe_eval, time
+from odoo.http import request
 from odoo.addons.web.controllers.report import ReportController
 from ..models.common import Common
 
diff --git a/zpl_print/models/common.py b/zpl_print/models/common.py
index c10d5a74..d45f74e0 100644
--- a/zpl_print/models/common.py
+++ b/zpl_print/models/common.py
@@ -18,4 +18,4 @@ class Common(models.Model):
             tsclibrary.printlabelW("0", "1");
             tsclibrary.closeport();
         except Exception as e:
-            raise UserWarning("错误警告")
+            raise UserWarning("错误警告:%s" % e)

From 5926d71d2720dd505cfa2f19a35493385409c3cd Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 27 Nov 2023 17:27:55 +0800
Subject: [PATCH 09/14] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=88=80=E5=85=B7=E5=88=97=E8=A1=A8=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=AE=A1=E7=AE=97=E5=8A=9F=E8=83=BD=E5=88=80?=
 =?UTF-8?q?=E5=85=B7=E5=9C=A8=E5=88=80=E5=85=B7=E6=88=BF=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=9B2=E3=80=81=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E5=AE=89=E5=85=A8=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=A8=A1=E5=9E=8B=E7=9B=B8=E5=90=8C=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E7=9A=84=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=9B3=E3=80=81=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E7=BB=84=E8=A3=85=E5=8D=95=E7=BB=84=E8=A3=85?=
 =?UTF-8?q?=E7=9A=84=E5=88=9D=E5=A7=8B=E4=BD=8D=E7=BD=AE=E4=B8=BAProductio?=
 =?UTF-8?q?n=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD=E5=88=80?=
 =?UTF-8?q?=E5=85=B7=E5=BA=8F=E5=88=97=E5=8F=B7=E7=9A=84=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/model_type.py         |  2 +-
 sf_tool_management/__manifest__.py            |  4 +-
 sf_tool_management/models/base.py             |  4 +-
 .../models/tool_material_search.py            |  2 +-
 sf_tool_management/views/tool_base_views.xml  |  1 +
 sf_tool_management/wizard/wizard.py           | 37 ++-----------------
 6 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/sf_manufacturing/models/model_type.py b/sf_manufacturing/models/model_type.py
index 48707939..29357d02 100644
--- a/sf_manufacturing/models/model_type.py
+++ b/sf_manufacturing/models/model_type.py
@@ -1,4 +1,4 @@
-from odoo import fields, models, api
+from odoo import fields, models
 
 
 class ModelType(models.Model):
diff --git a/sf_tool_management/__manifest__.py b/sf_tool_management/__manifest__.py
index d59c6b34..66142708 100644
--- a/sf_tool_management/__manifest__.py
+++ b/sf_tool_management/__manifest__.py
@@ -10,12 +10,10 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sf_base', 'sf_manufacturing'],
+    'depends': ['sf_manufacturing'],
     'data': [
         # 'security/group_security.xml',
         'security/ir.model.access.csv',
-        # 'views/tool_base_views.xml',
-        #         # 'views/menu_view.xml',
         'wizard/wizard_view.xml',
         'views/tool_base_views.xml',
         'views/menu_view.xml',
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 35949f47..99a7f3d9 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -25,7 +25,7 @@ class FunctionalCuttingToolEntity(models.Model):
     tool_loading_length = fields.Float(string='装刀长(mm)', readonly=True)
     functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True)
     effective_length = fields.Float(string='有效长(mm)', readonly=True)
-    tool_room_num = fields.Integer(string='刀具房数量', readonly=True, )
+    tool_room_num = fields.Integer(string='刀具房数量', readonly=True, compute='_compute_location_num')
     line_edge_knife_library_num = fields.Integer(string='线边刀库数量', readonly=True)
     machine_knife_library_num = fields.Integer(string='机内刀库数量', readonly=True)
     max_lifetime_value = fields.Integer(string='最大寿命值(min)', readonly=True)
@@ -241,7 +241,7 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
         record = self.env['sf.real.time.distribution.of.functional.tools'].search(
             [('name', '=', vals['name']), ('sf_cutting_tool_type_id', '=', vals['sf_cutting_tool_type_id']),
              ('diameter', '=', vals['diameter']), ('knife_tip_r_angle', '=', vals['knife_tip_r_angle']),
-             ('knife_tip_r_angle', '=', vals['knife_tip_r_angle'])])
+             ('coarse_middle_thin', '=', vals['coarse_middle_thin'])])
         print(record)
         if len(record) > 0:
             for obj in record:
diff --git a/sf_tool_management/models/tool_material_search.py b/sf_tool_management/models/tool_material_search.py
index b89b76cd..2453aafb 100644
--- a/sf_tool_management/models/tool_material_search.py
+++ b/sf_tool_management/models/tool_material_search.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from odoo import fields, models, api, SUPERUSER_ID
-from odoo.exceptions import ValidationError
+# from odoo.exceptions import ValidationError
 
 
 # 刀具物料搜索
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index a764b896..8ebb20d4 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -284,6 +284,7 @@
                     <field name="sf_cutting_tool_type_id" invisible="True"/>
                     <field name="diameter"/>
                     <field name="knife_tip_r_angle"/>
+                    <field name="coarse_middle_thin"/>
                     <field name="tool_stock_num"/>
                     <field name="side_shelf_num"/>
                     <field name="on_tool_stock_num"/>
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index 16ae5259..e3d4cff7 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -438,45 +438,13 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
 
         return stock_lot
 
-    # def tool_material_out_of_store(self, tool_material_serial_id):
-    #     """
-    #     刀具物料出库
-    #     """
-    #     # 获取位置
-    #     location_id = self.env['stock.location'].search([('name', '=', 'Stock')])
-    #     location_dest_id = self.env['stock.location'].search([('name', '=', '刀具组装位置')])
-    #     print("已运行2222")
-    #     # 创建库存移动
-    #     stock_move_id = self.env['stock.move'].create({
-    #         'name': '刀具物料出库',
-    #         'lot_id': tool_material_serial_id.id,
-    #         'product_id': tool_material_serial_id.product_id.id,
-    #         'location_id': location_id.id,
-    #         'location_dest_id': location_dest_id.id,
-    #         'product_uom_qty': 1.00,
-    #         'state': 'done'
-    #     })
-    #     print("已运行3333")
-    #     print(stock_move_id)
-    #     # 创建移动历史
-    #     stock_move_line_id = self.env['stock.move.line'].create({
-    #         'product_id': tool_material_serial_id.product_id.id,
-    #         'lot_id': tool_material_serial_id.id,
-    #         'move_id': stock_move_id.id,
-    #         'install_tool_time': fields.Datetime.now(),
-    #         'qty_done': 1.0,
-    #         'state': 'done'
-    #     })
-    #
-    #     return stock_move_id, stock_move_line_id
-
     def create_stock_quant(self, product_id, stock_lot, functional_tool_assembly):
         """
             创建功能刀具该批次/序列号 库存移动和移动历史
         """
         # 获取位置对象
         stock_location_id = self.env['stock.location'].search([('name', '=', '组装后')])
-        location_inventory_id = self.env['stock.location'].search([('name', '=', 'Inventory adjustment')])
+        location_inventory_id = self.env['stock.location'].search([('name', '=', 'Production')])
 
         # 创建库存移动
         stock_move_id = self.env['stock.move'].create({
@@ -504,7 +472,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
         """
             生成功能刀具序列号
         """
-        code = 'JKM-T-' + str(self.functional_tool_type_id.code) + '-' + str(self.functional_tool_diameter) + '-'
+        code = 'JKM-T-' + str(self.functional_tool_type_id.code) + '-' + str(
+            self.after_assembly_functional_tool_diameter) + '-'
         new_time = fields.Date.today()
         code += str(new_time) + '-'
         stock_lot_id = self.env['stock.lot'].sudo().search(

From 4f83c5f29acb018f87c6a5d18ec801f2249eb2e1 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 27 Nov 2023 21:30:45 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AD=A6=E5=91=8A?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Many2OneRadioField/many2one_radio_field.js   |  2 --
 .../custom_many2many_checkboxes.js               | 13 +++++++------
 .../src/js/custom_form_status_indicator.js       |  2 +-
 jikimo_frontend/static/src/list/custom_width.js  |  4 ++--
 .../static/src/views/list_nums/list_nbCols.js    |  2 +-
 sf_bf_connect/models/jd_eclp.py                  | 13 +++++++++----
 sf_bf_connect/models/process_status.py           |  2 +-
 sf_machine_connect/models/ftp_client.py          |  5 ++---
 .../static/src/js/barcode_button.js              |  7 +++----
 sf_machine_connect/static/src/js/barcode_form.js |  2 +-
 .../static/src/js/barcode_handler_field.js       |  7 +++----
 sf_machine_connect/wizard/action_up.py           | 10 +++-------
 sf_manufacturing/static/src/js/kanban_change.js  | 15 +++------------
 sf_quality/models/custom_quality.py              |  2 +-
 sf_warehouse/static/src/colorGuide.js            |  6 ++----
 sf_warehouse/static/src/js/cust_char.js          | 16 +++++++---------
 .../static/src/js/custom_kanban_controller.js    |  8 ++++----
 sf_warehouse/static/src/js/custom_many2one.js    |  8 ++++----
 .../static/src/js/3d_viewer.js                   |  8 ++++----
 19 files changed, 58 insertions(+), 74 deletions(-)

diff --git a/jikimo_frontend/static/src/fields/Many2OneRadioField/many2one_radio_field.js b/jikimo_frontend/static/src/fields/Many2OneRadioField/many2one_radio_field.js
index 836ee6d8..2be3365c 100644
--- a/jikimo_frontend/static/src/fields/Many2OneRadioField/many2one_radio_field.js
+++ b/jikimo_frontend/static/src/fields/Many2OneRadioField/many2one_radio_field.js
@@ -11,7 +11,6 @@ export class Many2OneRadioField extends RadioField {
         // 你自己的代码
     }
 
-
     onImageClick(event) {
         // 放大图片逻辑
         // 获取图片元素
@@ -47,7 +46,6 @@ export class Many2OneRadioField extends RadioField {
             return [];
     }
   }
-
 }
 
 Many2OneRadioField.template = "jikimo_frontend.Many2OneRadioField"
diff --git a/jikimo_frontend/static/src/fields/custom_many2many_checkboxes/custom_many2many_checkboxes.js b/jikimo_frontend/static/src/fields/custom_many2many_checkboxes/custom_many2many_checkboxes.js
index 5845dbae..a3053b72 100644
--- a/jikimo_frontend/static/src/fields/custom_many2many_checkboxes/custom_many2many_checkboxes.js
+++ b/jikimo_frontend/static/src/fields/custom_many2many_checkboxes/custom_many2many_checkboxes.js
@@ -15,23 +15,24 @@ export class MyCustomWidget extends Many2ManyCheckboxesField {
         // 放大图片逻辑
         // 获取图片元素
         const img = event.target;
-        const close = img.nextSibling
+        const close = img.nextSibling;
 
         // 实现放大图片逻辑
         // 比如使用 CSS 放大
         img.parentElement.classList.add('zoomed');
-        close.classList.add('img_close')
+        close.classList.add('img_close');
     }
 
     onCloseClick(event) {
         const close = event.target;
-        const img = close.previousSibling
-        img.parentElement.classList.remove('zoomed')
-        close.classList.remove('img_close')
+        const img = close.previousSibling;
+        img.parentElement.classList.remove('zoomed');
+        close.classList.remove('img_close');
     }
 }
 
-MyCustomWidget.template = "jikimo_frontend.MyCustomWidget"
+MyCustomWidget.template = "jikimo_frontend.MyCustomWidget";
 // MyCustomWidget.supportedTypes = ['many2many'];
 
 registry.category("fields").add("custom_many2many_checkboxes", MyCustomWidget);
+
diff --git a/jikimo_frontend/static/src/js/custom_form_status_indicator.js b/jikimo_frontend/static/src/js/custom_form_status_indicator.js
index a5f68479..c1ba8248 100644
--- a/jikimo_frontend/static/src/js/custom_form_status_indicator.js
+++ b/jikimo_frontend/static/src/js/custom_form_status_indicator.js
@@ -3,7 +3,7 @@
 import {patch} from '@web/core/utils/patch';
 // import { Dialog } from "@web/core/dialog/dialog";
 import {_t} from "@web/core/l10n/translation";
-import {FormStatusIndicator} from "@web/views/form/form_status_indicator/form_status_indicator"
+import {FormStatusIndicator} from "@web/views/form/form_status_indicator/form_status_indicator";
 
 var Dialog = require('web.Dialog');
 // var {patch} = require("web.utils") 这句话也行
diff --git a/jikimo_frontend/static/src/list/custom_width.js b/jikimo_frontend/static/src/list/custom_width.js
index 785bedb5..f7c1c55d 100644
--- a/jikimo_frontend/static/src/list/custom_width.js
+++ b/jikimo_frontend/static/src/list/custom_width.js
@@ -1,7 +1,7 @@
 /** @odoo-module */
 
 import {patch} from '@web/core/utils/patch';
-import {ListRenderer} from "@web/views/list/list_renderer"
+import {ListRenderer} from "@web/views/list/list_renderer";
 
 // var {patch} = require("web.utils") 这句话也行
 
@@ -17,7 +17,7 @@ patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', {
 
         const table = this.tableRef.el;
         const headers = [...table.querySelectorAll("thead th:not(.o_list_actions_header)")];
-        const column_num = headers.length
+        const column_num = headers.length;
 
         if (!this.columnWidths || !this.columnWidths.length) {
             // no column widths to restore
diff --git a/jikimo_frontend/static/src/views/list_nums/list_nbCols.js b/jikimo_frontend/static/src/views/list_nums/list_nbCols.js
index b0bacb02..1403544f 100644
--- a/jikimo_frontend/static/src/views/list_nums/list_nbCols.js
+++ b/jikimo_frontend/static/src/views/list_nums/list_nbCols.js
@@ -8,4 +8,4 @@ patch(ListRenderer.prototype, '/jikimo_frontend/static/src/views/list_nums/list_
         const nbCols = this._super(...arguments);
         return nbCols + 1;
     }
-});
\ No newline at end of file
+});
diff --git a/sf_bf_connect/models/jd_eclp.py b/sf_bf_connect/models/jd_eclp.py
index 1b3c10ab..4ccb0db6 100644
--- a/sf_bf_connect/models/jd_eclp.py
+++ b/sf_bf_connect/models/jd_eclp.py
@@ -3,9 +3,9 @@ import logging
 from datetime import datetime
 import requests
 import cpca
-from odoo.exceptions import UserError
-from odoo.exceptions import ValidationError
-from odoo import api, fields, models, SUPERUSER_ID, _
+# from odoo.exceptions import UserError
+# from odoo.exceptions import ValidationError
+from odoo import api, fields, models
 
 _logger = logging.getLogger(__name__)
 
@@ -44,12 +44,18 @@ class JdEclp(models.Model):
 
     @api.depends('name')
     def _check_is_out(self):
+        """
+        判断是否为出库单
+        """
         if self.name:
             is_check_out = self.name.split('/')
             self.check_out = is_check_out[1]
 
     @api.depends('carrier_tracking_ref')
     def query_bill_pdf(self):
+        """
+        查询物流面单，并赋值给bill
+        """
         self.bill = self.env['ir.attachment'].sudo().search([('name', '=', self.carrier_tracking_ref)])
 
     @api.depends('origin')
@@ -84,7 +90,6 @@ class JdEclp(models.Model):
                 self.receiverTownName = self.receiverTownName
         except Exception as e:
             print(f"Error address is none: {e}")
-            pass
 
     def create_order(self):
         # sale_order_id = self.env['sale.order'].search([('name', '=', self.origin)])
diff --git a/sf_bf_connect/models/process_status.py b/sf_bf_connect/models/process_status.py
index f7b7dccd..d79b3369 100644
--- a/sf_bf_connect/models/process_status.py
+++ b/sf_bf_connect/models/process_status.py
@@ -212,7 +212,7 @@ class FinishStatusChange(models.Model):
                     action['context'] = {'default_picking_ids': self.ids}
                     return action
 
-        out_start_time = str(datetime.now())
+        # out_start_time = str(datetime.now())
         json2 = {
             'params': {
                 'model_name': 'jikimo.process.order',
diff --git a/sf_machine_connect/models/ftp_client.py b/sf_machine_connect/models/ftp_client.py
index 7ca0ad06..10894d3a 100644
--- a/sf_machine_connect/models/ftp_client.py
+++ b/sf_machine_connect/models/ftp_client.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import os
-import time
 import json
 import base64
 import shutil
@@ -11,7 +10,7 @@ from zipfile import ZipFile
 from datetime import datetime, timedelta
 import requests
 from odoo.http import request
-from odoo import fields, models, api, _
+from odoo import fields, models, api
 from odoo.exceptions import UserError
 from odoo.exceptions import MissingError
 from odoo.exceptions import ValidationError
@@ -470,7 +469,7 @@ class WorkCenterBarcode(models.Model):
             raise UserError('NC下发执行超时, 请检查下发状态')
 
     def get__state(self):
-        pay_time = str(datetime.now())
+        # pay_time = str(datetime.now())
         json = {
             'params': {
                 'model_name': 'jikimo.process.order',
diff --git a/sf_machine_connect/static/src/js/barcode_button.js b/sf_machine_connect/static/src/js/barcode_button.js
index e7d9f879..5fcd8caf 100644
--- a/sf_machine_connect/static/src/js/barcode_button.js
+++ b/sf_machine_connect/static/src/js/barcode_button.js
@@ -97,13 +97,12 @@ export class CodeField extends Component {
             } else {
                 if (records[0].state === '占用') {
                     // console.log('此托盘已占用，请检查')
-                    alert('此托盘已占用，请检查')
+                    alert('此托盘已占用，请检查');
                 } else {
                     // console.log('此托盘已损坏，请登记')
-                    alert('此托盘已损坏，请登记')
+                    alert('此托盘已损坏，请登记');
                 }
             }
-
         } else {
             const searchInput = this.autocompleteContainerRef.el.querySelector("input");
             searchInput.value = barcode;
@@ -114,7 +113,7 @@ export class CodeField extends Component {
         }
     }
 }
-CodeField.template = 'sf_machine_connect.CodeField'
+CodeField.template = 'sf_machine_connect.CodeField';
 // Register the field in the registry
 CodeField.props = standardFieldProps;
 registry.category("fields").add("code", CodeField);
diff --git a/sf_machine_connect/static/src/js/barcode_form.js b/sf_machine_connect/static/src/js/barcode_form.js
index f6190918..3eefda66 100644
--- a/sf_machine_connect/static/src/js/barcode_form.js
+++ b/sf_machine_connect/static/src/js/barcode_form.js
@@ -48,4 +48,4 @@ odoo.define('my_module.barcode_handler', function (require) {
     return {
         BarcodeHandlerField: BarcodeHandlerField,
     };
-});
\ No newline at end of file
+});
diff --git a/sf_machine_connect/static/src/js/barcode_handler_field.js b/sf_machine_connect/static/src/js/barcode_handler_field.js
index 526f28d7..133e0ffe 100644
--- a/sf_machine_connect/static/src/js/barcode_handler_field.js
+++ b/sf_machine_connect/static/src/js/barcode_handler_field.js
@@ -8,7 +8,7 @@ const { Component, xml } = owl;
 
 export class BarcodeHandlerField extends Component {
     setup() {
-        this.actionService = useService("action")
+        this.actionService = useService("action");
         const barcode = useService("barcode");
         // this.rpc  = useService("rpc");
         // useBus(barcode.bus, "barcode_scanned", this.onBarcodeScanned.bind(this));
@@ -18,7 +18,7 @@ export class BarcodeHandlerField extends Component {
         // const { data } = await this.env.services.rpc('/web/dataset/call_kw', params);
         const response = await this.env.services.rpc('/web/dataset/call_kw', params);
         // return response
-        const responseObject = JSON.parse(response)
+        const responseObject = JSON.parse(response);
         return responseObject;
     }
 
@@ -58,8 +58,7 @@ export class BarcodeHandlerField extends Component {
         } else {
             // console.error("Barcode not found or RPC call failed.");
         }
-    }
-
+    };
 }
 
 BarcodeHandlerField.template = xml``;
diff --git a/sf_machine_connect/wizard/action_up.py b/sf_machine_connect/wizard/action_up.py
index ffcb88ad..e2d160cd 100644
--- a/sf_machine_connect/wizard/action_up.py
+++ b/sf_machine_connect/wizard/action_up.py
@@ -2,15 +2,11 @@
 import base64
 import logging
 import os
-import json
-import hashlib
-import time
 from datetime import datetime
-import requests
-from odoo import fields, models, api, _
-from odoo.exceptions import ValidationError
+from odoo import fields, models
+# from odoo.exceptions import ValidationError
 from odoo.exceptions import UserError
-from odoo.addons.sf_machine_connect.models import py2opcua, ftp_operate
+from odoo.addons.sf_machine_connect.models import ftp_operate
 
 _logger = logging.getLogger(__name__)
 
diff --git a/sf_manufacturing/static/src/js/kanban_change.js b/sf_manufacturing/static/src/js/kanban_change.js
index 7e425e3b..edef0285 100644
--- a/sf_manufacturing/static/src/js/kanban_change.js
+++ b/sf_manufacturing/static/src/js/kanban_change.js
@@ -17,16 +17,10 @@ class CustomKanbanController extends KanbanController {
         this.workOrders = await this.getAllWorkOrders();
         // this.workOrdersNew = this.workOrders;
         // console.log('lines222222222', this.workOrders);
-        //
         // console.log(typeof this.workOrders);
         // console.log(Array.isArray(this.workOrders));
-        //
         // console.log(this.workOrders.every(order =>
         // typeof order === 'object' && order.id !== undefined));
-
-
-
-
         // var aDiv = document.getElementsByClassName('o_kanban_record')
         // for (var i = 0; i < aDiv.length; i++) {
         //     console.log(aDiv[i])
@@ -37,7 +31,6 @@ class CustomKanbanController extends KanbanController {
     buttonClick(ev) {
         const button = ev.currentTarget;
         const id = button.getAttribute('data-id');
-
         // console.log('true_id', id);
         // const context = {production_line_show: 'shengchanxian1'}
         this.env.services.rpc('/web/dataset/call_kw', {
@@ -58,8 +51,8 @@ class CustomKanbanController extends KanbanController {
                 // console.log('response', response);
                 location.reload();
                 window.onload = function () {
-                    button.classList.add('choose')
-                }
+                    button.classList.add('choose');
+                };
             });
         });
     }
@@ -82,8 +75,6 @@ class CustomKanbanController extends KanbanController {
         // 你可以在这里处理响应，例如将其存储在控制器的状态中
         return response;
     }
-
-
 }
 
 CustomKanbanController.template = "sf_manufacturing.CustomKanbanView1";
@@ -94,4 +85,4 @@ export const customKanbanView = {
 };
 
 // Register it to the views registry
-registry.category("views").add("custom_kanban1", customKanbanView);
\ No newline at end of file
+registry.category("views").add("custom_kanban1", customKanbanView);
diff --git a/sf_quality/models/custom_quality.py b/sf_quality/models/custom_quality.py
index 1887da7a..c700b88b 100644
--- a/sf_quality/models/custom_quality.py
+++ b/sf_quality/models/custom_quality.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from odoo import models, fields, api, _
+from odoo import models, fields
 
 
 class SfQualityPoint(models.Model):
diff --git a/sf_warehouse/static/src/colorGuide.js b/sf_warehouse/static/src/colorGuide.js
index c6cc0f94..dd5a4b02 100644
--- a/sf_warehouse/static/src/colorGuide.js
+++ b/sf_warehouse/static/src/colorGuide.js
@@ -1,12 +1,11 @@
 odoo.define('sf_warehouse.custom_kanban', function (require) {
-    "use strict"
+    "use strict";
     var KanbanRenderer = require('web.KanbanRenderer');
 
     KanbanRenderer.include({
       _render: function () {
         var self = this;
         return this._super.apply(this, arguments).then(function () {
-
             var colorGuide = $('<div class="color-guide"> \
                 <span class="color-guide-item" style="background-color: red;"></span> \
                 <span class="color-guide-item" style="background-color: green;"></span> \
@@ -16,5 +15,4 @@ odoo.define('sf_warehouse.custom_kanban', function (require) {
         });
       },
     });
-
-});
\ No newline at end of file
+});
diff --git a/sf_warehouse/static/src/js/cust_char.js b/sf_warehouse/static/src/js/cust_char.js
index 3757bfb8..9a529d42 100644
--- a/sf_warehouse/static/src/js/cust_char.js
+++ b/sf_warehouse/static/src/js/cust_char.js
@@ -1,9 +1,7 @@
 /** @odoo-module **/
 
-import { registry } from "@web/core/registry";
-import { CharField } from '@web/views/fields/char/char_field';
-
-
+import {registry} from "@web/core/registry";
+import {CharField} from '@web/views/fields/char/char_field';
 
 // 继承CharField组件实现自定义组件:当光标聚焦于输入框时，选中输入框内容
 class CustomChar extends CharField {
@@ -20,7 +18,7 @@ class CustomChar extends CharField {
         // 当光标聚焦于输入框时，选中输入框内容
         this.input.el.addEventListener('focus', function () {
             this.select();
-        })
+        });
     }
 
 
@@ -72,13 +70,13 @@ class CustomChar extends CharField {
     //     }
     // }
 
-        //   this.$input.on('focus', function () {
-        //     $(this).select();
-        // });
+    //   this.$input.on('focus', function () {
+    //     $(this).select();
+    // });
 
 
     // 当光标聚焦于输入框时，选中输入框内容
 
 }
 
-registry.category("fields").add("custom_char", CustomChar);
\ No newline at end of file
+registry.category("fields").add("custom_char", CustomChar);
diff --git a/sf_warehouse/static/src/js/custom_kanban_controller.js b/sf_warehouse/static/src/js/custom_kanban_controller.js
index 7b9d01fb..62c83505 100644
--- a/sf_warehouse/static/src/js/custom_kanban_controller.js
+++ b/sf_warehouse/static/src/js/custom_kanban_controller.js
@@ -1,8 +1,8 @@
 /** @odoo-module */
 
-import { KanbanController } from "@web/views/kanban/kanban_controller";
-import { kanbanView } from "@web/views/kanban/kanban_view";
-import { registry } from "@web/core/registry";
+import {KanbanController} from "@web/views/kanban/kanban_controller";
+import {kanbanView} from "@web/views/kanban/kanban_view";
+import {registry} from "@web/core/registry";
 
 // the controller usually contains the Layout and the renderer.
 class CustomKanbanController extends KanbanController {
@@ -18,4 +18,4 @@ export const customKanbanView = {
 };
 
 // Register it to the views registry
-registry.category("views").add("custom_kanban", customKanbanView);
\ No newline at end of file
+registry.category("views").add("custom_kanban", customKanbanView);
diff --git a/sf_warehouse/static/src/js/custom_many2one.js b/sf_warehouse/static/src/js/custom_many2one.js
index c6a86af5..592d910b 100644
--- a/sf_warehouse/static/src/js/custom_many2one.js
+++ b/sf_warehouse/static/src/js/custom_many2one.js
@@ -1,8 +1,7 @@
 /** @odoo-module **/
 
-import { registry } from "@web/core/registry";
-import { Many2OneField } from '@web/views/fields/many2one/many2one_field';
-
+import {registry} from "@web/core/registry";
+import {Many2OneField} from '@web/views/fields/many2one/many2one_field';
 
 
 // 继承FieldMany2One组件实现自定义组件:当光标聚焦于输入框时，选中输入框内容
@@ -17,12 +16,13 @@ class CustomMany2One extends Many2OneField {
         // console.log('CustomMany2One.setup11111111111111');
         super.setup();
     }
+
     onMounted() {
         // console.log('CustomMany2One.onMounted1');
         // 当光标聚焦于输入框时，选中输入框内容
         this.input.el.addEventListener('focus', function () {
             this.select();
-        })
+        });
     }
 
 }
diff --git a/web_widget_model_viewer/static/src/js/3d_viewer.js b/web_widget_model_viewer/static/src/js/3d_viewer.js
index 3c66b142..15374070 100644
--- a/web_widget_model_viewer/static/src/js/3d_viewer.js
+++ b/web_widget_model_viewer/static/src/js/3d_viewer.js
@@ -26,15 +26,15 @@ export class StepViewer extends Component {
                     model: this.props.record.resModel,
                     id: JSON.stringify(this.props.record.data['id']),
                     field: this.props.name
-                }
-                url = url_props['base_url'].replace('http://', 'https://') + '/web/content/' + url_props['model'] + '/' + url_props['id'] + '/' + url_props['field'] + '?download=true'
+                };
+                url = url_props['base_url'].replace('http://', 'https://') + '/web/content/' + url_props['model'] + '/' + url_props['id'] + '/' + url_props['field'] + '?download=true';
                 // url = 'http://localhost:8069'+'/web/content/'+url_props['model']+'/'+url_props['id']+'/'+url_props['field']+'?download=true'
                 // console.log('url111111', url)
-                return url
+                return url;
             } else {
                 url = "data:model/gltf-binary;base64," + this.props.value;
                 // console.log('url2', url)
-                return url
+                return url;
                 // localStorage.setItem('url',url)
                 // let new_url = localStorage.getItem(('url'))
                 // var oViewer = document.getElementsByTagName('model-viewer')[0];

From 9fef877d122559ba7e90a1fc14a662ecc130d9aa Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 27 Nov 2023 22:40:56 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AD=A6=E5=91=8A?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Many2OneRadioField/many2one_radio_field.js      | 13 ++++++-------
 sf_machine_connect/models/ftp_client.py             |  2 +-
 sf_warehouse/static/src/js/cust_char.js             |  3 ---
 sf_warehouse/static/src/js/custom_many2one.js       |  1 -
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/jikimo_frontend/static/src/fields/Many2OneRadioField/many2one_radio_field.js b/jikimo_frontend/static/src/fields/Many2OneRadioField/many2one_radio_field.js
index 2be3365c..8c2be97f 100644
--- a/jikimo_frontend/static/src/fields/Many2OneRadioField/many2one_radio_field.js
+++ b/jikimo_frontend/static/src/fields/Many2OneRadioField/many2one_radio_field.js
@@ -15,19 +15,18 @@ export class Many2OneRadioField extends RadioField {
         // 放大图片逻辑
         // 获取图片元素
         const img = event.target;
-        const close = img.nextSibling
-
+        const close = img.nextSibling;
         // 实现放大图片逻辑
         // 比如使用 CSS 放大
         img.parentElement.classList.add('zoomed');
-        close.classList.add('img_close')
+        close.classList.add('img_close');
     }
 
     onCloseClick(event) {
         const close = event.target;
-        const img = close.previousSibling
-        img.parentElement.classList.remove('zoomed')
-        close.classList.remove('img_close')
+        const img = close.previousSibling;
+        img.parentElement.classList.remove('zoomed');
+        close.classList.remove('img_close');
     }
 
    get items() {
@@ -48,7 +47,7 @@ export class Many2OneRadioField extends RadioField {
   }
 }
 
-Many2OneRadioField.template = "jikimo_frontend.Many2OneRadioField"
+Many2OneRadioField.template = "jikimo_frontend.Many2OneRadioField";
 // MyCustomWidget.supportedTypes = ['many2many'];
 
 registry.category("fields").add("many2one_radio", Many2OneRadioField);
diff --git a/sf_machine_connect/models/ftp_client.py b/sf_machine_connect/models/ftp_client.py
index 10894d3a..92ccc4d5 100644
--- a/sf_machine_connect/models/ftp_client.py
+++ b/sf_machine_connect/models/ftp_client.py
@@ -537,7 +537,7 @@ class WorkCenterBarcode(models.Model):
             action1 = json.dumps(action)
             return action1
         else:
-            return False
+            return None
 
     def cnc_file_download(self):
         """
diff --git a/sf_warehouse/static/src/js/cust_char.js b/sf_warehouse/static/src/js/cust_char.js
index 9a529d42..d67f2d7a 100644
--- a/sf_warehouse/static/src/js/cust_char.js
+++ b/sf_warehouse/static/src/js/cust_char.js
@@ -73,10 +73,7 @@ class CustomChar extends CharField {
     //   this.$input.on('focus', function () {
     //     $(this).select();
     // });
-
-
     // 当光标聚焦于输入框时，选中输入框内容
-
 }
 
 registry.category("fields").add("custom_char", CustomChar);
diff --git a/sf_warehouse/static/src/js/custom_many2one.js b/sf_warehouse/static/src/js/custom_many2one.js
index 592d910b..2e0e70bf 100644
--- a/sf_warehouse/static/src/js/custom_many2one.js
+++ b/sf_warehouse/static/src/js/custom_many2one.js
@@ -24,7 +24,6 @@ class CustomMany2One extends Many2OneField {
             this.select();
         });
     }
-
 }
 
 registry.category("fields").add("custom_many2one", CustomMany2One);

From 4d8b463cb3e41e03fcee39bdd37261938f23faed Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Tue, 28 Nov 2023 08:59:01 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AD=A6=E5=91=8A?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/models/res_config_setting.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_machine_connect/models/res_config_setting.py b/sf_machine_connect/models/res_config_setting.py
index 6d9a6c84..16cc4d77 100644
--- a/sf_machine_connect/models/res_config_setting.py
+++ b/sf_machine_connect/models/res_config_setting.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import logging
-from odoo import api, fields, models, _
+from odoo import api, fields, models
 
 _logger = logging.getLogger(__name__)
 

From e403f2f8e6cb983427b0ca5a97dbc0b4c2b1a896 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 28 Nov 2023 14:52:43 +0800
Subject: [PATCH 13/14] =?UTF-8?q?1=E3=80=81=E6=8C=89=E9=9D=A2=E5=90=91?=
 =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E7=9A=84=E6=80=9D=E6=83=B3=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E7=BB=84=E8=A3=85=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E7=9A=84=E6=95=B4=E4=B8=AA=E6=B5=81=E7=A8=8B=EF=BC=9B?=
 =?UTF-8?q?2=E3=80=81=E6=96=B0=E5=A2=9E=E5=88=80=E5=85=B7=E7=BB=84?=
 =?UTF-8?q?=E8=A3=85=E5=AE=8C=E6=88=90=E6=97=B6=E7=9A=84=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=87=BA=E5=BA=93=E5=88=B0=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E7=BB=84=E8=A3=85=E4=BD=8D=E7=BD=AE=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/wizard/wizard.py | 182 ++++++++++++++++------------
 1 file changed, 107 insertions(+), 75 deletions(-)

diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index e3d4cff7..649d6b86 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -341,6 +341,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
         功能刀具组装
         :return:
         """
+        # 获取组装单对象
         functional_tool_assembly = self.env['sf.functional.tool.assembly'].search([
             ('assembly_order_code', '=', self.assembly_order_code),
             ('machine_tool_name_id', '=', self.machine_tool_name_id.id),
@@ -349,20 +350,28 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
         ])
         # 对物料做必填判断
         self.materials_must_be_judged()
-        # # 刀具物料出库
-        # if self.integral_code_id:
-        #     print("已运行1111")
-        #     self.tool_material_out_of_store(self.integral_code_id)
 
+        product_id = self.env['product.product'].search([('name', '=', '功能刀具')])
         # 创建组装入库单
         # 创建功能刀具批次/序列号记录
-        stock_lot = self.create_assemble_warehouse_receipt(functional_tool_assembly)
+        stock_lot = product_id.create_assemble_warehouse_receipt(self.id, functional_tool_assembly)
         # 创建刀具组装入库单
         self.create_stocking_picking(stock_lot)
-        # 封装功能刀具数据
-        desc_1 = self.get_desc_1(stock_lot)
+        # 刀具物料出库
+        if self.integral_code_id:
+            product_id.tool_material_stock_moves(self.integral_code_id)
+        if self.blade_code_id:
+            product_id.tool_material_stock_moves(self.blade_code_id)
+        if self.bar_code_id:
+            product_id.tool_material_stock_moves(self.bar_code_id)
+        if self.pad_code_id:
+            product_id.tool_material_stock_moves(self.pad_code_id)
+        if self.handle_code_id:
+            product_id.tool_material_stock_moves(self.handle_code_id)
+        if self.chuck_code_id:
+            product_id.tool_material_stock_moves(self.chuck_code_id)
 
-        # 创建功能刀具列表记录
+        # ============================创建功能刀具列表、安全库存记录===============================
         # 封装功能刀具数据
         desc_2 = self.get_desc_2(stock_lot, functional_tool_assembly)
         # 创建功能刀具列表记录
@@ -376,9 +385,11 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
             'coarse_middle_thin': self.after_assembly_coarse_middle_thin,
         }, record_1)
 
+        # =====================修改功能刀具组装单、机床换刀申请、CAM工单程序用刀计划的状态==============
+        # 封装功能刀具数据
+        desc_1 = self.get_desc_1(stock_lot)
         # 修改功能刀具组装单信息
         functional_tool_assembly.write(desc_1)
-
         if functional_tool_assembly.sf_machine_table_tool_changing_apply_id:
             # 修改机床换刀申请的状态
             self.env['sf.machine.table.tool.changing.apply'].sudo().search([
@@ -422,72 +433,6 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
         #  将刀具组装入库单的状态更改为就绪
         picking_id.action_confirm()
 
-    def create_assemble_warehouse_receipt(self, functional_tool_assembly):
-        """
-            创建功能刀具批次/序列号记录
-        """
-        product_id = self.env['product.product'].search([('name', '=', '功能刀具')])
-
-        stock_lot = self.env['stock.lot'].create({
-            'name': self.get_stock_lot_name(),
-            'product_id': product_id.id,
-            'company_id': self.env.company.id
-        })
-        # 创建功能刀具该批次/序列号  库存移动和移动历史
-        self.create_stock_quant(product_id, stock_lot, functional_tool_assembly)
-
-        return stock_lot
-
-    def create_stock_quant(self, product_id, stock_lot, functional_tool_assembly):
-        """
-            创建功能刀具该批次/序列号 库存移动和移动历史
-        """
-        # 获取位置对象
-        stock_location_id = self.env['stock.location'].search([('name', '=', '组装后')])
-        location_inventory_id = self.env['stock.location'].search([('name', '=', 'Production')])
-
-        # 创建库存移动
-        stock_move_id = self.env['stock.move'].create({
-            'name': '功能刀具组装出库',
-            'product_id': product_id.id,
-            'location_id': location_inventory_id.id,
-            'location_dest_id': stock_location_id.id,
-            'product_uom_qty': 1.00,
-            'state': 'done'
-        })
-
-        # 创建移动历史
-        stock_move_line_id = self.env['stock.move.line'].create({
-            'product_id': product_id.id,
-            'functional_tool_name_id': functional_tool_assembly.id,
-            'lot_id': stock_lot.id,
-            'move_id': stock_move_id.id,
-            'install_tool_time': fields.Datetime.now(),
-            'qty_done': 1.0,
-            'state': 'done'
-        })
-        return stock_move_id, stock_move_line_id
-
-    def get_stock_lot_name(self):
-        """
-            生成功能刀具序列号
-        """
-        code = 'JKM-T-' + str(self.functional_tool_type_id.code) + '-' + str(
-            self.after_assembly_functional_tool_diameter) + '-'
-        new_time = fields.Date.today()
-        code += str(new_time) + '-'
-        stock_lot_id = self.env['stock.lot'].sudo().search(
-            [('name', 'like', new_time), ('product_id.name', '=', '功能刀具')],
-            limit=1,
-            order="id desc"
-        )
-        if not stock_lot_id:
-            num = "%03d" % 1
-        else:
-            m = int(stock_lot_id.name[-3:]) + 1
-            num = "%03d" % m
-        return code + str(num)
-
     def get_desc_1(self, stock_lot):
         return {
             'barcode_id': stock_lot.id,
@@ -552,3 +497,90 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
             'cut_number': self.cut_number,
             'current_location_id': stock_lot.quant_ids.location_id.ids[-1],
         }
+
+
+class ProductProduct(models.Model):
+    _inherit = 'product.product'
+
+    def create_assemble_warehouse_receipt(self, tool_assembly_order_id, functional_tool_assembly):
+        """
+            创建功能刀具批次/序列号记录
+        """
+        product_id = self.env['product.product'].search([('name', '=', '功能刀具')])
+
+        stock_lot = self.env['stock.lot'].create({
+            'name': self.get_stock_lot_name(tool_assembly_order_id),
+            'product_id': product_id.id,
+            'company_id': self.env.company.id
+        })
+        # 获取位置对象
+        location_inventory_id = self.env['stock.location'].search([('name', '=', 'Production')])
+        stock_location_id = self.env['stock.location'].search([('name', '=', '组装后')])
+        # 创建功能刀具该批次/序列号  库存移动和移动历史
+        stock_lot.create_stock_quant(location_inventory_id, stock_location_id, functional_tool_assembly.id)
+
+        return stock_lot
+
+    def get_stock_lot_name(self, tool_assembly_order_id):
+        """
+            生成功能刀具序列号
+        """
+        tool_assembly_order = self.env['sf.functional.tool.assembly.order'].search(
+            [('id', '=', tool_assembly_order_id)])
+        code = 'JKM-T-' + str(tool_assembly_order.after_assembly_functional_tool_type_id.code) + '-' + str(
+            tool_assembly_order.after_assembly_functional_tool_diameter) + '-'
+        new_time = fields.Date.today()
+        code += str(new_time) + '-'
+        stock_lot_id = self.env['stock.lot'].sudo().search(
+            [('name', 'like', new_time), ('product_id.name', '=', '功能刀具')],
+            limit=1,
+            order="id desc"
+        )
+        if not stock_lot_id:
+            num = "%03d" % 1
+        else:
+            m = int(stock_lot_id.name[-3:]) + 1
+            num = "%03d" % m
+        return code + str(num)
+
+    def tool_material_stock_moves(self, tool_material):
+        """
+        对刀具物料进行库存移动到 刀具组装位置
+        """
+        # 获取位置对象
+        location_inventory_id = tool_material.quant_ids.location_id[-1]
+        print(location_inventory_id)
+        stock_location_id = self.env['stock.location'].search([('name', '=', '刀具组装位置')])
+        # 创建功能刀具该批次/序列号  库存移动和移动历史
+        tool_material.create_stock_quant(location_inventory_id, stock_location_id, None)
+
+
+class StockLot(models.Model):
+    _inherit = 'stock.lot'
+
+    def create_stock_quant(self, location_inventory_id, stock_location_id, functional_tool_assembly_id):
+        """
+            对功能刀具组装过程的功能刀具和刀具物料进行库存移动，以及创建移动历史
+        """
+
+        # 创建库存移动记录
+        stock_move_id = self.env['stock.move'].create({
+            'name': '功能刀具组装',
+            'product_id': self.product_id.id,
+            'location_id': location_inventory_id.id,
+            'location_dest_id': stock_location_id.id,
+            'product_uom_qty': 1.00,
+            'state': 'done'
+        })
+
+        # 创建移动历史记录
+        stock_move_line_id = self.env['stock.move.line'].create({
+            'product_id': self.product_id.id,
+            'functional_tool_name_id': functional_tool_assembly_id,
+            'lot_id': self.id,
+            'move_id': stock_move_id.id,
+            'install_tool_time': fields.Datetime.now(),
+            'qty_done': 1.0,
+            'state': 'done'
+        })
+        return stock_move_id, stock_move_line_id

From de04d452b39de56e14812d9d532e81d609cf1407 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 28 Nov 2023 16:28:48 +0800
Subject: [PATCH 14/14] =?UTF-8?q?1=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E7=BB=84=E8=A3=85=E5=8D=95=E7=9A=84=E5=88=80?=
 =?UTF-8?q?=E5=85=B7=E7=89=A9=E6=96=99=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=96=E6=B6=88=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E8=87=AA=E5=8A=A8=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/models/base.py   | 24 ++++++++++++------------
 sf_tool_management/wizard/wizard.py | 18 ++++++++++++------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 99a7f3d9..c14aa16f 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -25,7 +25,7 @@ class FunctionalCuttingToolEntity(models.Model):
     tool_loading_length = fields.Float(string='装刀长(mm)', readonly=True)
     functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True)
     effective_length = fields.Float(string='有效长(mm)', readonly=True)
-    tool_room_num = fields.Integer(string='刀具房数量', readonly=True, compute='_compute_location_num')
+    tool_room_num = fields.Integer(string='刀具房数量', readonly=True)
     line_edge_knife_library_num = fields.Integer(string='线边刀库数量', readonly=True)
     machine_knife_library_num = fields.Integer(string='机内刀库数量', readonly=True)
     max_lifetime_value = fields.Integer(string='最大寿命值(min)', readonly=True)
@@ -36,16 +36,16 @@ class FunctionalCuttingToolEntity(models.Model):
     current_location_id = fields.Many2one('stock.location', string='当前位置', readonly=True)
     image = fields.Binary('图片', readonly=True)
 
-    @api.depends('current_location_id')
-    def _compute_location_num(self):
-        """
-        计算库存位置数量
-        """
-        for obj in self:
-            if obj.current_location_id.name in ('组装后', '刀具房'):
-                obj.tool_room_num = 1
-                obj.line_edge_knife_library_num = 0
-                obj.machine_knife_library_num = 0
+    # @api.depends('current_location_id')
+    # def _compute_location_num(self):
+    #     """
+    #     计算库存位置数量
+    #     """
+    #     for obj in self:
+    #         if obj.current_location_id.name in ('组装后', '刀具房'):
+    #             obj.tool_room_num = 1
+    #             obj.line_edge_knife_library_num = 0
+    #             obj.machine_knife_library_num = 0
 
     @api.model
     def _read_group_mrs_cutting_tool_type_id(self, categories, domain, order):
@@ -491,7 +491,7 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
 
 class FunctionalToolAssembly(models.Model):
     _name = 'sf.functional.tool.assembly'
-    _description = '功能刀具组装单'
+    _description = '功能刀具组装'
     _order = 'use_tool_time asc'
 
     @api.depends('functional_tool_name')
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index 649d6b86..2c81cb31 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -183,7 +183,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     # 整体式刀具型号
     integral_code_id = fields.Many2one('stock.lot', string='整体式刀具序列号',
                                        domain=[('product_id.cutting_tool_material_id.name', '=', '整体式刀具'),
-                                               ('quant_ids.location_id.name', 'in', ['刀具房'])])
+                                               ('quant_ids.location_id.name', 'in', ['刀具房']),
+                                               ('quant_ids.quantity', '>', 0)])
     cutting_tool_integral_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='整体式刀具型号',
                                                      readonly=True)
     integral_name = fields.Char('整体式刀具名称', readonly=True)
@@ -192,7 +193,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     # 刀片型号
     blade_code_id = fields.Many2one('stock.lot', '刀片序列号',
                                     domain=[('product_id.cutting_tool_material_id.name', '=', '刀片'),
-                                            ('quant_ids.location_id.name', 'in', ['刀具房'])])
+                                            ('quant_ids.location_id.name', 'in', ['刀具房']),
+                                            ('quant_ids.quantity', '>', 0)])
     cutting_tool_blade_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀片型号', readonly=True)
     blade_name = fields.Char('刀片名称', readonly=True)
     sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌', readonly=True)
@@ -200,7 +202,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     # 刀杆型号
     bar_code_id = fields.Many2one('stock.lot', '刀杆序列号',
                                   domain=[('product_id.cutting_tool_material_id.name', '=', '刀杆'),
-                                          ('quant_ids.location_id.name', 'in', ['刀具房'])])
+                                          ('quant_ids.location_id.name', 'in', ['刀具房']),
+                                          ('quant_ids.quantity', '>', 0)])
     cutting_tool_cutterbar_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀杆型号',
                                                       readonly=True)
     bar_name = fields.Char('刀杆名称', readonly=True)
@@ -209,7 +212,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     # 刀盘型号
     pad_code_id = fields.Many2one('stock.lot', '刀盘序列号',
                                   domain=[('product_id.cutting_tool_material_id.name', '=', '刀盘'),
-                                          ('quant_ids.location_id.name', 'in', ['刀具房'])])
+                                          ('quant_ids.location_id.name', 'in', ['刀具房']),
+                                          ('quant_ids.quantity', '>', 0)])
     cutting_tool_cutterpad_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀盘型号',
                                                       readonly=True)
     pad_name = fields.Char('刀盘名称', readonly=True)
@@ -218,7 +222,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     # 刀柄型号
     handle_code_id = fields.Many2one('stock.lot', '刀柄序列号', required=True,
                                      domain=[('product_id.cutting_tool_material_id.name', '=', '刀柄'),
-                                             ('quant_ids.location_id.name', 'in', ['刀具房'])])
+                                             ('quant_ids.location_id.name', 'in', ['刀具房']),
+                                             ('quant_ids.quantity', '>', 0)])
     cutting_tool_cutterhandle_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀柄型号',
                                                          readonly=True)
     handle_name = fields.Char('刀柄名称', readonly=True)
@@ -227,7 +232,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     # 夹头型号
     chuck_code_id = fields.Many2one('stock.lot', '夹头序列号', required=True,
                                     domain=[('product_id.cutting_tool_material_id.name', '=', '夹头'),
-                                            ('quant_ids.location_id.name', 'in', ['刀具房'])])
+                                            ('quant_ids.location_id.name', 'in', ['刀具房']),
+                                            ('quant_ids.quantity', '>', 0)])
     cutting_tool_cutterhead_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='夹头型号',
                                                        readonly=True)
     chuck_name = fields.Char('夹头名称', readonly=True, compute='_compute_auto_fill')