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] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?=
=?UTF-8?q?=E5=88=80=E5=85=B7=E5=88=97=E8=A1=A8=E6=A8=A1=E5=9E=8B=E8=87=AA?=
=?UTF-8?q?=E5=8A=A8=E8=AE=A1=E7=AE=97=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?=
=?UTF-8?q?=E5=9C=A8=E5=88=80=E5=85=B7=E6=88=BF=E6=95=B0=E9=87=8F=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=EF=BC=9B2=E3=80=81=E4=BC=98=E5=8C=96=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=E5=88=80=E5=85=B7=E5=AE=89=E5=85=A8=E5=BA=93=E5=AD=98?=
=?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=9B=B8=E5=90=8C=E5=8A=9F=E8=83=BD=E5=88=80?=
=?UTF-8?q?=E5=85=B7=E7=9A=84=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6=EF=BC=9B?=
=?UTF-8?q?3=E3=80=81=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD=E5=88=80?=
=?UTF-8?q?=E5=85=B7=E7=BB=84=E8=A3=85=E5=8D=95=E7=BB=84=E8=A3=85=E7=9A=84?=
=?UTF-8?q?=E5=88=9D=E5=A7=8B=E4=BD=8D=E7=BD=AE=E4=B8=BAProduction?=
=?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?=
=?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8F=B7=E7=9A=84=E7=94=9F=E6=88=90=E8=A7=84?=
=?UTF-8?q?=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 @@
+
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(