jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、注释action_apply_inventory()方法；2、功能刀具安全库存添加one2many类型的功能刀具废弃many2many类型的关联字段并优化代码，并在功能刀具模型添加功能按钮用来绑定功能刀具和对应的功能刀具安全库存；3、优化根据库存创建功能刀具组装单的方法断定条件；4、优化刀具注册接口的报错处理；5、优化组装流程

Browse Source
This commit is contained in:
yuxianghui
2024-05-18 11:54:23 +08:00
parent 305e91e7f1
commit 9e2091597b
5 changed files with 275 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sf_manufacturing/models/stock.py
View File

@@ -715,15 +715,15 @@ class ReStockMove(models.Model):
class ReStockQuant(models.Model):
_inherit = 'stock.quant'
def action_apply_inventory(self):
inventory_diff_quantity = self.inventory_diff_quantity
super(ReStockQuant, self).action_apply_inventory()
if inventory_diff_quantity >= 1:
stock = self.env['stock.move'].search([('product_id', '=', self.product_id.id), ('is_inventory', '=', True),
('reference', '=', '更新的产品数量'), ('state', '=', 'done')],
limit=1, order='id desc')
if self.product_id.categ_type == '夹具':
stock._register_fixture()
elif self.product_id.categ_type == '刀具':
stock._register_cutting_tool()
return True
# def action_apply_inventory(self):
# inventory_diff_quantity = self.inventory_diff_quantity
# super(ReStockQuant, self).action_apply_inventory()
# if inventory_diff_quantity >= 1:
# stock = self.env['stock.move'].search([('product_id', '=', self.product_id.id), ('is_inventory', '=', True),
# ('reference', '=', '更新的产品数量'), ('state', '=', 'done')],
# limit=1, order='id desc')
# if self.product_id.categ_type == '夹具':
# stock._register_fixture()
# elif self.product_id.categ_type == '刀具':
# stock._register_cutting_tool()
# return True

62
sf_tool_management/models/functional_tool.py
View File

@@ -1,4 +1,6 @@
# -*- coding: utf-8 -*-
import logging
import re
from datetime import timedelta
from odoo import SUPERUSER_ID
@@ -46,6 +48,16 @@ class FunctionalCuttingToolEntity(models.Model):
active = fields.Boolean(string='已归档', default=True)
safe_inventory_id = fields.Many2one('sf.real.time.distribution.of.functional.tools',
string='功能刀具安全库存', readonly=True)
def button_safe_inventory_id(self):
"""更新功能刀具关联的安全库存记录"""
tool_is = self.search([])
for item in tool_is:
item.safe_inventory_id = self.env['sf.real.time.distribution.of.functional.tools'].search(
[('functional_name_id', '=', item.tool_name_id.id)])[0]
@api.depends('barcode_id.quant_ids', 'functional_tool_status')
def _compute_current_location_id(self):
for record in self:
@@ -136,13 +148,11 @@ class FunctionalCuttingToolEntity(models.Model):
def _compute_maintenance_equipment_image(self):
for record in self:
if record.cutting_tool_integral_model_id:
print(record.cutting_tool_integral_model_id)
record.sudo().suitable_machining_method_ids = record.cutting_tool_integral_model_id.suitable_machining_method_ids.ids
record.sudo().blade_tip_characteristics_id = record.cutting_tool_integral_model_id.blade_tip_characteristics_id.id
record.sudo().handle_type_id = record.cutting_tool_integral_model_id.handle_type_id.id
record.sudo().cutting_direction_ids = record.cutting_tool_integral_model_id.cutting_direction_ids.ids
record.sudo().suitable_coolant_ids = record.cutting_tool_integral_model_id.suitable_coolant_ids.ids
print(record.cutting_tool_integral_model_id.blade_tip_characteristics_id.ids)
elif record.cutting_tool_blade_model_id:
record.sudo().suitable_machining_method_ids = record.cutting_tool_blade_model_id.suitable_machining_method_ids.ids
record.sudo().blade_tip_characteristics_id = record.cutting_tool_blade_model_id.blade_tip_characteristics_id.id
@@ -340,28 +350,31 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
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')
related='sf_functional_tool_entity_ids.suitable_machining_method_ids')
blade_tip_characteristics_id = fields.Many2one(
'maintenance.equipment.image', '刀尖特征',
domain=[('type', '=', '刀尖特征')],
related='sf_functional_cutting_tool_entity_ids.blade_tip_characteristics_id')
related='sf_functional_tool_entity_ids.blade_tip_characteristics_id')
handle_type_id = fields.Many2one(
'maintenance.equipment.image', '柄部类型',
domain=[('type', '=', '柄部类型')], related='sf_functional_cutting_tool_entity_ids.handle_type_id')
domain=[('type', '=', '柄部类型')], related='sf_functional_tool_entity_ids.handle_type_id')
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')
domain=[('type', '=', '走刀方向')], related='sf_functional_tool_entity_ids.cutting_direction_ids')
suitable_coolant_ids = fields.Many2many(
'maintenance.equipment.image', 'rel_coolants_product_template_distribution', '适合冷却方式',
domain=[('type', '=', '冷却方式')], related='sf_functional_cutting_tool_entity_ids.suitable_coolant_ids')
domain=[('type', '=', '冷却方式')], related='sf_functional_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)
string='功能刀具列表信息')
sf_functional_tool_assembly_ids = fields.Many2many('sf.functional.tool.assembly', 'sf_functional_tool_assembly_ref',
'功能刀具组装单', readonly=True)
sf_functional_tool_entity_ids = fields.One2many('sf.functional.cutting.tool.entity', 'safe_inventory_id',
string='功能刀具信息')
active = fields.Boolean(string='已归档', default=True)
@api.onchange('functional_name_id')
@@ -392,12 +405,11 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
mrs_cutting_tool_type_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
return categories.browse(mrs_cutting_tool_type_ids)
@api.depends('sf_functional_cutting_tool_entity_ids', 'min_stock_num', 'max_stock_num')
@api.depends('sf_functional_tool_entity_ids', 'min_stock_num', 'max_stock_num')
def _compute_batch_replenishment_num(self):
for tool in self:
if tool:
# 判断功能刀具组装单是否已经完成
tool.sudo().estimate_functional_tool_assembly_ids(tool)
# 计算刀具房数量、线边刀库数量、机内刀库数量
tool.sudo().get_stock_num(tool)
# 计算当前库存量
tool.sudo().tool_stock_total = tool.tool_stock_num + tool.side_shelf_num + tool.on_tool_stock_num
@@ -409,9 +421,10 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
计算批次补货量
"""
if tool.tool_stock_total < tool.min_stock_num:
tool.sudo().batch_replenishment_num = tool.max_stock_num - tool.tool_stock_total
# 根据判断创建功能刀具组装单
if not tool.sf_functional_tool_assembly_ids and re.match(r'^\d+$', str(tool.id)):
if not tool.sf_functional_tool_assembly_ids.filtered(lambda item: item.assemble_status == '0') and re.match(
r'^\d+$', str(tool.id)):
tool.sudo().batch_replenishment_num = tool.max_stock_num - tool.tool_stock_total
for i in range(tool.batch_replenishment_num):
tool.sudo().create_functional_tool_assembly(tool)
print(i, ": ", tool.sf_functional_tool_assembly_ids)
@@ -438,15 +451,6 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
})
tool.sudo().sf_functional_tool_assembly_ids = [(4, functional_tool_assembly.id)]
def estimate_functional_tool_assembly_ids(self, tool):
"""
判断功能刀具组装单是否完成，如果全部完成清空sf_functional_tool_assembly_ids的数据
"""
for sf_functional_tool_assembly_id in tool.sf_functional_tool_assembly_ids:
if sf_functional_tool_assembly_id.assemble_status == '0':
return False
tool.sudo().sf_functional_tool_assembly_ids = []
def get_stock_num(self, tool):
"""
计算刀具房数量、线边刀库数量、机内刀库数量
@@ -455,16 +459,20 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
tool.tool_stock_num = 0
tool.side_shelf_num = 0
tool.on_tool_stock_num = 0
if tool.sf_functional_cutting_tool_entity_ids:
for cutting_tool in tool.sf_functional_cutting_tool_entity_ids:
if tool.sf_functional_tool_entity_ids:
for cutting_tool in tool.sf_functional_tool_entity_ids:
if cutting_tool.tool_room_num > 0:
tool.tool_stock_num += 1
elif cutting_tool.line_edge_knife_library_num > 0:
tool.side_shelf_num += 1
elif cutting_tool.machine_knife_library_num > 0:
tool.on_tool_stock_num += 1
else:
tool.tool_stock_num = 0
tool.side_shelf_num = 0
tool.on_tool_stock_num = 0
def create_or_edit_safety_stock(self, vals, sf_functional_cutting_tool_entity_ids):
def create_or_edit_safety_stock(self, vals, sf_functional_tool_entity_ids):
"""
根据传入的信息新增或者更新功能刀具安全库存的信息
"""
@@ -473,9 +481,9 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
[('functional_name_id', '=', vals['functional_name_id'])])
if len(record) > 0:
for obj in record:
obj.write({'sf_functional_cutting_tool_entity_ids': [(4, sf_functional_cutting_tool_entity_ids.id)]})
obj.write({'sf_functional_tool_entity_ids': [(4, sf_functional_tool_entity_ids.id)]})
else:
vals['sf_functional_cutting_tool_entity_ids'] = sf_functional_cutting_tool_entity_ids.ids
vals['sf_functional_tool_entity_ids'] = sf_functional_tool_entity_ids.ids
self.env['sf.real.time.distribution.of.functional.tools'].create(vals)
status_create = fields.Boolean('是否是新增状态', default=True)

22
sf_tool_management/models/functional_tool_enroll.py
View File

@@ -81,6 +81,7 @@ class StockLot(models.Model):
def _get_sync_stock_lot(self, objs_all, str_url, token, headers):
tool_material_stock_list = []
try:
if objs_all:
for item in objs_all:
val = {
@@ -97,6 +98,8 @@ class StockLot(models.Model):
return '刀具物料序列号注册成功'
else:
logging.info("没有注册刀具物料序列号信息")
except Exception as e:
logging.info("捕获错误信息:%s" % e)
class ToolMaterial(models.Model):
@@ -127,6 +130,7 @@ class ToolMaterial(models.Model):
def _get_sync_tool_material_search(self, objs_all, str_url, token, headers):
tool_material_list = []
try:
if objs_all:
for item in objs_all:
val = {
@@ -149,6 +153,8 @@ class ToolMaterial(models.Model):
return '刀具物料注册成功'
else:
logging.info('没有注册刀具物料信息')
except Exception as e:
logging.info("捕获错误信息:%s" % e)
@api.model_create_multi
def create(self, vals_list):
@@ -188,6 +194,7 @@ class FunctionalCuttingToolEntity(models.Model):
def _get_sync_functional_cutting_tool_entity(self, objs_all, str_url, token, headers):
functional_tool_list = []
try:
if objs_all:
for item in objs_all:
val = {
@@ -238,6 +245,8 @@ class FunctionalCuttingToolEntity(models.Model):
return "功能刀具注册成功"
else:
logging.info('没有注册功能刀具信息')
except Exception as e:
logging.info("捕获错误信息:%s" % e)
@api.model_create_multi
def create(self, vals_list):
@@ -283,6 +292,7 @@ class FunctionalToolWarning(models.Model):
def get_sync_functional_tool_warning(self, objs_all, str_url, token, headers):
tool_warning_list = []
try:
if objs_all:
for item in objs_all:
val = {
@@ -319,6 +329,8 @@ class FunctionalToolWarning(models.Model):
return "功能刀具预警注册成功"
else:
logging.info('没有注册功能刀具预警信息')
except Exception as e:
logging.info("捕获错误信息:%s" % e)
@api.model_create_multi
def create(self, vals_list):
@@ -358,6 +370,7 @@ class StockMoveLine(models.Model):
def get_sync_stock_move_line(self, objs_all, str_url, token, headers):
tool_stock_list = []
try:
if objs_all:
for item in objs_all:
val = {
@@ -385,6 +398,8 @@ class StockMoveLine(models.Model):
return "功能刀具出入库记录注册成功"
else:
logging.info('没有注册功能刀具出入库记录信息')
except Exception as e:
logging.info("捕获错误信息:%s" % e)
@api.model_create_multi
def create(self, vals_list):
@@ -424,10 +439,11 @@ class RealTimeDistributionFunctionalTools(models.Model):
def get_sync_real_time_distribution_functional_tools(self, objs_all, str_url, token, headers):
tool_distribution_list = []
try:
if objs_all:
for item in objs_all:
functional_tool_codes = []
for obj in item.sf_functional_cutting_tool_entity_ids:
for obj in item.sf_functional_tool_entity_ids:
functional_tool_codes.append(obj.code)
val = {
'id': item.id,
@@ -463,6 +479,8 @@ class RealTimeDistributionFunctionalTools(models.Model):
return "功能刀具出入库记录注册成功"
else:
logging.info('没有注册功能刀具出入库记录信息')
except Exception as e:
logging.info("捕获错误信息:%s" % e)
@api.model_create_multi
def create(self, vals_list):
@@ -474,6 +492,6 @@ class RealTimeDistributionFunctionalTools(models.Model):
def write(self, vals):
res = super().write(vals)
if vals.get('sf_functional_cutting_tool_entity_ids') or vals.get('min_stock_num') or vals.get('max_stock_num'):
if vals.get('sf_functional_tool_entity_ids') or vals.get('min_stock_num') or vals.get('max_stock_num'):
self.enroll_functional_tool_real_time_distribution()
return res

13
sf_tool_management/views/functional_tool_views.xml
View File

@@ -46,6 +46,8 @@
</header>
<sheet>
<div class="oe_button_box" name="button_box">
<button name="button_safe_inventory_id" string="更新功能刀具关联的安全库存记录"
type="object" class="btn-primary"/>
<button class="oe_stat_button" groups="sf_base.group_sf_mrp_user"
name="open_functional_tool_warning"
icon="fa-list-ul"
@@ -89,9 +91,9 @@
attrs="{'invisible': [('functional_tool_status', '=', '已拆除')]}"/>
<field name="rfid_dismantle" readonly="1"
attrs="{'invisible': [('functional_tool_status', '!=', '已拆除')]}"/>
<field name="tool_name_id" invisible="0"
<field name="tool_name_id" invisible="0" readonly="1"
placeholder="请输入20字以内的名称"/>
<field name="sf_cutting_tool_type_id"/>
<field name="sf_cutting_tool_type_id" readonly="1"/>
<field name="tool_groups_id"/>
<field name="cutting_tool_integral_model_id"
options="{'no_create': True, 'no_quick_create': True}"
@@ -113,6 +115,7 @@
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="safe_inventory_id" readonly="0"/>
</group>
<group>
<field name="image" nolabel="1" widget="image"/>
@@ -188,7 +191,8 @@
<field name="tool_name_id"/>
<field name="functional_tool_diameter"/>
<field name="knife_tip_r_angle"/>
<filter string="未拆除" name="no_state_removed" domain="[('functional_tool_status', '!=', '已拆除')]"/>
<filter string="未拆除" name="no_state_removed"
domain="[('functional_tool_status', '!=', '已拆除')]"/>
<filter string="已拆除" name="state_removed" domain="[('functional_tool_status', '=', '已拆除')]"/>
<separator/>
<filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
@@ -385,7 +389,8 @@
</group>
<notebook>
<page string="刀具信息">
<field name="sf_functional_cutting_tool_entity_ids" widget="many2many">
<field name="sf_functional_cutting_tool_entity_ids" invisible="1" widget="many2many"/>
<field name="sf_functional_tool_entity_ids" widget="one2many">
<tree edit="0" create="0" delete="0">
<field name="rfid"/>
<field name="tool_name_id"/>

9
sf_tool_management/wizard/wizard.py
View File

@@ -607,7 +607,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
# 对物料做必填判断
self.materials_must_be_judged()
product_id = self.env['product.product'].search([('name', '=', '功能刀具')])
product_id = self.env['product.product']
# 创建组装入库单
# 创建功能刀具批次/序列号记录
stock_lot = product_id.create_assemble_warehouse_receipt(self.id, functional_tool_assembly, self)
@@ -803,8 +803,8 @@ class ProductProduct(models.Model):
创建功能刀具批次/序列号记录
"""
product_id = self.env['product.product'].search([('name', '=', '功能刀具')])
logging.info("product_id: %s" % product_id)
if not product_id:
logging.info('没有搜索到功能刀具产品：%s' % product_id)
stock_lot = self.env['stock.lot'].create({
'name': self.get_stock_lot_name(tool_assembly_order_id),
'product_id': product_id.id,
@@ -849,7 +849,8 @@ class ProductProduct(models.Model):
location_inventory_id = tool_material.quant_ids.location_id[-1]
stock_location_id = self.env['stock.location'].search([('name', '=', '刀具组装位置')])
# 创建功能刀具该批次/序列号 库存移动和移动历史
tool_material.create_stock_quant(location_inventory_id, stock_location_id, None, assembly_order_code, False, False)
tool_material.create_stock_quant(location_inventory_id, stock_location_id, None, assembly_order_code, False,
False)
def material_stock_moves(self, shelf_location_barcode, assembly_order_code):
# 创建库存移动记录