From 29b9223a14958a061f7854cb0c9f97f55f809950 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Thu, 5 Sep 2024 17:57:23 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=B0=86=E5=8A=9F=E8=83=BD=E5=88=80?=
=?UTF-8?q?=E5=85=B7=E7=BB=84=E8=A3=85=E5=BC=B9=E7=AA=97=E6=A8=A1=E5=9E=8B?=
=?UTF-8?q?=E7=9A=84=E7=BB=84=E8=A3=85=E6=B5=81=E7=A8=8B=E4=BB=A5=E5=8F=8A?=
=?UTF-8?q?=E5=85=B6=E4=B8=AD=E7=9B=B8=E5=85=B3=E7=9A=84=E4=B8=9A=E5=8A=A1?=
=?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E7=A7=BB=E5=8A=A8=E5=88=B0=E7=BB=84?=
=?UTF-8?q?=E8=A3=85=E5=8D=95=E6=A8=A1=E5=9E=8B=E5=B9=B6=E8=BF=9B=E8=A1=8C?=
=?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9B2=E3=80=81=E5=8A=9F=E8=83=BD?=
=?UTF-8?q?=E5=88=80=E5=85=B7=E7=BB=84=E8=A3=85=E5=8D=95=E6=A8=A1=E5=9E=8B?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=E7=9A=84?=
=?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=AE=A1=E7=AE=97=E6=96=B9=E6=B3=95=EF=BC=9B?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=83=A8=E5=88=86=E7=89=A9=E6=96=99=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_tool_management/models/base.py | 394 +++++++++++---
sf_tool_management/models/stock.py | 189 +++++++
sf_tool_management/views/tool_base_views.xml | 112 ++--
sf_tool_management/wizard/wizard.py | 526 ++++++-------------
sf_tool_management/wizard/wizard_view.xml | 8 +-
5 files changed, 764 insertions(+), 465 deletions(-)
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index a464d5cb..2255f68f 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -32,7 +32,7 @@ class MachineTableToolChangingApply(models.Model):
domain=[('product_id.name', '=', '功能刀具')],
related='functional_tool_name_id.barcode_id')
rfid = fields.Char('Rfid', related='functional_tool_name_id.rfid')
- functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', domain=[('assemble_status', '=', '2')],
+ functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', domain=[('assemble_status', '=', '1')],
string='功能刀具名称')
functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', store=True,
related='functional_tool_name_id.after_assembly_functional_tool_type_id')
@@ -358,16 +358,51 @@ class FunctionalToolAssembly(models.Model):
for obj in self:
obj.name = obj.assembly_order_code
- code = fields.Char('功能刀具编码', readonly=True)
rfid = fields.Char('Rfid', readonly=True)
- tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', readonly=True)
+ tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', store=True, compute='_compute_inventory_num')
name = fields.Char(string='名称', readonly=True, compute='_compute_name')
assembly_order_code = fields.Char(string='组装单编码', readonly=True)
functional_tool_name_id = fields.Many2one('product.product', string='功能刀具', readonly=True)
- functional_tool_name = fields.Char(string='功能刀具名称', readonly=True)
- functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
- group_expand='_read_group_functional_tool_type_ids')
+ functional_tool_name = fields.Char(string='功能刀具名称', readonly=True, required=True)
+ tool_inventory_id = fields.Many2one('sf.tool.inventory', string='功能刀具清单', store=True,
+ compute='_compute_functional_tool_name')
+
+ @api.depends('functional_tool_name')
+ def _compute_functional_tool_name(self):
+ for item in self:
+ if item.functional_tool_name:
+ inventory = self.env['sf.tool.inventory'].sudo().search([('name', '=', item.functional_tool_name)])
+ if inventory:
+ item.tool_inventory_id = inventory.id
+ item.after_assembly_functional_tool_name = item.functional_tool_name # 组装后名称
+ item.functional_tool_type_id = item.tool_inventory_id.functional_cutting_tool_model_id.id
+ item.tool_groups_id = item.tool_inventory_id.tool_groups_id.id # 刀具组
+ item.after_assembly_functional_tool_type_id = item.tool_inventory_id.functional_cutting_tool_model_id.id
+ item.after_assembly_functional_tool_diameter = item.tool_inventory_id.diameter # 直径
+ item.after_assembly_knife_tip_r_angle = item.tool_inventory_id.angle # R角
+ item.after_assembly_tool_loading_length = item.tool_inventory_id.tool_length # 总长度
+ item.after_assembly_functional_tool_length = item.tool_inventory_id.extension # 伸出长度
+ item.after_assembly_max_lifetime_value = item.tool_inventory_id.life_span # 最大寿命
+
+ @api.depends('tool_inventory_id', 'tool_inventory_id.functional_cutting_tool_model_id', 'tool_inventory_id.angle',
+ 'tool_inventory_id.tool_groups_id', 'tool_inventory_id.diameter', 'tool_inventory_id.tool_length',
+ 'tool_inventory_id.extension', 'tool_inventory_id.life_span')
+ def _compute_inventory_num(self):
+ for item in self:
+ if item.tool_inventory_id:
+ item.functional_tool_type_id = item.tool_inventory_id.functional_cutting_tool_model_id.id
+ item.tool_groups_id = item.tool_inventory_id.tool_groups_id.id # 刀具组
+ item.after_assembly_functional_tool_type_id = item.tool_inventory_id.functional_cutting_tool_model_id.id
+ item.after_assembly_functional_tool_diameter = item.tool_inventory_id.diameter # 直径
+ item.after_assembly_knife_tip_r_angle = item.tool_inventory_id.angle # R角
+ item.after_assembly_tool_loading_length = item.tool_inventory_id.tool_length # 总长度
+ item.after_assembly_functional_tool_length = item.tool_inventory_id.extension # 伸出长度
+ item.after_assembly_max_lifetime_value = item.tool_inventory_id.life_span # 最大寿命
+
+ functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型',
+ group_expand='_read_group_functional_tool_type_ids', store=True,
+ compute='_compute_inventory_num')
functional_tool_diameter = fields.Float(string='功能刀具直径(mm)', readonly=True)
knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=True)
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True)
@@ -384,7 +419,7 @@ class FunctionalToolAssembly(models.Model):
machine_tool_code = fields.Char(string='机台号', readonly=True)
applicant = fields.Char(string='申请人', readonly=True)
apply_time = fields.Datetime(string='申请时间', default=fields.Datetime.now(), readonly=True)
- assemble_status = fields.Selection([('0', '待组装'), ('1', '组装中'), ('2', '已组装'), ('3', '已取消')],
+ assemble_status = fields.Selection([('0', '待组装'), ('01', '组装中'), ('1', '已组装'), ('3', '已取消')],
string='组装状态', default='0', tracking=True, readonly=True)
cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=True)
whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=True)
@@ -393,7 +428,7 @@ class FunctionalToolAssembly(models.Model):
alarm_value = fields.Integer(string='报警值(min)', readonly=True)
used_value = fields.Integer(string='已使用值(min)', readonly=True)
- image = fields.Binary('图片', readonly=True)
+ image = fields.Binary('图片', readonly=False)
@api.model
def _read_group_functional_tool_type_ids(self, categories, domain, order):
@@ -403,8 +438,11 @@ class FunctionalToolAssembly(models.Model):
# 刀具物料信息
# ==============整体式刀具型号=============
- integral_freight_barcode_id = fields.Many2one('sf.shelf.location', string='整体式刀具货位')
- integral_lot_id = fields.Many2one('stock.lot', string='整体式刀具批次')
+ integral_freight_barcode_id = fields.Many2one('sf.shelf.location', string='整体式刀具货位',
+ domain="[('product_id.cutting_tool_material_id.name', '=', '整体式刀具'),('product_num', '>', 0)]")
+ integral_freight_lot_id = fields.Many2one('sf.shelf.location.lot', string='整体式刀具批次',
+ domain="[('shelf_location_id', '=', integral_freight_barcode_id)]")
+ integral_lot_id = fields.Many2one('stock.lot', string='整体式刀具批次', related='integral_freight_lot_id.lot_id')
integral_product_id = fields.Many2one('product.product', string='整体式刀具名称',
compute='_compute_integral_product_id', store=True)
cutting_tool_integral_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='整体式刀具型号',
@@ -414,15 +452,25 @@ class FunctionalToolAssembly(models.Model):
sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', string='整体式刀具品牌',
related='integral_product_id.brand_id')
+ @api.onchange('integral_freight_barcode_id')
+ def _onchange_integral_freight_barcode_id(self):
+ for item in self:
+ item.integral_freight_lot_id = False
+
@api.depends('integral_lot_id')
def _compute_integral_product_id(self):
for item in self:
if item.integral_lot_id:
item.integral_product_id = item.integral_lot_id.product_id.id
+ else:
+ item.integral_product_id = False
# =================刀片型号=============
- blade_freight_barcode_id = fields.Many2one('sf.shelf.location', string='刀片货位')
- blade_lot_id = fields.Many2one('stock.lot', string='刀片批次')
+ blade_freight_barcode_id = fields.Many2one('sf.shelf.location', string='刀片货位',
+ domain="[('product_id.cutting_tool_material_id.name', '=', '刀片'),('product_num', '>', 0)]")
+ blade_freight_lot_id = fields.Many2one('sf.shelf.location.lot', string='刀片批次',
+ domain="[('shelf_location_id', '=', blade_freight_barcode_id)]")
+ blade_lot_id = fields.Many2one('stock.lot', string='刀片批次', related='blade_freight_lot_id.lot_id')
blade_product_id = fields.Many2one('product.product', string='刀片名称', compute='_compute_blade_product_id',
store=True)
cutting_tool_blade_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀片型号',
@@ -431,15 +479,25 @@ class FunctionalToolAssembly(models.Model):
related='blade_product_id.specification_id')
sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌', related='blade_product_id.brand_id')
+ @api.onchange('blade_freight_barcode_id')
+ def _onchange_blade_freight_barcode_id(self):
+ for item in self:
+ item.blade_freight_lot_id = False
+
@api.depends('blade_lot_id')
def _compute_blade_product_id(self):
for item in self:
if item.blade_lot_id:
item.blade_product_id = item.blade_lot_id.product_id.id
+ else:
+ item.blade_product_id = False
# ==============刀杆型号================
- bar_freight_barcode_id = fields.Many2one('sf.shelf.location', string='刀杆货位')
- bar_lot_id = fields.Many2one('stock.lot', string='刀杆批次')
+ bar_freight_barcode_id = fields.Many2one('sf.shelf.location', string='刀杆货位',
+ domain="[('product_id.cutting_tool_material_id.name', '=', '刀杆'),('product_num', '>', 0)]")
+ bar_freight_lot_id = fields.Many2one('sf.shelf.location.lot', string='刀杆批次',
+ domain="[('shelf_location_id', '=', bar_freight_barcode_id)]")
+ bar_lot_id = fields.Many2one('stock.lot', string='刀杆批次', related='bar_freight_lot_id.lot_id')
bar_product_id = fields.Many2one('product.product', string='刀杆名称', compute='_compute_bar_product_id',
store=True)
cutting_tool_cutterbar_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀杆型号',
@@ -448,15 +506,25 @@ class FunctionalToolAssembly(models.Model):
related='bar_product_id.specification_id')
sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌', related='bar_product_id.brand_id')
+ @api.onchange('bar_freight_barcode_id')
+ def _onchange_bar_freight_barcode_id(self):
+ for item in self:
+ item.bar_freight_lot_id = False
+
@api.depends('bar_lot_id')
def _compute_bar_product_id(self):
for item in self:
if item.bar_lot_id:
item.bar_product_id = item.bar_lot_id.product_id.id
+ else:
+ item.bar_product_id = False
# =============刀盘型号================
- pad_freight_barcode_id = fields.Many2one('sf.shelf.location', string='刀盘货位')
- pad_lot_id = fields.Many2one('stock.lot', string='刀盘批次')
+ pad_freight_barcode_id = fields.Many2one('sf.shelf.location', string='刀盘货位',
+ domain="[('product_id.cutting_tool_material_id.name', '=', '刀盘'),('product_num', '>', 0)]")
+ pad_freight_lot_id = fields.Many2one('sf.shelf.location.lot', string='刀盘批次',
+ domain="[('shelf_location_id', '=', pad_freight_barcode_id)]")
+ pad_lot_id = fields.Many2one('stock.lot', string='刀盘批次', related='pad_freight_lot_id.lot_id')
pad_product_id = fields.Many2one('product.product', string='刀盘名称', compute='_compute_pad_product_id',
store=True)
cutting_tool_cutterpad_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀盘型号',
@@ -465,15 +533,24 @@ class FunctionalToolAssembly(models.Model):
related='pad_product_id.specification_id')
sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', related='pad_product_id.brand_id')
+ @api.onchange('pad_freight_barcode_id')
+ def _onchange_pad_freight_barcode_id(self):
+ for item in self:
+ item.pad_freight_lot_id = False
+
@api.depends('pad_lot_id')
def _compute_pad_product_id(self):
for item in self:
if item.pad_lot_id:
item.pad_product_id = item.pad_lot_id.product_id.id
+ else:
+ item.pad_product_id = False
# ==============刀柄型号==============
handle_freight_rfid = fields.Char('刀柄Rfid', compute='_compute_handle_product_id', store=True)
- handle_code_id = fields.Many2one('stock.lot', '刀柄序列号')
+ handle_code_id = fields.Many2one('stock.lot', '刀柄序列号',
+ domain=[('product_id.cutting_tool_material_id.name', '=', '刀柄'),
+ ('tool_material_status', '=', '可用')])
handle_product_id = fields.Many2one('product.product', string='刀柄名称', compute='_compute_handle_product_id',
store=True)
cutting_tool_cutterhandle_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀柄型号',
@@ -488,13 +565,18 @@ class FunctionalToolAssembly(models.Model):
if item.handle_code_id:
item.handle_product_id = item.handle_code_id.product_id.id
item.handle_freight_rfid = item.handle_code_id.rfid
+ item.rfid = item.handle_freight_rfid
else:
item.handle_product_id = False
item.handle_freight_rfid = False
+ item.rfid = False
# ==============夹头型号==============
- chuck_freight_barcode_id = fields.Many2one('sf.shelf.location', string='夹头货位')
- chuck_lot_id = fields.Many2one('stock.lot', string='夹头批次')
+ chuck_freight_barcode_id = fields.Many2one('sf.shelf.location', string='夹头货位',
+ domain="[('product_id.cutting_tool_material_id.name', '=', '夹头'),('product_num', '>', 0)]")
+ chuck_freight_lot_id = fields.Many2one('sf.shelf.location.lot', string='夹头批次',
+ domain="[('shelf_location_id', '=', chuck_freight_barcode_id)]")
+ chuck_lot_id = fields.Many2one('stock.lot', string='夹头批次', related='chuck_freight_lot_id.lot_id')
chuck_product_id = fields.Many2one('product.product', string='夹头名称', compute='_compute_chuck_product_id',
store=True)
cutting_tool_cutterhead_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='夹头型号',
@@ -503,11 +585,18 @@ class FunctionalToolAssembly(models.Model):
related='chuck_product_id.specification_id')
sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', related='chuck_product_id.brand_id')
+ @api.onchange('chuck_freight_barcode_id')
+ def _onchange_chuck_freight_barcode_id(self):
+ for item in self:
+ item.chuck_freight_lot_id = False
+
@api.depends('chuck_lot_id')
def _compute_chuck_product_id(self):
for item in self:
if item.chuck_lot_id:
item.chuck_product_id = item.chuck_lot_id.product_id.id
+ else:
+ item.chuck_product_id = False
# ==================待删除字段==================
integral_freight_barcode = fields.Char('整体式刀具货位')
@@ -526,30 +615,37 @@ class FunctionalToolAssembly(models.Model):
handle_name = fields.Char('')
chuck_code_id = fields.Many2one('stock.lot', '夹头序列号')
chuck_name = fields.Char('')
+ # ====================暂时无用字段=========================
+ after_assembly_used_value = fields.Integer(string='组装后已使用值(min)', readonly=True)
# ==============================================
# 组装功能刀具参数信息
start_preset_bool = fields.Boolean('开始预调', default=False)
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
- after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', readonly=True)
- after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model',
- string='组装后功能刀具类型', readonly=True)
- after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)', readonly=True,
- digits=(10, 3))
- after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)', readonly=True, digits=(10, 3))
- after_assembly_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='组装后新/旧', readonly=True)
+ after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', store=True,
+ compute='_compute_functional_tool_name')
+ after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', store=True,
+ string='组装后功能刀具类型',
+ compute='_compute_inventory_num')
+ after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)', digits=(10, 3), store=True,
+ compute='_compute_inventory_num')
+ after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)', digits=(10, 3), store=True,
+ compute='_compute_inventory_num')
+ after_assembly_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='组装后新/旧', default='0')
cut_time = fields.Integer(string='已切削时间(min)', readonly=True)
cut_length = fields.Float(string='已切削长度(mm)', readonly=True)
cut_number = fields.Integer(string='已切削次数', readonly=True)
after_assembly_whether_standard_knife = fields.Boolean(string='组装后是否标准刀', default=True, readonly=True)
after_assembly_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')],
- string='组装后粗/中/精', readonly=True)
- after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)', readonly=True)
- after_assembly_alarm_value = fields.Integer(string='组装后报警值(min)', readonly=True)
- after_assembly_used_value = fields.Integer(string='组装后已使用值(min)', readonly=True)
- after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)', readonly=True, digits=(10, 3))
- after_assembly_handle_length = fields.Float(string='组装后刀柄长度(mm)', readonly=True, digits=(10, 3))
- after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', readonly=True, digits=(10, 3))
+ string='组装后粗/中/精', default='3')
+ after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)', store=True,
+ compute='_compute_inventory_num')
+ after_assembly_alarm_value = fields.Integer(string='组装后报警值(min)')
+ after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)', digits=(10, 3), store=True,
+ compute='_compute_inventory_num')
+ after_assembly_handle_length = fields.Float(string='组装后刀柄长度(mm)', digits=(10, 3))
+ after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', digits=(10, 3), store=True,
+ compute='_compute_inventory_num')
after_assembly_effective_length = fields.Float(string='组装后有效长(mm)', readonly=True)
L_D_number = fields.Float(string='L/D值(mm)', readonly=True)
hiding_length = fields.Float(string='避空长(mm)', readonly=True)
@@ -567,6 +663,44 @@ class FunctionalToolAssembly(models.Model):
active = fields.Boolean(string='已归档', default=True)
+ code = fields.Char('功能刀具编码', compute='_compute_code')
+
+ @api.onchange('handle_product_id')
+ def _onchange_after_assembly_handle_length(self):
+ for item in self:
+ if item:
+ if item.handle_product_id:
+ item.after_assembly_handle_length = item.handle_product_id.cutting_tool_shank_length
+
+ @api.depends('after_assembly_functional_tool_type_id', 'cutting_tool_cutterhandle_model_id',
+ 'after_assembly_functional_tool_diameter', 'after_assembly_tool_loading_length',
+ 'after_assembly_knife_tip_r_angle', 'after_assembly_functional_tool_length',
+ 'after_assembly_handle_length')
+ def _compute_code(self):
+ for obj in self:
+ if obj.cutting_tool_cutterhandle_model_id:
+ code = obj.cutting_tool_cutterhandle_model_id.code.split('-', 1)[0]
+ str_1 = '%s-GNDJ-%s-D%sL%sR%sB%sH%s' % (
+ code, obj.after_assembly_functional_tool_type_id.code, obj.after_assembly_functional_tool_diameter,
+ obj.after_assembly_tool_loading_length, obj.after_assembly_knife_tip_r_angle,
+ round(obj.after_assembly_functional_tool_length, 3), obj.after_assembly_handle_length)
+ obj.code = '%s-%s' % (str_1, self._get_code_1(str_1))
+ else:
+ obj.code = ''
+
+ def _get_code_1(self, str_2):
+ functional_tool_assembly = self.env['sf.functional.cutting.tool.entity'].sudo().search(
+ [('code', 'like', str_2)],
+ limit=1,
+ order="id desc"
+ )
+ if not functional_tool_assembly:
+ num = "%03d" % 1
+ else:
+ m = int(functional_tool_assembly.code[-3:]) + 1
+ num = "%03d" % m
+ return num
+
def action_open_reference1(self):
self.ensure_one()
return {
@@ -576,41 +710,175 @@ class FunctionalToolAssembly(models.Model):
'res_id': self.id,
}
- def put_start_preset(self):
- self.search([('start_preset_bool', '=', True)]).write({'start_preset_bool': False})
+ def start_preset(self):
+ """
+ 开始组装
+ """
+ # 设置初始值
+ self.start_preset_bool = True
+ self.assemble_status = '01'
+ self.after_assembly_coarse_middle_thin = '3'
+ self.after_assembly_new_former = '0'
+
+ # todo 调用功能刀具名称对应的清单的BOM获取对应刀具物料信息
+
+ def functional_tool_assembly(self):
+ """
+ 功能刀具组装
+ :return:
+ """
+ logging.info('功能刀具开始组装！')
+ # 对物料做必填判断
+ self.materials_must_be_judged()
+
+ product_id = self.env['product.product']
+ # 创建组装入库单
+ # 创建功能刀具批次/序列号记录
+ stock_lot = product_id.create_assemble_warehouse_receipt(self)
+ # 封装功能刀具数据，用于创建功能刀具记录
+ desc_2 = self.get_desc(stock_lot, self)
+ # 创建功能刀具组装入库单
+ self.env['stock.picking'].create_tool_stocking_picking(stock_lot, self)
+ # 创建刀具物料出库单
+ self.env['stock.picking'].create_tool_stocking_picking1(self)
+
+ # ============================创建功能刀具列表、安全库存记录===============================
+ # 创建功能刀具列表记录
+ record_1 = self.env['sf.functional.cutting.tool.entity'].create(desc_2)
+ # 创建安全库存信息
+ self.env['sf.real.time.distribution.of.functional.tools'].create_or_edit_safety_stock({
+ 'functional_name_id': self.tool_inventory_id.id
+ }, record_1)
+
+ # =====================修改功能刀具组装单、机床换刀申请、CAM工单程序用刀计划的状态==============
+ if self.sf_machine_table_tool_changing_apply_id:
+ # 修改机床换刀申请的状态
+ self.env['sf.machine.table.tool.changing.apply'].sudo().search([
+ ('id', '=', self.sf_machine_table_tool_changing_apply_id.id)
+ ]).write({'status': '3'})
+ elif self.sf_cam_work_order_program_knife_plan_id:
+ # 修改CAM工单程序用刀计划状态
+ cam_plan = self.env['sf.cam.work.order.program.knife.plan'].sudo().search([
+ ('id', '=', self.sf_cam_work_order_program_knife_plan_id.id)
+ ])
+ cam_plan.write({'plan_execute_status': '2'})
+
+ # ============修改组装单状态为已组装=================================‘
self.write({
- 'after_assembly_tool_loading_length': 0,
- 'after_assembly_functional_tool_diameter': 0,
- 'after_assembly_knife_tip_r_angle': 0,
- 'start_preset_bool': True
+ 'assemble_status': '1',
+ 'start_preset_bool': False,
+ 'tool_loading_person': self.env.user.name,
+ 'tool_loading_time': fields.Datetime.now()
})
+
+ logging.info('功能刀具组装完成！')
+
+ def materials_must_be_judged(self):
+ """
+ 功能刀具组装必填判断
+ """
+ # 物料必填校验
+ if not self.handle_code_id:
+ raise ValidationError('缺少【刀柄】物料信息！')
+ if not self.integral_product_id and not self.blade_product_id:
+ raise ValidationError('【整体式刀具】和【刀片】必须填写一个！')
+ if self.blade_product_id:
+ if not self.bar_product_id and not self.pad_product_id:
+ raise ValidationError('【刀盘】和【刀杆】必须填写一个！')
+ # 组装参数必填校验
+ if self.after_assembly_functional_tool_length == 0:
+ raise ValidationError('组装参数信息【伸出长】不能为0！')
+ if self.after_assembly_max_lifetime_value == 0:
+ raise ValidationError('组装参数信息【最大寿命值】不能为0！')
+ if self.after_assembly_alarm_value == 0:
+ raise ValidationError('组装参数信息【报警值】不能为0！')
+ # if self.after_assembly_effective_length == 0:
+ # raise ValidationError('组装参数信息【有效长】不能为0！！！')
+ # if self.hiding_length == 0:
+ # raise ValidationError('组装参数信息【避空长】不能为0！！！')
+ if self.after_assembly_functional_tool_diameter == 0:
+ raise ValidationError('组装参数信息【刀具直径】不能为0！')
+ if self.after_assembly_tool_loading_length == 0:
+ raise ValidationError('组装参数信息【总长度】不能为0！！！')
+ if self.after_assembly_handle_length == 0:
+ raise ValidationError('组装参数信息【刀柄长度】不能为0！')
+ if self.after_assembly_tool_loading_length < self.after_assembly_handle_length:
+ raise ValidationError('组装参数信息【刀柄长度】不能大于【总长度】！')
+
+ def get_desc(self, stock_lot, functional_tool_assembly_id):
return {
- 'type': 'ir.actions.act_window',
- 'res_model': 'sf.functional.tool.assembly.order',
- 'name': '功能刀具组装单',
- 'view_mode': 'form',
- 'target': 'new',
- 'context': {'default_name': self.name,
- 'default_assembly_order_code': self.assembly_order_code,
- 'default_production_line_name_id': self.production_line_name_id.id,
- 'default_machine_tool_name_id': self.machine_tool_name_id.id,
- 'default_cutter_spacing_code_id': self.cutter_spacing_code_id.id,
- 'default_functional_tool_name': self.functional_tool_name,
- 'default_functional_tool_type_id': self.functional_tool_type_id.id,
- 'default_tool_groups_id': self.tool_groups_id.id,
- 'default_functional_tool_diameter': self.functional_tool_diameter,
- 'default_knife_tip_r_angle': self.knife_tip_r_angle,
- 'default_tool_loading_length': self.tool_loading_length,
- 'default_functional_tool_length': self.functional_tool_length,
- 'default_effective_length': self.effective_length,
- 'default_whether_standard_knife': self.whether_standard_knife,
- 'default_coarse_middle_thin': self.coarse_middle_thin,
- 'default_new_former': self.new_former,
- 'default_use_tool_time': self.use_tool_time,
- 'default_reason_for_applying': self.reason_for_applying
- }
+ 'barcode_id': stock_lot.id,
+ 'code': self.code,
+ 'name': self.tool_inventory_id.name,
+ 'tool_name_id': self.tool_inventory_id.id,
+ 'rfid': self.rfid,
+ 'tool_groups_id': self.tool_groups_id.id,
+ 'functional_tool_name_id': functional_tool_assembly_id.id,
+ 'sf_cutting_tool_type_id': self.after_assembly_functional_tool_type_id.id,
+ 'cutting_tool_integral_model_id': self.integral_product_id.id,
+ 'cutting_tool_blade_model_id': self.blade_product_id.id,
+ 'cutting_tool_cutterbar_model_id': self.bar_product_id.id,
+ 'cutting_tool_cutterpad_model_id': self.pad_product_id.id,
+ 'cutting_tool_cutterhandle_model_id': self.handle_product_id.id,
+ 'cutting_tool_cutterhead_model_id': self.chuck_product_id.id,
+
+ 'functional_tool_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,
+ 'new_former': self.after_assembly_new_former,
+ 'tool_loading_length': self.after_assembly_tool_loading_length,
+ 'handle_length': self.after_assembly_handle_length,
+ 'functional_tool_length': self.after_assembly_functional_tool_length,
+ 'effective_length': self.after_assembly_effective_length,
+
+ 'max_lifetime_value': self.after_assembly_max_lifetime_value,
+ 'alarm_value': self.after_assembly_alarm_value,
+ 'used_value': self.after_assembly_used_value,
+ 'whether_standard_knife': self.after_assembly_whether_standard_knife,
+ 'L_D_number': self.L_D_number,
+ 'hiding_length': self.hiding_length,
+ 'cut_time': self.cut_time,
+ 'cut_length': self.cut_length,
+ 'cut_number': self.cut_number,
+ 'image': self.image,
}
+ # def put_start_preset(self):
+ # # 打开组装弹窗开始组装
+ # self.search([('start_preset_bool', '=', True)]).write({'start_preset_bool': False})
+ # self.write({
+ # 'after_assembly_tool_loading_length': 0,
+ # 'after_assembly_functional_tool_diameter': 0,
+ # 'after_assembly_knife_tip_r_angle': 0,
+ # 'start_preset_bool': True
+ # })
+ # return {
+ # 'type': 'ir.actions.act_window',
+ # 'res_model': 'sf.functional.tool.assembly.order',
+ # 'name': '功能刀具组装单',
+ # 'view_mode': 'form',
+ # 'target': 'new',
+ # 'context': {'default_name': self.name,
+ # 'default_assembly_order_code': self.assembly_order_code,
+ # 'default_production_line_name_id': self.production_line_name_id.id,
+ # 'default_machine_tool_name_id': self.machine_tool_name_id.id,
+ # 'default_cutter_spacing_code_id': self.cutter_spacing_code_id.id,
+ # 'default_functional_tool_name': self.functional_tool_name,
+ # 'default_functional_tool_type_id': self.functional_tool_type_id.id,
+ # 'default_tool_groups_id': self.tool_groups_id.id,
+ # 'default_functional_tool_diameter': self.functional_tool_diameter,
+ # 'default_knife_tip_r_angle': self.knife_tip_r_angle,
+ # 'default_tool_loading_length': self.tool_loading_length,
+ # 'default_functional_tool_length': self.functional_tool_length,
+ # 'default_effective_length': self.effective_length,
+ # 'default_whether_standard_knife': self.whether_standard_knife,
+ # 'default_coarse_middle_thin': self.coarse_middle_thin,
+ # 'default_new_former': self.new_former,
+ # 'default_use_tool_time': self.use_tool_time,
+ # 'default_reason_for_applying': self.reason_for_applying
+ # }
+ # }
+
def _get_code(self, loading_task_source):
"""
自动生成组装单编码
diff --git a/sf_tool_management/models/stock.py b/sf_tool_management/models/stock.py
index a179c7d7..22a7fa72 100644
--- a/sf_tool_management/models/stock.py
+++ b/sf_tool_management/models/stock.py
@@ -1,4 +1,9 @@
+import logging
+
+from datetime import timedelta, datetime, date
+
from odoo import api, fields, models, _
+from odoo.exceptions import ValidationError
class ShelfLocation(models.Model):
@@ -58,3 +63,187 @@ class StockPicking(models.Model):
if move_lines:
self.env['stock.move.line'].sudo().button_function_tool_use_verify(move_lines)
return res
+
+ def create_tool_stocking_picking(self, stock_lot, obj):
+ """
+ 创建功能刀具组装入库单
+ """
+ # 获取名称为刀具组装入库的作业类型
+ picking_type_id = self.env['stock.picking.type'].sudo().search([('name', '=', '刀具组装入库')])
+ # 创建刀具组装入库单
+ picking_id = self.env['stock.picking'].create({
+ 'name': self._get_name_stock(picking_type_id),
+ 'picking_type_id': picking_type_id.id,
+ 'location_id': picking_type_id.default_location_src_id.id,
+ 'location_dest_id': picking_type_id.default_location_dest_id.id,
+ 'origin': obj.assembly_order_code
+ })
+ # 创建作业详情对象记录，并绑定到刀具组装入库单
+ self.env['stock.move.line'].create({
+ 'picking_id': picking_id.id,
+ 'product_id': stock_lot.product_id.id,
+ 'location_id': picking_id.location_id.id,
+ 'location_dest_id': picking_id.location_dest_id.id,
+ 'lot_id': stock_lot.id,
+ 'install_tool_time': fields.Datetime.now(),
+ 'qty_done': 1,
+ 'functional_tool_name_id': obj.id,
+ 'functional_tool_type_id': obj.functional_tool_type_id.id,
+ 'diameter': obj.after_assembly_functional_tool_diameter,
+ 'knife_tip_r_angle': obj.after_assembly_knife_tip_r_angle,
+ 'code': obj.code,
+ 'rfid': obj.rfid,
+ 'functional_tool_name': obj.after_assembly_functional_tool_name,
+ 'tool_groups_id': obj.tool_groups_id.id
+ })
+ # 将刀具组装入库单的状态更改为就绪
+ picking_id.action_confirm()
+ picking_id.button_validate()
+
+ def _get_name_stock(self, picking_type_id):
+ name = picking_type_id.sequence_id.prefix + str(
+ datetime.strptime(str(fields.Date.today()), "%Y-%m-%d").strftime("%Y%m%d"))
+ stock_id = self.env['stock.picking'].sudo().search(
+ [('name', 'like', name), ('picking_type_id', '=', picking_type_id.id)],
+ limit=1,
+ order="id desc"
+ )
+ if not stock_id:
+ num = "%03d" % 1
+ else:
+ m = int(stock_id.name[-3:]) + 1
+ num = "%03d" % m
+ return name + str(num)
+
+ def create_tool_stocking_picking1(self, obj):
+ """
+ 创建刀具物料出库单
+ """
+ # 获取名称为内部调拨的作业类型
+ picking_type_id = self.env['stock.picking.type'].sudo().search([('name', '=', '内部调拨')])
+ # 创建刀具物料出库单
+ picking_id = self.env['stock.picking'].create({
+ 'name': self._get_name_stock1(picking_type_id),
+ 'picking_type_id': picking_type_id.id,
+ 'location_id': self.env['stock.location'].search([('name', '=', '刀具房')]).id,
+ 'location_dest_id': self.env['stock.location'].search([('name', '=', '刀具组装位置')]).id,
+ 'origin': obj.assembly_order_code
+ })
+ # =============刀具物料出库===================
+ stock_move_id = self.env['stock.move']
+ datas = {'data': [], 'picking_id': picking_id}
+ if obj.handle_code_id:
+ # 修改刀柄序列号状态为【在用】
+ obj.handle_code_id.sudo().write({'tool_material_status': '在用'})
+ datas['data'].append(
+ {'current_location_id': self.env['sf.shelf.location'], 'lot_id': obj.handle_code_id})
+ if obj.integral_product_id:
+ datas['data'].append(
+ {'current_location_id': obj.integral_freight_barcode_id, 'lot_id': obj.integral_freight_lot_id.lot_id})
+ if obj.blade_product_id:
+ datas['data'].append(
+ {'current_location_id': obj.blade_freight_barcode_id, 'lot_id': obj.blade_freight_lot_id.lot_id})
+ if obj.bar_product_id:
+ datas['data'].append(
+ {'current_location_id': obj.bar_freight_barcode_id, 'lot_id': obj.bar_freight_lot_id.lot_id})
+ if obj.pad_product_id:
+ datas['data'].append(
+ {'current_location_id': obj.pad_freight_barcode_id, 'lot_id': obj.pad_freight_lot_id.lot_id})
+ if obj.chuck_product_id:
+ datas['data'].append(
+ {'current_location_id': obj.chuck_freight_barcode_id, 'lot_id': obj.chuck_freight_lot_id.lot_id})
+ # 创建刀具物料出库库存移动记录
+ stock_move_id.create_tool_material_stock_moves(datas)
+ # 将刀具物料出库库单的状态更改为就绪
+ picking_id.action_confirm()
+ # 修改刀具物料出库移动历史记录
+ stock_move_id.write_tool_material_stock_move_lines(datas)
+ # 设置数量，并验证完成
+ picking_id.action_set_quantities_to_reservation()
+ picking_id.button_validate()
+ logging.info(f'刀具物料调拨单状态：{picking_id.state}')
+
+ def _get_name_stock1(self, picking_type_id):
+ name = f'{picking_type_id.sequence_id.prefix}DJ/{date.today().strftime("%y")}'
+ stock_id = self.env['stock.picking'].sudo().search(
+ [('name', 'like', name), ('picking_type_id', '=', picking_type_id.id)],
+ limit=1,
+ order="id desc"
+ )
+ if not stock_id:
+ num = "%05d" % 1
+ else:
+ m = int(stock_id.name[-5:]) + 1
+ num = "%05d" % m
+ return name + str(num)
+
+
+class StockMove(models.Model):
+ _inherit = 'stock.move'
+
+ def create_tool_material_stock_moves(self, datas):
+ picking_id = datas['picking_id']
+ data = datas['data']
+ stock_move_ids = []
+ for res in data:
+ if res:
+ # 创建库存移动记录
+ stock_move_id = self.env['stock.move'].sudo().create({
+ 'name': picking_id.name,
+ 'picking_id': picking_id.id,
+ 'product_id': res['lot_id'].product_id.id,
+ 'location_id': picking_id.location_id.id,
+ 'location_dest_id': picking_id.location_dest_id.id,
+ 'product_uom_qty': 1.00,
+ 'reserved_availability': 1.00
+ })
+ stock_move_ids.append(stock_move_id)
+ return stock_move_ids
+
+ def write_tool_material_stock_move_lines(self, datas):
+ picking_id = datas['picking_id']
+ data = datas['data']
+ move_line_ids = picking_id.move_line_ids
+ for move_line_id in move_line_ids:
+ for res in data:
+ if move_line_id.lot_id.product_id == res['lot_id'].product_id:
+ move_line_id.write({
+ 'current_location_id': res.get('current_location_id').id,
+ 'lot_id': res.get('lot_id').id
+ })
+ return True
+
+
+class ProductProduct(models.Model):
+ _inherit = 'product.product'
+
+ def create_assemble_warehouse_receipt(self, obj):
+ """
+ 创建功能刀具批次/序列号记录
+ """
+ product_id = self.env['product.product'].search([('categ_type', '=', '功能刀具'), ('tracking', '=', 'serial')])
+ if not product_id:
+ logging.info('没有搜索到功能刀具产品：%s' % product_id)
+ raise ValidationError('没有找到按唯一序列号追溯的功能刀具产品信息！')
+ stock_lot = self.env['stock.lot'].create({
+ 'name': self.get_stock_lot_name(obj),
+ 'product_id': product_id[0].id,
+ 'company_id': self.env.company.id
+ })
+ return stock_lot
+
+ def get_stock_lot_name(self, obj):
+ """
+ 生成功能刀具序列号
+ """
+ company = obj.cutting_tool_cutterhandle_model_id.code.split('-', 1)[0]
+ new_time = datetime.strptime(str(fields.Date.today()), "%Y-%m-%d").strftime("%Y%m%d")
+ code = '%s-GNDJ-%s-%s' % (company, obj.after_assembly_functional_tool_type_id.code, new_time)
+ stock_lot_id = self.env['stock.lot'].sudo().search(
+ [('name', 'like', code)], 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 '%s-%s' % (code, num)
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 480fc357..8a3c3a73 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -450,15 +450,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -469,15 +469,17 @@