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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化消息模版

Browse Source 
# Conflicts:
#	sf_tool_management/models/base.py
This commit is contained in:
jinling.yang
2024-09-18 15:40:54 +08:00
parent ce6b36a77e 213b76a280
commit 8bf1c56efd
34 changed files with 1959 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sf_bf_connect/models/process_status.py
View File

@@ -1,3 +1,4 @@
import traceback
from datetime import datetime from datetime import datetime
import logging import logging
import requests import requests
@@ -53,11 +54,14 @@ class StatusChange(models.Model):
if not ret.get('error'): if not ret.get('error'):
logging.info('接口已经执行=============') logging.info('接口已经执行=============')
else: else:
logging.error('工厂加工同步订单状态失败 {}'.format(ret)) traceback_error = traceback.format_exc()
raise UserError('工厂加工同步订单状态失败') logging.error("bfm订单状态同步失败:%s request info %s" % traceback_error)
logging.error('/api/get/state/get_order 请求失败{}'.format(ret))
raise UserError('工厂加工同步订单状态到bfm失败')
except UserError as e: except UserError as e:
logging.error('工厂加工同步订单状态失败 {}'.format(e)) traceback_error = traceback.format_exc()
raise UserError('工厂加工同步订单状态失败') logging.error("工厂加工同步订单状态失败:%s " % traceback_error)
raise UserError(e)
return res return res
def action_cancel(self): def action_cancel(self):

18
sf_dlm_management/views/product_template_management_view.xml
View File

@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<data> <data>
<record id="mrp.product_template_action" model="ir.actions.act_window">
<field name="context">
{"search_default_categ_id":1,"search_default_consumable": 1, 'default_detailed_type': 'product'}
</field>
</record>
<record model="ir.ui.view" id="view_sale_product_template_form_inherit_sf"> <record model="ir.ui.view" id="view_sale_product_template_form_inherit_sf">
<field name="name">product.template.form.inherit.sf</field> <field name="name">product.template.form.inherit.sf</field>
<field name="model">product.template</field> <field name="model">product.template</field>
@@ -88,7 +93,8 @@
</div> </div>
<field name="model_volume" string="体积[mm³]"/> <field name="model_volume" string="体积[mm³]"/>
<field name="product_model_type_id" string="模型类型"/> <field name="product_model_type_id" string="模型类型"/>
<field name="model_processing_panel" placeholder="例如R,U" string="加工面板" readonly="1"/> <field name="model_processing_panel" placeholder="例如R,U" string="加工面板"
readonly="1"/>
<field name="model_machining_precision"/> <field name="model_machining_precision"/>
<field name="model_process_parameters_ids" string="表面工艺参数" <field name="model_process_parameters_ids" string="表面工艺参数"
widget="many2many_tags" widget="many2many_tags"
@@ -103,11 +109,11 @@
'刀具')], 'required': True} '刀具')], 'required': True}
</attribute> </attribute>
</xpath> </xpath>
<!-- <xpath expr="//field[@name='default_code']" position="attributes">--> <!-- <xpath expr="//field[@name='default_code']" position="attributes">-->
<!-- <attribute name="attrs">{'readonly': [('categ_type', '=', '刀具')], 'invisible':--> <!-- <attribute name="attrs">{'readonly': [('categ_type', '=', '刀具')], 'invisible':-->
<!-- [('product_variant_count', '>' , 1)]}--> <!-- [('product_variant_count', '>' , 1)]}-->
<!-- </attribute>--> <!-- </attribute>-->
<!-- </xpath>--> <!-- </xpath>-->
</field> </field>
</record> </record>

411
sf_machine_connect/controllers/controllers.py
View File

@@ -6,7 +6,7 @@ import base64
import logging import logging
import psycopg2 import psycopg2
from datetime import datetime, timedelta from datetime import datetime, timedelta
from odoo import http from odoo import http, fields
from odoo.http import request from odoo.http import request
# 数据库连接配置 # 数据库连接配置
@@ -15,14 +15,18 @@ db_config = {
"user": "postgres", "user": "postgres",
"password": "postgres", "password": "postgres",
"port": "5432", "port": "5432",
"host": "172.16.10.98" "host": "172.16.10.113"
} }
def convert_to_seconds(time_str): def convert_to_seconds(time_str):
# 修改正则表达式，使 H、M、S 部分可选 # 修改正则表达式，使 H、M、S 部分可选
if time_str is None:
return 0
pattern = r"(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?" pattern = r"(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?"
match = re.match(pattern, time_str) match = re.match(pattern, time_str)
if match: if match:
@@ -66,7 +70,7 @@ class Sf_Dashboard_Connect(http.Controller):
# 获取当前时间的时间戳 # 获取当前时间的时间戳
current_timestamp = datetime.now().timestamp() current_timestamp = datetime.now().timestamp()
print(current_timestamp) # print(current_timestamp)
# tem_list = [ # tem_list = [
# "XT-GNJC-WZZX-X800-Y550-Z550-T24-A5-1", "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-3", # "XT-GNJC-WZZX-X800-Y550-Z550-T24-A5-1", "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-3",
@@ -162,7 +166,8 @@ class Sf_Dashboard_Connect(http.Controller):
'first_online_duration': first_online_duration, 'first_online_duration': first_online_duration,
# 停机时间：关机时间 - 运行时间 # 停机时间：关机时间 - 运行时间
# 停机时长：关机时间 - 初次上线时间 # 停机时长：关机时间 - 初次上线时间
'img': f'data:image/png;base64,{machine_data.machine_tool_picture.decode("utf-8")}', # 'img': f'data:image/png;base64,{machine_data.machine_tool_picture.decode("utf-8")}',
'img': f'https://xt.sf.jikimo.com/equipment/get_image/{machine_data.id}',
'equipment_type': machine_data.category_id.name, 'equipment_type': machine_data.category_id.name,
}) })
@@ -194,7 +199,7 @@ class Sf_Dashboard_Connect(http.Controller):
begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S') begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S') end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
print('begin_time: %s' % begin_time) # print('begin_time: %s' % begin_time)
for item in machine_list: for item in machine_list:
sql = ''' sql = '''
@@ -275,7 +280,7 @@ class Sf_Dashboard_Connect(http.Controller):
res = {'Succeed': True} res = {'Succeed': True}
line_list_obj = request.env['sf.production.line'].sudo().search([('name', 'ilike', 'CNC')]) line_list_obj = request.env['sf.production.line'].sudo().search([('name', 'ilike', 'CNC')])
line_list = list(map(lambda x: x.name, line_list_obj)) line_list = list(map(lambda x: x.name, line_list_obj))
print('line_list: %s' % line_list) # print('line_list: %s' % line_list)
res['LineList'] = line_list res['LineList'] = line_list
except Exception as e: except Exception as e:
@@ -300,21 +305,40 @@ class Sf_Dashboard_Connect(http.Controller):
try: try:
plan_obj = request.env['sf.production.plan'].sudo() plan_obj = request.env['sf.production.plan'].sudo()
production_obj = request.env['mrp.production'].sudo()
line_list = ast.literal_eval(kw['line_list']) line_list = ast.literal_eval(kw['line_list'])
print('line_list: %s' % line_list) # print('line_list: %s' % line_list)
for line in line_list: for line in line_list:
plan_data = plan_obj.search([('production_line_id.name', '=', line)])
# 工单总量 # 工单计划量
plan_data_total_counts = plan_obj.search_count([('production_line_id.name', '=', line)]) plan_data_total_counts = production_obj.search_count(
[('production_line_id.name', '=', line), ('state', 'not in', ['cancel']),
('active', '=', True)])
# 工单完成量 # 工单完成量
plan_data_finish_counts = plan_obj.search_count( plan_data_finish_counts = plan_obj.search_count(
[('production_line_id.name', '=', line), ('state', 'in', ['finished'])]) [('production_line_id.name', '=', line), ('state', 'in', ['finished'])])
# 工单计划量 # # 工单计划量
plan_data_plan_counts = plan_obj.search_count( # plan_data_plan_counts = plan_obj.search_count(
[('production_line_id.name', '=', line), ('state', 'not in', ['finished'])]) # [('production_line_id.name', '=', line), ('state', 'not in', ['finished'])])
# 工单不良累计
plan_data_fault_counts = plan_obj.search_count( # 查找符合条件的生产计划记录
[('production_line_id.name', '=', line), ('production_id.state', 'in', ['scrap', 'cancel'])]) plan_data = plan_obj.search([
('production_line_id.name', '=', line),
])
# 过滤出那些检测结果状态为 '返工' 或 '报废' 的记录
faulty_plans = plan_data.filtered(lambda p: any(
result.test_results in ['返工', '报废'] for result in p.production_id.detection_result_ids
))
# 查找制造订单取消与归档的数量
cancel_order_count = production_obj.search_count(
[('production_line_id.name', '=', line), ('state', 'in', ['cancel']),
('active', '=', False)])
# 计算符合条件的记录数量
# plan_data_fault_counts = len(faulty_plans) + cancel_order_count
plan_data_fault_counts = len(faulty_plans)
# 工单返工数量 # 工单返工数量
@@ -326,17 +350,76 @@ class Sf_Dashboard_Connect(http.Controller):
(plan_data_finish_counts / plan_data_total_counts if plan_data_total_counts > 0 else 0), 3) (plan_data_finish_counts / plan_data_total_counts if plan_data_total_counts > 0 else 0), 3)
# 工单进度偏差 # 工单进度偏差
plan_data_progress_deviation = plan_data_finish_counts - plan_data_plan_counts plan_data_progress_deviation = plan_data_total_counts - plan_data_finish_counts - plan_data_fault_counts
# 完成记录
plan_data_finish_orders = plan_obj.search(
[('production_line_id.name', '=', line), ('state', 'in', ['finished'])])
# # 检测量
# detection_nums = 0
# for i in plan_data_finish_orders:
# print('i: %s' % i)
# if i.production_id.detection_result_ids:
# detection_nums += 1
#
# print('detection_nums: %s' % detection_nums)
# 检测量
detection_data = len(
plan_data_finish_orders.mapped('production_id.detection_result_ids').filtered(lambda r: r))
# 检测合格量
pass_nums = plan_data_finish_orders.filtered(lambda p: any(
result.test_results in ['合格'] for result in p.production_id.detection_result_ids
))
# 质量合格率
pass_rate = 1
if pass_nums:
pass_rate = round(
(len(pass_nums) / detection_data if len(plan_data_finish_orders) > 0 else 0), 3)
# 返工率
rework_rate = round(
(plan_data_rework_counts / plan_data_finish_counts if plan_data_finish_counts > 0 else 0), 3)
# 交付准时率
delay_num = 0
for plan in plan_data_finish_orders:
sale_obj = request.env['sale.order'].sudo().search([('name', '=', plan.origin)])
if sale_obj:
if sale_obj.deadline_of_delivery and plan.actual_end_time:
# 将 deadline_of_delivery 转换为字符串
date_as_string = sale_obj.deadline_of_delivery.strftime('%Y-%m-%d')
# 然后使用 strptime 将字符串转换为 datetime 对象
date_as_datetime = datetime.strptime(date_as_string, '%Y-%m-%d')
# 将 actual_end_time 转换为 datetime 对象
datetime_value = fields.Datetime.from_string(plan.actual_end_time)
# 给 datetime_value 加1天
new_datetime_value = datetime_value + timedelta(days=1)
# 比较 new_datetime_value 和 date_as_datetime 的大小
if new_datetime_value.date() > date_as_datetime.date():
delay_num += 1
delay_rate = round((delay_num / plan_data_finish_counts if plan_data_finish_counts > 0 else 0), 3)
on_time_rate = 1 - delay_rate
if plan_data: if plan_data:
data = { data = {
'plan_data_total_counts': plan_data_total_counts, 'plan_data_total_counts': plan_data_total_counts,
'plan_data_finish_counts': plan_data_finish_counts, 'plan_data_finish_counts': plan_data_finish_counts,
'plan_data_plan_counts': plan_data_plan_counts, 'plan_data_plan_counts': plan_data_total_counts,
'plan_data_fault_counts': plan_data_fault_counts, 'plan_data_fault_counts': plan_data_fault_counts,
'nopass_orders_counts': detection_data - len(pass_nums),
'finishe_rate': finishe_rate, 'finishe_rate': finishe_rate,
'plan_data_progress_deviation': plan_data_progress_deviation, 'plan_data_progress_deviation': plan_data_progress_deviation,
'plan_data_rework_counts': plan_data_rework_counts 'plan_data_rework_counts': plan_data_rework_counts,
'on_time_rate': on_time_rate,
'detection_data': detection_data,
'pass_rate': pass_rate
} }
res['data'][line] = data res['data'][line] = data
@@ -363,7 +446,28 @@ class Sf_Dashboard_Connect(http.Controller):
end_time_str = kw['end_time'].strip('"') end_time_str = kw['end_time'].strip('"')
begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S') begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S') end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
print('line_list: %s' % line_list) # print('line_list: %s' % line_list)
print('kw', kw)
time_unit = kw.get('time_unit', 'day').strip('"') # 默认单位为天
print('time_unit: %s' % time_unit)
# 日期或小时循环生成器，根据time_unit决定是按天还是按小时
def get_time_intervals(start_time, end_time, time_unit):
intervals = []
current_time = start_time
if time_unit == 'hour':
delta = timedelta(hours=1)
else:
delta = timedelta(days=1)
while current_time < end_time:
next_time = current_time + delta
# 确保最后一个时间段不会超出end_time
if next_time > end_time:
next_time = end_time
intervals.append((current_time, next_time))
current_time = next_time
return intervals
def get_date_list(start_date, end_date): def get_date_list(start_date, end_date):
date_list = [] date_list = []
@@ -374,10 +478,33 @@ class Sf_Dashboard_Connect(http.Controller):
return date_list return date_list
for line in line_list: for line in line_list:
date_list = get_date_list(begin_time, end_time) date_field_name = 'actual_end_time' # 替换为你模型中的实际字段名
order_counts = [] order_counts = []
date_field_name = 'actual_end_time' # 替换为你模型中的实际字段名 if time_unit == 'hour':
time_intervals = get_time_intervals(begin_time, end_time, time_unit)
print('============================= %s' % time_intervals)
time_count_dict = {}
for time_interval in time_intervals:
start_time, end_time = time_interval
# print(start_time, end_time)
orders = plan_obj.search([('production_line_id.name', '=', line), ('state', 'in', ['finished']),
(date_field_name, '>=', start_time.strftime('%Y-%m-%d 00:00:00')),
(date_field_name, '<', end_time.strftime('%Y-%m-%d 00:00:00'))
])
# 使用小时和分钟作为键，确保每个小时的数据有独立的键
key = start_time.strftime('%H:%M:%S') # 只取小时:分钟:秒作为键
time_count_dict[key] = len(orders)
# order_counts.append()
res['data'][line] = {
'finish_order_nums': time_count_dict,
'plan_order_nums': 28
}
return json.dumps(res)
date_list = get_date_list(begin_time, end_time)
for date in date_list: for date in date_list:
next_day = date + timedelta(days=1) next_day = date + timedelta(days=1)
@@ -487,7 +614,7 @@ class Sf_Dashboard_Connect(http.Controller):
end_time_str = kw['end_time'].strip('"') end_time_str = kw['end_time'].strip('"')
begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S') begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S') end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
print('line_list: %s' % line_list) # print('line_list: %s' % line_list)
not_done_data = [] not_done_data = []
done_data = [] done_data = []
final_data = {} final_data = {}
@@ -495,11 +622,16 @@ class Sf_Dashboard_Connect(http.Controller):
for line in line_list: for line in line_list:
# 未完成订单 # 未完成订单
not_done_orders = plan_obj.search( not_done_orders = plan_obj.search(
[('production_line_id.name', '=', line), ('state', 'not in', ['finished'])]) [('production_line_id.name', '=', line), ('state', 'not in', ['finished']),
print(not_done_orders) ('production_id.state', 'not in', ['cancel']), ('active', '=', True)
])
# print(not_done_orders)
# 完成订单 # 完成订单
finish_orders = plan_obj.search([('production_line_id.name', '=', line), ('state', 'in', ['finished'])]) finish_orders = plan_obj.search([
print(finish_orders) ('production_line_id.name', '=', line), ('state', 'in', ['finished']),
('production_id.state', 'not in', ['cancel']), ('active', '=', True)
])
# print(finish_orders)
# 获取所有未完成订单的ID列表 # 获取所有未完成订单的ID列表
order_ids = [order.id for order in not_done_orders] order_ids = [order.id for order in not_done_orders]
@@ -622,11 +754,11 @@ class Sf_Dashboard_Connect(http.Controller):
# 执行SQL命令 # 执行SQL命令
cur.execute(sql, (item,)) cur.execute(sql, (item,))
result = cur.fetchall() result = cur.fetchall()
print('result========', result) # print('result========', result)
cur.execute(sql2, (item,)) cur.execute(sql2, (item,))
result2 = cur.fetchall() result2 = cur.fetchall()
print('result2========', result2) # print('result2========', result2)
# #
for row in result: for row in result:
res['data'][item] = {'idle_count': row[0]} res['data'][item] = {'idle_count': row[0]}
@@ -682,7 +814,7 @@ class Sf_Dashboard_Connect(http.Controller):
# 执行SQL命令 # 执行SQL命令
cur.execute(sql) cur.execute(sql)
result = cur.fetchall() result = cur.fetchall()
print('result', result) # print('result', result)
# 将查询结果转换为字典列表 # 将查询结果转换为字典列表
data = [] data = []
@@ -830,3 +962,222 @@ class Sf_Dashboard_Connect(http.Controller):
# 返回数据 # 返回数据
res['data'] = oee_data res['data'] = oee_data
return json.dumps(res) return json.dumps(res)
@http.route(['/equipment/get_image/<int:record_id>'], type='http', auth="public", website=True)
def get_image(self, record_id, **kwargs):
# 获取模型中的记录
record = request.env['maintenance.equipment'].sudo().browse(record_id)
# 获取图片字段的数据
image_data_base64 = record.machine_tool_picture
if image_data_base64:
# 将Base64解码为二进制数据
image_data_binary = base64.b64decode(image_data_base64)
# 返回图片数据，并设置正确的Content-Type
return request.make_response(image_data_binary, headers=[('Content-Type', 'image/png')])
else:
# 如果没有图片数据，返回404
return request.not_found()
# 设备运行率
@http.route('/api/RunningTime', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
def RunningTime(self, **kw):
"""
获取设备运行时长
"""
res = {'status': 1, 'message': '成功', 'data': {}}
# 连接数据库
conn = psycopg2.connect(**db_config)
# 获取请求的机床数据
machine_list = ast.literal_eval(kw['machine_list'])
def fetch_result_as_dict(cursor):
"""辅助函数：将查询结果转为字典"""
columns = [desc[0] for desc in cursor.description]
return dict(zip(columns, cursor.fetchone())) if cursor.rowcount != 0 else None
# 初始化当天、当月和有记录以来的总时长
day_total_running_time = 0
day_total_process_time = 0
day_work_rate = 0
month_total_running_time = 0
month_total_process_time = 0
month_work_rate = 0
all_time_total_running_time = 0
all_time_total_process_time = 0
all_time_work_rate = 0
for item in machine_list:
# 获取当天第一条记录（排除device_state等于‘离线’的记录）
with conn.cursor() as cur:
cur.execute("""
SELECT * FROM device_data
WHERE device_name = %s
AND time::date = CURRENT_DATE
AND device_state != '离线'
ORDER BY time ASC
LIMIT 1;
""", (item,))
first_today = fetch_result_as_dict(cur)
# print("当天第一条记录（非离线）:", first_today)
# 获取当天最新一条记录（排除device_state等于‘离线’的记录）
with conn.cursor() as cur:
cur.execute("""
SELECT * FROM device_data
WHERE device_name = %s
AND time::date = CURRENT_DATE
AND device_state != '离线'
ORDER BY time DESC
LIMIT 1;
""", (item,))
last_today = fetch_result_as_dict(cur)
# print("当天最新一条记录（非离线）:", last_today)
# 计算当天运行时长
if first_today and last_today:
running_time = convert_to_seconds(last_today['run_time']) - convert_to_seconds(first_today['run_time'])
process_time = convert_to_seconds(last_today['process_time']) - convert_to_seconds(
first_today['process_time'])
day_total_running_time += abs(running_time)
day_total_process_time += abs(process_time)
# 获取当月第一条记录（排除device_state等于‘离线’的记录）
with conn.cursor() as cur:
cur.execute("""
SELECT * FROM device_data
WHERE device_name = %s
AND EXTRACT(YEAR FROM time) = EXTRACT(YEAR FROM CURRENT_DATE)
AND EXTRACT(MONTH FROM time) = EXTRACT(MONTH FROM CURRENT_DATE)
AND device_state != '离线'
ORDER BY time ASC
LIMIT 1;
""", (item,))
first_month = fetch_result_as_dict(cur)
# print("当月第一条记录（非离线）:", first_month)
# 获取当月最新一条记录（排除device_state等于‘离线’的记录）
with conn.cursor() as cur:
cur.execute("""
SELECT * FROM device_data
WHERE device_name = %s
AND EXTRACT(YEAR FROM time) = EXTRACT(YEAR FROM CURRENT_DATE)
AND EXTRACT(MONTH FROM time) = EXTRACT(MONTH FROM CURRENT_DATE)
AND device_state != '离线'
ORDER BY time DESC
LIMIT 1;
""", (item,))
last_month = fetch_result_as_dict(cur)
# print("当月最新一条记录（非离线）:", last_month)
# 计算当月运行时长
if first_month and last_month:
month_running_time = convert_to_seconds(last_month['run_time']) - convert_to_seconds(
first_month['run_time'])
month_process_time = convert_to_seconds(last_month['process_time']) - convert_to_seconds(
first_month['process_time'])
month_total_running_time += abs(month_running_time)
month_total_process_time += abs(month_process_time)
# 获取有记录以来的第一条记录（排除device_state等于‘离线’的记录）
with conn.cursor() as cur:
cur.execute("""
SELECT * FROM device_data
WHERE device_name = %s
AND device_state != '离线'
ORDER BY time ASC
LIMIT 1;
""", (item,))
first_all_time = fetch_result_as_dict(cur)
# print("有记录以来的第一条记录（非离线）:", first_all_time)
# 获取有记录以来的最新一条记录（排除device_state等于‘离线’的记录）
with conn.cursor() as cur:
cur.execute("""
SELECT * FROM device_data
WHERE device_name = %s
AND device_state != '离线'
ORDER BY time DESC
LIMIT 1;
""", (item,))
last_all_time = fetch_result_as_dict(cur)
# print("有记录以来的最新一条记录（非离线）:", last_all_time)
# 计算有记录以来的运行时长
if first_all_time and last_all_time:
all_time_running_time = convert_to_seconds(last_all_time['run_time']) - convert_to_seconds(
first_all_time['run_time'])
all_time_process_time = convert_to_seconds(last_all_time['process_time']) - convert_to_seconds(
first_all_time['process_time'])
all_time_total_running_time += abs(all_time_running_time)
all_time_total_process_time += abs(all_time_process_time)
# 计算当天工作效率
if day_total_running_time > day_total_process_time:
day_work_rate = day_total_process_time / day_total_running_time if day_total_running_time != 0 else 0
else:
day_work_rate = day_total_running_time / day_total_process_time if day_total_process_time != 0 else 0
print("当天工作效率: %s" % day_work_rate)
# 计算当月工作效率
if month_total_running_time > month_total_process_time:
month_work_rate = month_total_process_time / month_total_running_time if month_total_running_time != 0 else 0
else:
month_work_rate = month_total_running_time / month_total_process_time if month_total_process_time != 0 else 0
print("当月工作效率: %s" % month_work_rate)
# 计算有记录以来的工作效率
if all_time_total_running_time > all_time_total_process_time:
all_time_work_rate = all_time_total_process_time / all_time_total_running_time if all_time_total_running_time != 0 else 0
else:
all_time_work_rate = all_time_total_running_time / all_time_total_process_time if all_time_total_process_time != 0 else 0
print("有记录以来的工作效率: %s" % all_time_work_rate)
conn.close()
# 返回数据
res['data']['day_work_rate'] = day_work_rate
res['data']['month_work_rate'] = month_work_rate
res['data']['all_time_work_rate'] = all_time_work_rate
return json.dumps(res)
# 设备运行时长
@http.route('/api/RunningTimeDetail', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
def RunningTimeDetail(self, **kw):
"""
获取
"""
res = {'status': 1, 'message': '成功', 'data': {}}
# 连接数据库
conn = psycopg2.connect(**db_config)
# 获取请求的机床数据
machine_list = ast.literal_eval(kw['machine_list'])
def fetch_result_as_dict(cursor):
"""辅助函数：将查询结果转为字典"""
columns = [desc[0] for desc in cursor.description]
return dict(zip(columns, cursor.fetchone())) if cursor.rowcount != 0 else None
for item in machine_list:
with conn.cursor() as cur:
cur.execute("""
SELECT * FROM device_data
WHERE device_name = %s
AND device_state != '离线'
ORDER BY time DESC
LIMIT 1;
""", (item,))
last_all_time = fetch_result_as_dict(cur)
# 返回数据
res['data'][item] = {
'wait_time': last_all_time['run_time'] if last_all_time['run_time'] is not None else 0,
'cut_time': last_all_time['process_time'] if last_all_time['process_time'] is not None else 0,
'power_on_time': last_all_time['power_on_time'] if last_all_time['power_on_time'] is not None else 0
}
conn.close()
return json.dumps(res)

4
sf_machine_connect/models/res_config_setting.py
View File

@@ -16,6 +16,7 @@ class ResBFMConfigSettings(models.TransientModel):
# ("https://bfm.jikimo.com", "正式环境(https://bfm.jikimo.com)")], string='bfm环境', store=True) # ("https://bfm.jikimo.com", "正式环境(https://bfm.jikimo.com)")], string='bfm环境', store=True)
bfm_url_new = fields.Char('业务平台环境路径', placeholder='请输入当前对应的业务平台环境路径') bfm_url_new = fields.Char('业务平台环境路径', placeholder='请输入当前对应的业务平台环境路径')
get_check_file_path = fields.Char('获取检查文件路径', default='')
@api.model @api.model
def get_values(self): def get_values(self):
@@ -26,9 +27,11 @@ class ResBFMConfigSettings(models.TransientModel):
values = super(ResBFMConfigSettings, self).get_values() values = super(ResBFMConfigSettings, self).get_values()
config = self.env['ir.config_parameter'].sudo() config = self.env['ir.config_parameter'].sudo()
bfm_url_new = config.get_param('bfm_url_new', default='') bfm_url_new = config.get_param('bfm_url_new', default='')
get_check_file_path = config.get_param('get_check_file_path', default='')
values.update( values.update(
bfm_url_new=bfm_url_new, bfm_url_new=bfm_url_new,
get_check_file_path=get_check_file_path
) )
return values return values
@@ -36,3 +39,4 @@ class ResBFMConfigSettings(models.TransientModel):
super(ResBFMConfigSettings, self).set_values() super(ResBFMConfigSettings, self).set_values()
ir_config = self.env['ir.config_parameter'].sudo() ir_config = self.env['ir.config_parameter'].sudo()
ir_config.set_param("bfm_url_new", self.bfm_url_new or "") ir_config.set_param("bfm_url_new", self.bfm_url_new or "")
ir_config.set_param("get_check_file_path", self.get_check_file_path or "")

15
sf_machine_connect/views/res_config_settings_views.xml
View File

@@ -18,6 +18,21 @@
<field name="bfm_url_new" string="业务平台访问地址"/> <field name="bfm_url_new" string="业务平台访问地址"/>
</div> </div>
</div> </div>
<!-- </div> -->
</div>
</div>
</div>
<div>
<h2>获取检测报告服务配置</h2>
<div class="row mt16 o_settings_container" id="jd_api">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane"/>
<div class="o_setting_right_pane">
<div class="text-muted">
<label for="get_check_file_path" />
<field name="get_check_file_path" string="检测报告服务地址"/>
</div>
</div>
<!-- </div> --> <!-- </div> -->
</div> </div>
</div> </div>

1
sf_manufacturing/__manifest__.py
View File

@@ -45,7 +45,6 @@
'sf_manufacturing/static/src/scss/kanban_change.scss', 'sf_manufacturing/static/src/scss/kanban_change.scss',
'sf_manufacturing/static/src/xml/button_show_on_tree.xml', 'sf_manufacturing/static/src/xml/button_show_on_tree.xml',
'sf_manufacturing/static/src/js/workpiece_delivery_wizard_confirm.js', 'sf_manufacturing/static/src/js/workpiece_delivery_wizard_confirm.js',
'sf_manufacturing/static/src/js/custom_barcode_handlers.js',
] ]
}, },

8
sf_manufacturing/models/agv_scheduling.py
View File

@@ -1,10 +1,10 @@
import logging
import requests import requests
from odoo import models, fields, api, _ from odoo import models, fields, api, _
from odoo.exceptions import UserError from odoo.exceptions import UserError
import logging
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
@@ -54,7 +54,7 @@ class AgvScheduling(models.Model):
def web_search_read(self, domain=None, fields=None, offset=0, limit=None, order=None, count_limit=None): def web_search_read(self, domain=None, fields=None, offset=0, limit=None, order=None, count_limit=None):
domain = domain or [] domain = domain or []
new_domain = [] new_domain = []
for index, item in enumerate(domain): for item in domain:
if isinstance(item, list): if isinstance(item, list):
if item[0] == 'delivery_workpieces': if item[0] == 'delivery_workpieces':
new_domain.append('&') new_domain.append('&')
@@ -63,7 +63,7 @@ class AgvScheduling(models.Model):
continue continue
new_domain.append(item) new_domain.append(item)
return super(AgvScheduling, self).web_search_read(new_domain, fields, limit=limit, offset=offset) return super(AgvScheduling, self).web_search_read(new_domain, fields, offset, limit, order, count_limit)
@api.depends('task_completion_time', 'task_delivery_time') @api.depends('task_completion_time', 'task_delivery_time')
def _compute_task_duration(self): def _compute_task_duration(self):

6
sf_manufacturing/models/mrp_production.py
View File

@@ -318,8 +318,10 @@ class MrpProduction(models.Model):
# cnc程序获取 # cnc程序获取
def fetchCNC(self, production_names): def fetchCNC(self, production_names):
cnc = self.env['mrp.production'].search([('id', '=', self.id)]) cnc = self.env['mrp.production'].search([('id', '=', self.id)])
quick_order = self.env['quick.easy.order'].search( quick_order = False
[('name', '=', cnc.product_id.default_code.rsplit('-', 1)[0])]) if cnc.product_id.default_code:
quick_order = self.env['quick.easy.order'].search(
[('name', '=', cnc.product_id.default_code.rsplit('-', 1)[0])])
programme_way = False programme_way = False
if cnc.manual_quotation is True: if cnc.manual_quotation is True:
programme_way = 'manual operation' programme_way = 'manual operation'

37
sf_manufacturing/models/mrp_workorder.py
View File

@@ -222,7 +222,7 @@ class ResMrpWorkOrder(models.Model):
material_width = fields.Float(string='宽') material_width = fields.Float(string='宽')
material_height = fields.Float(string='高') material_height = fields.Float(string='高')
# 零件图号 # 零件图号
part_number = fields.Char(string='零件图号') part_number = fields.Char(related='production_id.part_number', string='零件图号')
# 工序状态 # 工序状态
process_state = fields.Selection([ process_state = fields.Selection([
('待装夹', '待装夹'), ('待装夹', '待装夹'),
@@ -414,12 +414,10 @@ class ResMrpWorkOrder(models.Model):
# 获取三次元检测点数据 # 获取三次元检测点数据
def get_three_check_datas(self): def get_three_check_datas(self):
factory_nick_name = 'XT'
ftp_resconfig = self.env['res.config.settings'].get_values() ftp_resconfig = self.env['res.config.settings'].get_values()
ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']), ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']),
ftp_resconfig['ftp_user'], ftp_resconfig['ftp_user'],
ftp_resconfig['ftp_password']) ftp_resconfig['ftp_password'])
# ftp.connect()
local_dir_path = '/ftp/before' local_dir_path = '/ftp/before'
os.makedirs(local_dir_path, exist_ok=True) os.makedirs(local_dir_path, exist_ok=True)
@@ -428,6 +426,17 @@ class ResMrpWorkOrder(models.Model):
logging.info('local_file_path:%s' % local_file_path) logging.info('local_file_path:%s' % local_file_path)
remote_path = '/home/ftp/ftp_root/ThreeTest/XT/Before/' + local_filename remote_path = '/home/ftp/ftp_root/ThreeTest/XT/Before/' + local_filename
logging.info('remote_path:%s' % remote_path) logging.info('remote_path:%s' % remote_path)
if not ftp.file_exists(remote_path):
paload_data = {
"filename": local_filename
}
if not ftp_resconfig['get_check_file_path']:
raise UserError('请先配置获取检测报告地址')
url = ftp_resconfig['get_check_file_path'] + '/get/check/report'
response = requests.post(url, json=paload_data)
logging.info('response:%s' % response.json())
if response.json().get('detail'):
raise UserError(response.json().get('detail'))
if not ftp.file_exists(remote_path): if not ftp.file_exists(remote_path):
raise UserError(f"文件不存在: {remote_path}") raise UserError(f"文件不存在: {remote_path}")
@@ -540,6 +549,7 @@ class ResMrpWorkOrder(models.Model):
raise UserError('PT10点未测或数据错误') raise UserError('PT10点未测或数据错误')
self.data_state = True self.data_state = True
self.getcenter()
return True return True
@@ -1015,16 +1025,20 @@ class ResMrpWorkOrder(models.Model):
# 查询工序最小的非完工、非返工的装夹预调工单 # 查询工序最小的非完工、非返工的装夹预调工单
work_id = self.search( work_id = self.search(
[('production_id', '=', workorder.production_id.id), [('production_id', '=', workorder.production_id.id),
('routing_type', '=', '装夹预调'),
('state', 'not in', ['rework', 'done', 'cancel'])], ('state', 'not in', ['rework', 'done', 'cancel'])],
limit=1, limit=1,
order="sequence") order="sequence")
if workorder == work_id: if work_id.routing_type == '装夹预调':
if workorder.production_id.reservation_state == 'assigned': if workorder == work_id:
workorder.state = 'ready' if workorder.production_id.reservation_state == 'assigned':
elif workorder.production_id.reservation_state != 'assigned': workorder.state = 'ready'
workorder.state = 'waiting' elif workorder.production_id.reservation_state != 'assigned':
continue workorder.state = 'waiting'
continue
elif (workorder.name == '装夹预调' and
workorder.state not in ['rework', 'done', 'cancel']):
if workorder.state != 'pending':
workorder.state = 'pending'
if workorder.production_id.tool_state in ['1', '2'] and workorder.state == 'ready': if workorder.production_id.tool_state in ['1', '2'] and workorder.state == 'ready':
workorder.state = 'waiting' workorder.state = 'waiting'
continue continue
@@ -1169,7 +1183,7 @@ class ResMrpWorkOrder(models.Model):
if not record.rfid_code and record.is_rework is False: if not record.rfid_code and record.is_rework is False:
raise UserError("请扫RFID码进行绑定") raise UserError("请扫RFID码进行绑定")
if record.is_rework is False: if record.is_rework is False:
if not record.material_center_point and record.X_deviation_angle > 0: if not record.material_center_point or record.X_deviation_angle <= 0:
raise UserError("坯料中心点为空或X偏差角度小于等于0") raise UserError("坯料中心点为空或X偏差角度小于等于0")
record.process_state = '待加工' record.process_state = '待加工'
# record.write({'process_state': '待加工'}) # record.write({'process_state': '待加工'})
@@ -1328,6 +1342,7 @@ class ResMrpWorkOrder(models.Model):
arch = etree.fromstring(tree_view['arch']) arch = etree.fromstring(tree_view['arch'])
# 查找 tree 标签 # 查找 tree 标签
tree_element = arch.xpath("//tree")[0] tree_element = arch.xpath("//tree")[0]
tree_element.set('js_class', 'remove_focus_list_view')
# 查找或创建 header 标签 # 查找或创建 header 标签
header_element = tree_element.find('header') header_element = tree_element.find('header')

6
sf_manufacturing/models/stock.py
View File

@@ -267,6 +267,11 @@ class StockRule(models.Model):
workorder_duration += workorder.duration_expected workorder_duration += workorder.duration_expected
sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)]) sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)])
# 根据销售订单号查询快速订单
quick_easy_order = self.env['quick.easy.order'].sudo().search([('sale_order_id', '=', sale_order.id)])
if quick_easy_order:
production.write({'part_number': quick_easy_order.part_drawing_number,
'part_drawing': quick_easy_order.machining_drawings})
if sale_order: if sale_order:
# sale_order.write({'schedule_status': 'to schedule'}) # sale_order.write({'schedule_status': 'to schedule'})
self.env['sf.production.plan'].sudo().with_company(company_id).create({ self.env['sf.production.plan'].sudo().with_company(company_id).create({
@@ -288,6 +293,7 @@ class StockRule(models.Model):
# 为同一个product_id创建一个生产订单名称列表 # 为同一个product_id创建一个生产订单名称列表
product_id_to_production_names[product_id] = [production.name for production in all_production] product_id_to_production_names[product_id] = [production.name for production in all_production]
for production_item in productions: for production_item in productions:
production_programming = self.env['mrp.production'].search( production_programming = self.env['mrp.production'].search(
[('product_id.id', '=', production_item.product_id.id), [('product_id.id', '=', production_item.product_id.id),
('origin', '=', production_item.origin)], ('origin', '=', production_item.origin)],

2
sf_manufacturing/views/mrp_workcenter_views.xml
View File

@@ -43,7 +43,7 @@
<label for="default_capacity"/> <label for="default_capacity"/>
<div class="o_row"> <div class="o_row">
<field name="default_capacity" string="产线日产能"/> <field name="default_capacity" string="产线日产能"/>
台 件
</div> </div>
</xpath> </xpath>
<xpath expr="//field[@name='default_capacity'][last()]" position="before"> <xpath expr="//field[@name='default_capacity'][last()]" position="before">

5
sf_manufacturing/views/mrp_workorder_view.xml
View File

@@ -513,6 +513,11 @@
</xpath> </xpath>
<xpath expr="//form//header" position="inside">
<button type="object" class="oe_highlight" name="get_three_check_datas" string="获取数据"
attrs='{"invisible": [("state","!=","progress")]}'/>
</xpath>
<xpath expr="//page[1]" position="before"> <xpath expr="//page[1]" position="before">
<field name="results" invisible="1"/> <field name="results" invisible="1"/>

2
sf_manufacturing/wizard/workpiece_delivery_views.xml
View File

@@ -14,7 +14,7 @@
<group col="1"> <group col="1">
<field name="production_ids" readonly="1" widget="many2many_tags" string="制造订单号"/> <field name="production_ids" readonly="1" widget="many2many_tags" string="制造订单号"/>
<field name="delivery_type" readonly="1"/> <field name="delivery_type" readonly="1"/>
<field name="feeder_station_start_id" options="{'no_create': True}" required="1"/> <field name="feeder_station_start_id" string="当前接驳站" options="{'no_create': True}" required="1"/>
<field name="workcenter_id" options="{'no_create': True}"/> <field name="workcenter_id" options="{'no_create': True}"/>
</group> </group>
<footer> <footer>

54
sf_plan/models/custom_plan.py
View File

@@ -18,7 +18,8 @@ class sf_production_plan(models.Model):
('draft', '待排程'), ('draft', '待排程'),
('done', '已排程'), ('done', '已排程'),
('processing', '加工中'), ('processing', '加工中'),
('finished', '已完成') ('finished', '已完成'),
('cancel', '已取消')
], string='状态', tracking=True) ], string='状态', tracking=True)
state_order = fields.Integer(compute='_compute_state_order', store=True) state_order = fields.Integer(compute='_compute_state_order', store=True)
@@ -37,7 +38,7 @@ class sf_production_plan(models.Model):
_order = 'state_order asc, write_date desc' _order = 'state_order asc, write_date desc'
name = fields.Char(string='制造订单') name = fields.Char(string='制造订单')
# active = fields.Boolean(string='已归档', default=True) active = fields.Boolean(string='已归档', default=True)
# selected = fields.Boolean(default=False) # selected = fields.Boolean(default=False)
# order_number = fields.Char(string='订单号') # order_number = fields.Char(string='订单号')
order_deadline = fields.Datetime(string='订单交期') order_deadline = fields.Datetime(string='订单交期')
@@ -69,6 +70,27 @@ class sf_production_plan(models.Model):
sequence = fields.Integer(string='序号', copy=False, readonly=True, index=True) sequence = fields.Integer(string='序号', copy=False, readonly=True, index=True)
current_operation_name = fields.Char(string='当前工序名称', size=64, default='生产计划') current_operation_name = fields.Char(string='当前工序名称', size=64, default='生产计划')
@api.onchange('date_planned_start')
def date_planned_start_onchange(self):
if self.date_planned_start:
self.date_planned_finished = self.date_planned_start + timedelta(hours=1)
#处理计划状态非代排程，计划结束时间为空的数据处理
def deal_no_date_planned_finished(self):
plans = self.env['sf.production.plan'].search(
[('date_planned_finished', '=', False), ('state', 'in', ['processing', 'done', 'finished'])])
for item in plans:
if item.date_planned_start:
item.date_planned_finished = item.date_planned_start + timedelta(hours=1)
if not item.order_deadline and item.date_planned_start:
item.order_deadline = item.date_planned_start + timedelta(days=7)
@api.model
def search_read(self, domain=None, fields=None, offset=0, limit=None, order=None):
info = super(sf_production_plan, self).search_read(domain, fields, offset, limit, order)
return info
# 计算实际加工时长 # 计算实际加工时长
@api.depends('actual_start_time', 'actual_end_time') @api.depends('actual_start_time', 'actual_end_time')
def _compute_actual_process_time(self): def _compute_actual_process_time(self):
@@ -191,7 +213,7 @@ class sf_production_plan(models.Model):
return num return num
def do_production_schedule(self, date_planned_start): def do_production_schedule(self):
""" """
排程方法 排程方法
""" """
@@ -199,8 +221,7 @@ class sf_production_plan(models.Model):
if not record.production_line_id: if not record.production_line_id:
raise ValidationError("未选择生产线") raise ValidationError("未选择生产线")
else: else:
is_schedule = self.deal_processing_schedule(record.date_planned_start)
is_schedule = self.deal_processing_schedule(date_planned_start)
if not is_schedule: if not is_schedule:
raise ValidationError("排程失败") raise ValidationError("排程失败")
workorder_id_list = record.production_id.workorder_ids.ids workorder_id_list = record.production_id.workorder_ids.ids
@@ -209,7 +230,6 @@ class sf_production_plan(models.Model):
for item in record.production_id.workorder_ids: for item in record.production_id.workorder_ids:
if item.name == 'CNC加工': if item.name == 'CNC加工':
item.date_planned_finished = datetime.now() + timedelta(days=100) item.date_planned_finished = datetime.now() + timedelta(days=100)
# item.date_planned_start = record.date_planned_start
item.date_planned_start = self.date_planned_start if self.date_planned_start else datetime.now() item.date_planned_start = self.date_planned_start if self.date_planned_start else datetime.now()
record.sudo().production_id.plan_start_processing_time = item.date_planned_start record.sudo().production_id.plan_start_processing_time = item.date_planned_start
item.date_planned_finished = item.date_planned_start + timedelta( item.date_planned_finished = item.date_planned_start + timedelta(
@@ -222,6 +242,8 @@ class sf_production_plan(models.Model):
record.date_planned_start, record.date_planned_finished = \ record.date_planned_start, record.date_planned_finished = \
item.date_planned_start, item.date_planned_finished item.date_planned_start, item.date_planned_finished
record.state = 'done' record.state = 'done'
record.date_planned_finished = record.date_planned_start + timedelta(
minutes=60) if not record.date_planned_finished else record.date_planned_finished
# record.production_id.schedule_state = '已排' # record.production_id.schedule_state = '已排'
record.sudo().production_id.schedule_state = '已排' record.sudo().production_id.schedule_state = '已排'
record.sudo().production_id.process_state = '待装夹' record.sudo().production_id.process_state = '待装夹'
@@ -385,3 +407,23 @@ class machine_work_schedule(models.Model):
_description = '机台作业计划' _description = '机台作业计划'
name = fields.Char(string='机台名') name = fields.Char(string='机台名')
class MrpProductionInheritForPlan(models.Model):
_inherit = 'mrp.production'
def button_cancel(self):
# 调用父类的取消操作
res = super(MrpProductionInheritForPlan, self).button_cancel()
# 更新 sf.production.plan 模型的 state 为 'cancel'
self.env['sf.production.plan'].search([('production_id', '=', self.id)]).write({'state': 'cancel'})
return res
def toggle_active(self):
# 调用父类方法切换 active 状态
res = super(MrpProductionInheritForPlan, self).toggle_active()
self.env['sf.production.plan'].search(
[('production_id', '=', self.id), '|', ('active', '=', False), ('active', '=', True)]).write(
{'active': self.active})
return res

4
sf_plan/views/view.xml
View File

@@ -88,8 +88,8 @@
<group string="加工信息"> <group string="加工信息">
<field name="date_planned_start" placeholder="如果不选择计划开始时间，会取当前时间来做排程"/> <field name="date_planned_start" placeholder="如果不选择计划开始时间，会取当前时间来做排程" required="1"/>
<field name="date_planned_finished"/> <field name="date_planned_finished" required="1"/>
<field name="actual_process_time"/> <field name="actual_process_time"/>
<field name="actual_start_time"/> <field name="actual_start_time"/>
<field name="actual_end_time"/> <field name="actual_end_time"/>

10
sf_plan/wizard/action_plan_some.py
View File

@@ -6,6 +6,7 @@ from datetime import datetime
from odoo import fields, models from odoo import fields, models
# from odoo.exceptions import ValidationError # from odoo.exceptions import ValidationError
from odoo.exceptions import UserError from odoo.exceptions import UserError
from datetime import datetime, timedelta
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
@@ -14,10 +15,15 @@ class Action_Plan_All_Wizard(models.TransientModel):
_name = 'sf.action.plan.all.wizard' _name = 'sf.action.plan.all.wizard'
_description = u'排程向导' _description = u'排程向导'
def _get_date_planned_start(self):
planned_start_date = datetime.now() + timedelta(minutes=10)
logging.info('计划开始时间: %s', planned_start_date)
return planned_start_date
# 选择生产线 # 选择生产线
production_line_id = fields.Many2one('sf.production.line', string=u'生产线', required=True) production_line_id = fields.Many2one('sf.production.line', string=u'生产线', required=True)
date_planned_start = fields.Datetime(string='计划开始时间', index=True, copy=False, date_planned_start = fields.Datetime(string='计划开始时间', index=True, copy=False,
default=fields.Datetime.now) default=_get_date_planned_start)
# 接收传递过来的计划ID # 接收传递过来的计划ID
plan_ids = fields.Many2many('sf.production.plan', string=u'计划ID') plan_ids = fields.Many2many('sf.production.plan', string=u'计划ID')
@@ -36,7 +42,7 @@ class Action_Plan_All_Wizard(models.TransientModel):
plan_obj = self.env['sf.production.plan'].browse(plan.id) plan_obj = self.env['sf.production.plan'].browse(plan.id)
plan_obj.production_line_id = self.production_line_id.id plan_obj.production_line_id = self.production_line_id.id
plan.date_planned_start = self.date_planned_start plan.date_planned_start = self.date_planned_start
plan_obj.do_production_schedule(self.date_planned_start) plan_obj.do_production_schedule()
# plan_obj.state = 'done' # plan_obj.state = 'done'
print('处理计划:', plan.id, '完成') print('处理计划:', plan.id, '完成')

13
sf_sale/models/quick_easy_order_old.py
View File

@@ -58,6 +58,15 @@ class QuickEasyOrder(models.Model):
part_drawing_number = fields.Char('零件图号') part_drawing_number = fields.Char('零件图号')
machining_drawings = fields.Binary('2D加工图纸') machining_drawings = fields.Binary('2D加工图纸')
machining_drawings_name = fields.Char('2D加工图纸名')
@api.onchange('machining_drawings_name')
def _onchange_machining_drawings_name(self):
for item in self:
if item.machining_drawings_name:
if not item.machining_drawings_name.lower().endswith(
'.pdf'):
raise ValidationError('文件格式上传有误，请检查文件后缀(不区分大小写)是否为pdf')
@api.onchange('parameter_ids') @api.onchange('parameter_ids')
def _compute_parameter_ids(self): def _compute_parameter_ids(self):
@@ -128,6 +137,10 @@ class QuickEasyOrder(models.Model):
if len(item.upload_model_file) > 1: if len(item.upload_model_file) > 1:
raise ValidationError('只允许上传一个文件') raise ValidationError('只允许上传一个文件')
if item.upload_model_file: if item.upload_model_file:
if not item.upload_model_file.name.lower().endswith(
'.step') and not item.upload_model_file.name.lower().endswith(
'.stp'):
raise ValidationError('文件格式上传有误，请检查文件后缀(不区分大小写)是否为step、stp')
file_attachment_id = item.upload_model_file[0] file_attachment_id = item.upload_model_file[0]
# 附件路径 # 附件路径
report_path = file_attachment_id._full_path(file_attachment_id.store_fname) report_path = file_attachment_id._full_path(file_attachment_id.store_fname)

5
sf_sale/views/purchase_order_view.xml
View File

@@ -184,5 +184,10 @@
</xpath> </xpath>
</field> </field>
</record> </record>
<record id="purchase.product_normal_action_puchased" model="ir.actions.act_window">
<field name="context">
{"search_default_categ_id":1,"search_default_filter_to_purchase":1, "purchase_product_template": 1}
</field>
</record>
</data> </data>
</odoo> </odoo>

3
sf_sale/views/quick_easy_order_view.xml
View File

@@ -80,7 +80,8 @@
<field name="unit_price"/> <field name="unit_price"/>
<field name="price" options="{'format': false}"/> <field name="price" options="{'format': false}"/>
<field name="part_drawing_number"/> <field name="part_drawing_number"/>
<field name="machining_drawings" widget="pdf_viewer"/> <field name="machining_drawings" filename="machining_drawings_name" widget="pdf_viewer"/>
<field name="machining_drawings_name" invisible="1"/>
<field name="sale_order_id" <field name="sale_order_id"
attrs='{"invisible": [("sale_order_id","=",False)],"readonly": [("sale_order_id","!=",False)]}'/> attrs='{"invisible": [("sale_order_id","=",False)],"readonly": [("sale_order_id","!=",False)]}'/>
</group> </group>

5
sf_sale/views/sale_order_view.xml
View File

@@ -225,5 +225,10 @@
</field> </field>
</field> </field>
</record> </record>
<record id="sale.product_template_action" model="ir.actions.act_window">
<field name="context">{"search_default_categ_id":1,
"search_default_filter_to_sell":1,"sale_multi_pricelist_product_template": 1}
</field>
</record>
</data> </data>
</odoo> </odoo>

3
sf_stock/__manifest__.py
View File

@@ -3,7 +3,7 @@
'name': "sf_stock", 'name': "sf_stock",
'summary': """ 'summary': """
处理代发货业务""", 处理仓库 -代发货业务""",
'description': """ 'description': """
Long description of module's purpose Long description of module's purpose
@@ -25,6 +25,7 @@
'data': [ 'data': [
# 'security/ir.model.access.csv', # 'security/ir.model.access.csv',
'views/stock_picking.xml', 'views/stock_picking.xml',
'views/stock_product_template.xml'
], ],
# only loaded in demonstration mode # only loaded in demonstration mode
'demo': [ 'demo': [

2
sf_stock/models/stock_picking.py
View File

@@ -13,8 +13,6 @@ _logger = logging.getLogger(__name__)
class StockPicking(models.Model): class StockPicking(models.Model):
_inherit = 'stock.picking' _inherit = 'stock.picking'
cancel_backorder_ids = fields.Boolean(default=False, string='是否取消后置单据')
# 重写验证，下发发货到bfm # 重写验证，下发发货到bfm
def button_validate(self): def button_validate(self):
info = super(StockPicking, self).button_validate() info = super(StockPicking, self).button_validate()

1
sf_stock/views/stock_picking.xml
View File

@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<data> <data>

11
sf_stock/views/stock_product_template.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<data>
<record id="stock.product_template_action_product" model="ir.actions.act_window">
<field name="context">
{"search_default_categ_id":1,"search_default_consumable": 1, 'default_detailed_type': 'product'}
</field>
</record>
</data>
</odoo>

3
sf_tool_management/controllers/controllers.py
View File

@@ -122,7 +122,8 @@ class Manufacturing_Connect(http.Controller):
tool_assembly.write({ tool_assembly.write({
'after_assembly_tool_loading_length': float(data_list[1] or "0"), # 高度(总长度) 'after_assembly_tool_loading_length': float(data_list[1] or "0"), # 高度(总长度)
'after_assembly_functional_tool_diameter': float(data_list[2] or "0") * 2, # 直径 'after_assembly_functional_tool_diameter': float(data_list[2] or "0") * 2, # 直径
'after_assembly_knife_tip_r_angle': float(data_list[3] or "0") # R角 'after_assembly_knife_tip_r_angle': float(data_list[3] or "0"), # R角
'bool_preset_parameter': True
}) })
except Exception as e: except Exception as e:
res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}

655
sf_tool_management/models/base.py
View File

@@ -349,25 +349,100 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
class FunctionalToolAssembly(models.Model): class FunctionalToolAssembly(models.Model):
_name = 'sf.functional.tool.assembly' _name = 'sf.functional.tool.assembly'
_inherit = ['mail.thread', 'sf.message.template'] _inherit = ['mail.thread', 'barcodes.barcode_events_mixin', 'sf.message.template']
_description = '功能刀具组装' _description = '功能刀具组装'
_order = 'assemble_status, use_tool_time asc' _order = 'tool_loading_time desc, use_tool_time asc'
def on_barcode_scanned(self, barcode):
"""
智能工厂组装单处扫码校验刀具物料
"""
for record in self:
tool_assembly_id = self.env['sf.functional.tool.assembly'].browse(self.ids)
lot_ids = self.env['stock.lot'].sudo().search([('rfid', '=', barcode)])
if lot_ids:
for lot_id in lot_ids:
if lot_id.tool_material_status != '可用':
raise ValidationError(f'Rfid为【{barcode}】的刀柄已被占用，请重新扫描！！')
if lot_id.product_id == record.handle_product_id:
record.handle_code_id = lot_id.id
tool_assembly_id.handle_code_id = lot_id.id
else:
raise ValidationError('刀柄选择错误，请重新确认！！！')
else:
location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', barcode)])
if location:
if location == record.integral_freight_barcode_id:
tool_assembly_id.integral_verify = True
record.integral_verify = True
elif location == record.blade_freight_barcode_id:
tool_assembly_id.blade_verify = True
record.blade_verify = True
elif location == record.bar_freight_barcode_id:
tool_assembly_id.bar_verify = True
record.bar_verify = True
elif location == record.pad_freight_barcode_id:
tool_assembly_id.pad_verify = True
record.pad_verify = True
elif location == record.chuck_freight_barcode_id:
tool_assembly_id.chuck_verify = True
record.chuck_verify = True
else:
raise ValidationError('刀具选择错误，请重新确认！')
else:
raise ValidationError(f'扫描为【{barcode}】的货位不存在，请重新扫描！')
@api.depends('functional_tool_name') @api.depends('functional_tool_name')
def _compute_name(self): def _compute_name(self):
for obj in self: for obj in self:
obj.name = obj.assembly_order_code obj.name = obj.assembly_order_code
code = fields.Char('功能刀具编码', readonly=True)
rfid = fields.Char('Rfid', 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') name = fields.Char(string='名称', readonly=True, compute='_compute_name')
assembly_order_code = fields.Char(string='组装单编码', readonly=True) assembly_order_code = fields.Char(string='组装单编码', readonly=True)
functional_tool_name_id = fields.Many2one('product.product', string='功能刀具', readonly=True) functional_tool_name_id = fields.Many2one('product.product', string='功能刀具', readonly=True)
functional_tool_name = fields.Char(string='功能刀具名称', readonly=True) functional_tool_name = fields.Char(string='功能刀具名称', readonly=True, required=True)
functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True, tool_inventory_id = fields.Many2one('sf.tool.inventory', string='功能刀具清单', store=True,
group_expand='_read_group_functional_tool_type_ids') 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.assemble_status != '01':
return True
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_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) functional_tool_diameter = fields.Float(string='功能刀具直径(mm)', readonly=True)
knife_tip_r_angle = fields.Float(string='刀尖R角(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) coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True)
@@ -375,16 +450,17 @@ class FunctionalToolAssembly(models.Model):
tool_loading_length = fields.Float(string='总长度(mm)', readonly=True) tool_loading_length = fields.Float(string='总长度(mm)', readonly=True)
functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True) functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True)
effective_length = fields.Float(string='有效长(mm)', readonly=True) effective_length = fields.Float(string='有效长(mm)', readonly=True)
loading_task_source = fields.Selection([('0', 'CAM装刀'), ('1', '机台换刀'), ('2', '按库存组装')], loading_task_source = fields.Selection(
string='装刀任务来源', readonly=True) [('0', 'CAM装刀'), ('1', '机台换刀'), ('2', '按库存组装'), ('3', '寿命到期组装')],
string='装刀任务来源', readonly=True)
use_tool_time = fields.Datetime(string='用刀时间', readonly=True) use_tool_time = fields.Datetime(string='用刀时间', readonly=True)
production_line_name_id = fields.Many2one('sf.production.line', string='申请产线', readonly=True) production_line_name_id = fields.Many2one('sf.production.line', string='申请产线', readonly=True)
machine_tool_name_id = fields.Many2one('maintenance.equipment', string='申请机台', readonly=True) machine_tool_name_id = fields.Many2one('maintenance.equipment', string='申请机台', readonly=True)
machine_tool_code = fields.Char(string='机台号', readonly=True) machine_tool_code = fields.Char(string='机台号', readonly=True)
applicant = fields.Char(string='申请人', readonly=True) applicant = fields.Char(string='申请人', readonly=True)
apply_time = fields.Datetime(string='申请时间', default=fields.Datetime.now(), readonly=True) apply_time = fields.Datetime(string='申请时间', default=fields.Datetime.now(), readonly=True)
assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装')], string='组装状态', default='0', assemble_status = fields.Selection([('0', '待组装'), ('01', '组装中'), ('1', '已组装'), ('3', '已取消')],
tracking=True, readonly=True) string='组装状态', default='0', tracking=True, readonly=True)
cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=True) cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=True)
whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=True) whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=True)
reason_for_applying = fields.Char(string='申请原因', readonly=True) reason_for_applying = fields.Char(string='申请原因', readonly=True)
@@ -392,7 +468,7 @@ class FunctionalToolAssembly(models.Model):
alarm_value = fields.Integer(string='报警值(min)', readonly=True) alarm_value = fields.Integer(string='报警值(min)', readonly=True)
used_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 @api.model
def _read_group_functional_tool_type_ids(self, categories, domain, order): def _read_group_functional_tool_type_ids(self, categories, domain, order):
@@ -402,8 +478,9 @@ class FunctionalToolAssembly(models.Model):
# 刀具物料信息 # 刀具物料信息
# ==============整体式刀具型号============= # ==============整体式刀具型号=============
integral_freight_barcode_id = fields.Many2one('sf.shelf.location', string='整体式刀具货位') integral_freight_barcode_id = fields.Many2one('sf.shelf.location', string='整体式刀具货位', readonly=True,
integral_lot_id = fields.Many2one('stock.lot', string='整体式刀具批次') domain="[('product_id.cutting_tool_material_id.name', '=', '整体式刀具'),('product_num', '>', 0)]")
integral_lot_id = fields.Many2one('stock.lot', string='整体式刀具批次', readonly=True)
integral_product_id = fields.Many2one('product.product', string='整体式刀具名称', integral_product_id = fields.Many2one('product.product', string='整体式刀具名称',
compute='_compute_integral_product_id', store=True) compute='_compute_integral_product_id', store=True)
cutting_tool_integral_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='整体式刀具型号', cutting_tool_integral_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='整体式刀具型号',
@@ -412,16 +489,20 @@ class FunctionalToolAssembly(models.Model):
related='integral_product_id.specification_id') related='integral_product_id.specification_id')
sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', string='整体式刀具品牌', sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', string='整体式刀具品牌',
related='integral_product_id.brand_id') related='integral_product_id.brand_id')
integral_verify = fields.Boolean('整体刀校验', default=False)
@api.depends('integral_lot_id') @api.depends('integral_lot_id')
def _compute_integral_product_id(self): def _compute_integral_product_id(self):
for item in self: for item in self:
if item.integral_lot_id: if item.integral_lot_id:
item.integral_product_id = item.integral_lot_id.product_id.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_freight_barcode_id = fields.Many2one('sf.shelf.location', string='刀片货位', readonly=True,
blade_lot_id = fields.Many2one('stock.lot', string='刀片批次') domain="[('product_id.cutting_tool_material_id.name', '=', '刀片'),('product_num', '>', 0)]")
blade_lot_id = fields.Many2one('stock.lot', string='刀片批次', readonly=True)
blade_product_id = fields.Many2one('product.product', string='刀片名称', compute='_compute_blade_product_id', blade_product_id = fields.Many2one('product.product', string='刀片名称', compute='_compute_blade_product_id',
store=True) store=True)
cutting_tool_blade_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀片型号', cutting_tool_blade_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀片型号',
@@ -429,16 +510,20 @@ class FunctionalToolAssembly(models.Model):
blade_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='刀片规格', blade_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='刀片规格',
related='blade_product_id.specification_id') related='blade_product_id.specification_id')
sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌', related='blade_product_id.brand_id') sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌', related='blade_product_id.brand_id')
blade_verify = fields.Boolean('刀片校验', default=False)
@api.depends('blade_lot_id') @api.depends('blade_lot_id')
def _compute_blade_product_id(self): def _compute_blade_product_id(self):
for item in self: for item in self:
if item.blade_lot_id: if item.blade_lot_id:
item.blade_product_id = item.blade_lot_id.product_id.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_freight_barcode_id = fields.Many2one('sf.shelf.location', string='刀杆货位', readonly=True,
bar_lot_id = fields.Many2one('stock.lot', string='刀杆批次') domain="[('product_id.cutting_tool_material_id.name', '=', '刀杆'),('product_num', '>', 0)]")
bar_lot_id = fields.Many2one('stock.lot', string='刀杆批次', readonly=True)
bar_product_id = fields.Many2one('product.product', string='刀杆名称', compute='_compute_bar_product_id', bar_product_id = fields.Many2one('product.product', string='刀杆名称', compute='_compute_bar_product_id',
store=True) store=True)
cutting_tool_cutterbar_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀杆型号', cutting_tool_cutterbar_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀杆型号',
@@ -446,16 +531,20 @@ class FunctionalToolAssembly(models.Model):
bar_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='刀杆规格', bar_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='刀杆规格',
related='bar_product_id.specification_id') related='bar_product_id.specification_id')
sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌', related='bar_product_id.brand_id') sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌', related='bar_product_id.brand_id')
bar_verify = fields.Boolean('刀杆校验', default=False)
@api.depends('bar_lot_id') @api.depends('bar_lot_id')
def _compute_bar_product_id(self): def _compute_bar_product_id(self):
for item in self: for item in self:
if item.bar_lot_id: if item.bar_lot_id:
item.bar_product_id = item.bar_lot_id.product_id.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_freight_barcode_id = fields.Many2one('sf.shelf.location', string='刀盘货位', readonly=True,
pad_lot_id = fields.Many2one('stock.lot', string='刀盘批次') domain="[('product_id.cutting_tool_material_id.name', '=', '刀盘'),('product_num', '>', 0)]")
pad_lot_id = fields.Many2one('stock.lot', string='刀盘批次', readonly=True)
pad_product_id = fields.Many2one('product.product', string='刀盘名称', compute='_compute_pad_product_id', pad_product_id = fields.Many2one('product.product', string='刀盘名称', compute='_compute_pad_product_id',
store=True) store=True)
cutting_tool_cutterpad_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀盘型号', cutting_tool_cutterpad_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀盘型号',
@@ -463,37 +552,42 @@ class FunctionalToolAssembly(models.Model):
pad_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='刀盘规格', pad_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='刀盘规格',
related='pad_product_id.specification_id') related='pad_product_id.specification_id')
sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', related='pad_product_id.brand_id') sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', related='pad_product_id.brand_id')
pad_verify = fields.Boolean('刀盘校验', default=False)
@api.depends('pad_lot_id') @api.depends('pad_lot_id')
def _compute_pad_product_id(self): def _compute_pad_product_id(self):
for item in self: for item in self:
if item.pad_lot_id: if item.pad_lot_id:
item.pad_product_id = item.pad_lot_id.product_id.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', '刀柄序列号', readonly=True,
handle_code_id = fields.Many2one('stock.lot', '刀柄序列号') domain="[('product_id', '=', handle_product_id)]")
handle_product_id = fields.Many2one('product.product', string='刀柄名称', compute='_compute_handle_product_id', handle_freight_rfid = fields.Char('刀柄Rfid', compute='_compute_handle_rfid', store=True)
store=True) handle_product_id = fields.Many2one('product.product', string='刀柄名称', readonly=True)
cutting_tool_cutterhandle_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀柄型号', cutting_tool_cutterhandle_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀柄型号',
related='handle_product_id.cutting_tool_model_id') related='handle_product_id.cutting_tool_model_id')
handle_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='刀柄规格', handle_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='刀柄规格',
related='handle_product_id.specification_id') related='handle_product_id.specification_id')
sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌', related='handle_product_id.brand_id') sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌', related='handle_product_id.brand_id')
handle_verify = fields.Boolean('刀柄校验', default=False)
@api.depends('handle_code_id') @api.depends('handle_code_id')
def _compute_handle_product_id(self): def _compute_handle_rfid(self):
for item in self: for item in self:
if item.handle_code_id: 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.handle_freight_rfid = item.handle_code_id.rfid
item.rfid = item.handle_freight_rfid
else: else:
item.handle_product_id = False
item.handle_freight_rfid = False item.handle_freight_rfid = False
item.rfid = False
# ==============夹头型号============== # ==============夹头型号==============
chuck_freight_barcode_id = fields.Many2one('sf.shelf.location', string='夹头货位') chuck_freight_barcode_id = fields.Many2one('sf.shelf.location', string='夹头货位', readonly=True,
chuck_lot_id = fields.Many2one('stock.lot', string='夹头批次') domain="[('product_id.cutting_tool_material_id.name', '=', '夹头'),('product_num', '>', 0)]")
chuck_lot_id = fields.Many2one('stock.lot', string='夹头批次', readonly=True)
chuck_product_id = fields.Many2one('product.product', string='夹头名称', compute='_compute_chuck_product_id', chuck_product_id = fields.Many2one('product.product', string='夹头名称', compute='_compute_chuck_product_id',
store=True) store=True)
cutting_tool_cutterhead_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='夹头型号', cutting_tool_cutterhead_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='夹头型号',
@@ -501,12 +595,15 @@ class FunctionalToolAssembly(models.Model):
chuck_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='夹头规格', chuck_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='夹头规格',
related='chuck_product_id.specification_id') related='chuck_product_id.specification_id')
sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', related='chuck_product_id.brand_id') sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', related='chuck_product_id.brand_id')
chuck_verify = fields.Boolean('夹头校验', default=False)
@api.depends('chuck_lot_id') @api.depends('chuck_lot_id')
def _compute_chuck_product_id(self): def _compute_chuck_product_id(self):
for item in self: for item in self:
if item.chuck_lot_id: if item.chuck_lot_id:
item.chuck_product_id = item.chuck_lot_id.product_id.id item.chuck_product_id = item.chuck_lot_id.product_id.id
else:
item.chuck_product_id = False
# ==================待删除字段================== # ==================待删除字段==================
integral_freight_barcode = fields.Char('整体式刀具货位') integral_freight_barcode = fields.Char('整体式刀具货位')
@@ -525,30 +622,39 @@ class FunctionalToolAssembly(models.Model):
handle_name = fields.Char('') handle_name = fields.Char('')
chuck_code_id = fields.Many2one('stock.lot', '夹头序列号') chuck_code_id = fields.Many2one('stock.lot', '夹头序列号')
chuck_name = fields.Char('') chuck_name = fields.Char('')
# ====================暂时无用字段=========================
after_assembly_used_value = fields.Integer(string='组装后已使用值(min)', readonly=True)
# ============================================== # ==============================================
# 组装功能刀具参数信息 # 组装功能刀具参数信息
start_preset_bool = fields.Boolean('开始预调', default=False) start_preset_bool = fields.Boolean('开始预调', default=False)
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True) barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', readonly=True) after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', store=True,
after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', compute='_compute_functional_tool_name')
string='组装后功能刀具类型', readonly=True) after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', store=True,
after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)', readonly=True, string='组装后功能刀具类型',
digits=(10, 3)) compute='_compute_inventory_num')
after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)', readonly=True, digits=(10, 3)) after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)', digits=(10, 3), store=True,
after_assembly_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='组装后新/旧', readonly=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',
store=True, compute='_compute_rota_tive')
cut_time = fields.Integer(string='已切削时间(min)', readonly=True) cut_time = fields.Integer(string='已切削时间(min)', readonly=True)
cut_length = fields.Float(string='已切削长度(mm)', readonly=True) cut_length = fields.Float(string='已切削长度(mm)', readonly=True)
cut_number = fields.Integer(string='已切削次数', readonly=True) cut_number = fields.Integer(string='已切削次数', readonly=True)
after_assembly_whether_standard_knife = fields.Boolean(string='组装后是否标准刀', default=True, readonly=True) after_assembly_whether_standard_knife = fields.Boolean(string='组装后是否标准刀', default=True, readonly=True)
after_assembly_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], after_assembly_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], store=True,
string='组装后粗/中/精', readonly=True) string='组装后粗/中/精', default='3',
after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)', readonly=True) compute='_compute_rota_tive')
after_assembly_alarm_value = fields.Integer(string='组装后报警值(min)', readonly=True) after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)', store=True,
after_assembly_used_value = fields.Integer(string='组装后已使用值(min)', readonly=True) compute='_compute_inventory_num')
after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)', readonly=True, digits=(10, 3)) after_assembly_alarm_value = fields.Integer(string='组装后报警值(min)')
after_assembly_handle_length = fields.Float(string='组装后刀柄长度(mm)', readonly=True, digits=(10, 3)) after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)', digits=(10, 3), store=True,
after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', readonly=True, digits=(10, 3)) 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_length')
after_assembly_effective_length = fields.Float(string='组装后有效长(mm)', readonly=True) after_assembly_effective_length = fields.Float(string='组装后有效长(mm)', readonly=True)
L_D_number = fields.Float(string='L/D值(mm)', readonly=True) L_D_number = fields.Float(string='L/D值(mm)', readonly=True)
hiding_length = fields.Float(string='避空长(mm)', readonly=True) hiding_length = fields.Float(string='避空长(mm)', readonly=True)
@@ -562,10 +668,74 @@ class FunctionalToolAssembly(models.Model):
sf_machine_table_tool_changing_apply_id = fields.Many2one('sf.machine.table.tool.changing.apply', '机床换刀申请', sf_machine_table_tool_changing_apply_id = fields.Many2one('sf.machine.table.tool.changing.apply', '机床换刀申请',
readonly=True) readonly=True)
sf_cam_work_order_program_knife_plan_id = fields.Many2one('sf.cam.work.order.program.knife.plan', sf_cam_work_order_program_knife_plan_id = fields.Many2one('sf.cam.work.order.program.knife.plan',
'CAM工单程序用刀计划', readonly=True, ) 'CAM工单程序用刀计划', readonly=True)
active = fields.Boolean(string='已归档', default=True) active = fields.Boolean(string='已归档', default=True)
code = fields.Char('功能刀具编码', compute='_compute_code')
@api.depends('after_assembly_tool_loading_length', 'after_assembly_handle_length')
def _compute_length(self):
for item in self:
if item.after_assembly_tool_loading_length > item.after_assembly_handle_length:
item.after_assembly_functional_tool_length = (
item.after_assembly_tool_loading_length - item.after_assembly_handle_length)
@api.depends('integral_freight_barcode_id', 'blade_freight_barcode_id')
def _compute_rota_tive(self):
for item in self:
rota_tive_boolean = False
if item.integral_freight_barcode_id:
# 整体刀
if item.integral_freight_barcode_id.rotative_Boolean:
rota_tive_boolean = True
elif item.blade_freight_barcode_id:
# 刀片
if item.blade_freight_barcode_id.rotative_Boolean:
rota_tive_boolean = True
if rota_tive_boolean:
item.after_assembly_coarse_middle_thin = '1'
item.after_assembly_new_former = '1'
else:
item.after_assembly_coarse_middle_thin = '3'
item.after_assembly_new_former = '0'
@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): def action_open_reference1(self):
self.ensure_one() self.ensure_one()
return { return {
@@ -575,41 +745,326 @@ class FunctionalToolAssembly(models.Model):
'res_id': self.id, 'res_id': self.id,
} }
def put_start_preset(self): def start_preset(self):
self.search([('start_preset_bool', '=', True)]).write({'start_preset_bool': False}) """
开始组装
"""
# 设置初始值
self.start_preset_bool = True
self.assemble_status = '01'
self.after_assembly_coarse_middle_thin = '3'
self.after_assembly_new_former = '0'
# 调用功能刀具名称对应的清单的BOM获取对应刀具物料信息
bom = self._get_inventory_bom(self.tool_inventory_id)
# 根据BOM自动配置物料的值
self._set_tool_material(bom)
logging.info('功能刀具开始组装初始化值成功！')
def _set_tool_material(self, bom):
"""根据BOM对刀具物料进行初始配置"""
options = bom.get('options')
# 配置刀柄信息
for handle_id in bom.get('handle_ids'):
if handle_id:
if not self.handle_product_id:
self.handle_product_id = handle_id.id
break
# 刀柄之外的物料配置
if options == '刀柄+整体式刀具':
# 配置整体式刀具
integra_lot_id = self._get_old_tool_material_lot(bom.get('integral_ids'))
integra_location_lot_id = self._get_shelf_location_lot(integra_lot_id)
self.integral_freight_barcode_id = integra_location_lot_id.shelf_location_id.id
self.integral_lot_id = integra_location_lot_id.lot_id.id
else:
# 配置刀片
blade_lot_id = self._get_old_tool_material_lot(bom.get('blade_ids'))
blade_location_lot_id = self._get_shelf_location_lot(blade_lot_id)
self.blade_freight_barcode_id = blade_location_lot_id.shelf_location_id.id
self.blade_lot_id = blade_location_lot_id.lot_id.id
if options == '刀柄+刀杆+刀片':
# 配置刀杆
bar_lot_id = self._get_old_tool_material_lot(bom.get('bar_ids'))
bar_location_lot_id = self._get_shelf_location_lot(bar_lot_id)
self.bar_freight_barcode_id = bar_location_lot_id.shelf_location_id.id
self.bar_lot_id = bar_location_lot_id.lot_id.id
elif options == '刀柄+刀盘+刀片':
# 配置刀盘
pad_lot_id = self._get_old_tool_material_lot(bom.get('pad_ids'))
pad_location_lot_id = self._get_shelf_location_lot(pad_lot_id)
self.pad_freight_barcode_id = pad_location_lot_id.shelf_location_id.id
self.pad_lot_id = pad_location_lot_id.lot_id.id
def _get_old_tool_material_lot(self, material_ids):
""" 根据先进先出原则选择物料批次 """
location_id = self.env['stock.location'].search([('name', '=', '刀具房')])
stock_quant = self.env['stock.quant'].sudo().search(
[('location_id', '=', location_id.id), ('product_id', 'in', material_ids.ids), ('quantity', '>', '0')],
order='lot_id', limit=1)
if stock_quant:
return stock_quant.lot_id
else:
raise ValidationError(f'【{material_ids[0].cutting_tool_material_id.name}】物料库存不足，请先进行盘点或采购')
def _get_shelf_location_lot(self, lot_id):
"""根据所给的刀具物料批次号，返回一个刀具物料货位、批次信息"""
location_lots = self.env['sf.shelf.location.lot'].sudo().search([('lot_id', '=', lot_id.id)])
if not location_lots:
raise ValidationError(f'没有查询到批次为【{lot_id.name}】物料的货位信息！')
else:
return location_lots[0]
def _get_inventory_bom(self, inventory_id):
"""获取BOM的刀具物料产品信息"""
product_ids = inventory_id.jikimo_bom_ids.product_ids # BOM配置的物料产品
options = inventory_id.jikimo_bom_ids.options # BOM产品组装类型
if not product_ids or not options:
raise ValidationError('功能刀具清单的BOM未进行配置，请先配置BOM信息！')
handle_ids = product_ids.filtered(lambda a: a.cutting_tool_material_id.name == '刀柄')
integral_ids = product_ids.filtered(lambda a: a.cutting_tool_material_id.name == '整体式刀具')
blade_ids = product_ids.filtered(lambda a: a.cutting_tool_material_id.name == '刀片')
bar_ids = product_ids.filtered(lambda a: a.cutting_tool_material_id.name == '刀杆')
pad_ids = product_ids.filtered(lambda a: a.cutting_tool_material_id.name == '刀盘')
if not handle_ids:
raise ValidationError('功能刀具清单的BOM未配置[刀柄]信息，请先配置BOM再开始组装！')
if options == '刀柄+整体式刀具':
if not integral_ids:
raise ValidationError('功能刀具清单的BOM未配置[刀柄]信息，请先配置BOM再开始组装！')
return {'options': options, 'handle_ids': handle_ids, 'integral_ids': integral_ids}
elif options == '刀柄+刀杆+刀片':
if not blade_ids:
raise ValidationError('功能刀具清单的BOM未配置[刀片]信息，请先配置BOM再开始组装！')
if not bar_ids:
raise ValidationError('功能刀具清单的BOM未配置[刀杆]信息，请先配置BOM再开始组装！')
return {'options': options, 'handle_ids': handle_ids, 'blade_ids': blade_ids, 'bar_ids': bar_ids}
elif options == '刀柄+刀盘+刀片':
if not blade_ids:
raise ValidationError('功能刀具清单的BOM未配置[刀片]信息，请先配置BOM再开始组装！')
if not pad_ids:
raise ValidationError('功能刀具清单的BOM未配置[刀盘]信息，请先配置BOM再开始组装！')
return {'options': options, 'handle_ids': handle_ids, 'blade_ids': blade_ids, 'pad_ids': pad_ids}
else:
raise ValidationError(f'功能刀具清单BOM的组装方式错误：【{options}】')
def set_tool_lot(self):
# 获取BOM的刀具物料产品信息
tool_data = self._get_inventory_bom(self.tool_inventory_id)
# 获取刀具类型
tool_type = self.env.context.get('tool_type')
if tool_type == '刀柄':
tool_material_ids = tool_data.get('handle_ids')
tool_material_tree_id = self.env.ref('sf_tool_management.view_tool_product_tree')
elif tool_type == '整体式刀具':
tool_material_ids = self._get_all_material_location_lot(tool_data.get('integral_ids'))
tool_material_tree_id = self.env.ref('sf_tool_management.view_shelf_location_lot_tree_1')
elif tool_type == '刀片':
tool_material_ids = self._get_all_material_location_lot(tool_data.get('blade_ids'))
tool_material_tree_id = self.env.ref('sf_tool_management.view_shelf_location_lot_tree_2')
elif tool_type == '刀杆':
tool_material_ids = self._get_all_material_location_lot(tool_data.get('bar_ids'))
tool_material_tree_id = self.env.ref('sf_tool_management.view_shelf_location_lot_tree_3')
else:
tool_material_ids = self._get_all_material_location_lot(tool_data.get('pad_ids'))
tool_material_tree_id = self.env.ref('sf_tool_management.view_shelf_location_lot_tree_4')
if tool_type == '刀柄':
return {
"type": "ir.actions.act_window",
"res_model": "product.product",
"views": [[tool_material_tree_id.id, "tree"],
[self.env.ref('sf_tool_management.view_tool_product_search').id, "search"]],
"target": "new",
"domain": [('id', 'in', tool_material_ids.ids)],
"context": {'tool_id': self.id}
}
elif tool_type in ['整体式刀具', '刀片', '刀杆', '刀盘']:
return {
"type": "ir.actions.act_window",
"res_model": "sf.shelf.location.lot",
"views": [[tool_material_tree_id.id, "tree"]],
"target": "new",
"domain": [('id', 'in', tool_material_ids.ids)],
"context": {'tool_id': self.id}
}
def _get_all_material_location_lot(self, material_ids):
""" 获取所有满足条件 """
location_id = self.env['stock.location'].search([('name', '=', '刀具房')])
stock_quant_ids = self.env['stock.quant'].sudo().search(
[('location_id', '=', location_id.id), ('product_id', 'in', material_ids.ids if material_ids else []),
('quantity', '>', '0')])
lot_ids = []
for stock_quant_id in stock_quant_ids:
lot_ids.append(stock_quant_id.lot_id.id)
location_lots = self.env['sf.shelf.location.lot'].sudo().search([('lot_id', 'in', lot_ids)])
return location_lots
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({ self.write({
'after_assembly_tool_loading_length': 0, 'assemble_status': '1',
'after_assembly_functional_tool_diameter': 0, 'start_preset_bool': False,
'after_assembly_knife_tip_r_angle': 0, 'tool_loading_person': self.env.user.name,
'start_preset_bool': True 'tool_loading_time': fields.Datetime.now()
}) })
logging.info('功能刀具组装完成！')
def materials_must_be_judged(self):
"""
功能刀具组装必填判断
"""
# 物料准确性校验
# 物料必填校验
if not self.handle_code_id:
raise ValidationError('缺少【刀柄】物料信息！')
if self.integral_lot_id:
if not self.integral_verify:
raise ValidationError('【整体式刀具】未进行验证！')
elif self.blade_lot_id:
if not self.blade_verify:
raise ValidationError('【刀片】未进行验证！')
if self.bar_lot_id:
if not self.bar_verify:
raise ValidationError('【刀杆】未进行验证！')
elif self.pad_lot_id:
if not self.pad_verify:
raise ValidationError('【刀盘】未进行验证！')
# 组装参数必填校验
if self.after_assembly_max_lifetime_value == 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 { return {
'type': 'ir.actions.act_window', 'barcode_id': stock_lot.id,
'res_model': 'sf.functional.tool.assembly.order', 'code': self.code,
'name': '功能刀具组装单', 'name': self.tool_inventory_id.name,
'view_mode': 'form', 'tool_name_id': self.tool_inventory_id.id,
'target': 'new', 'rfid': self.rfid,
'context': {'default_name': self.name, 'tool_groups_id': self.tool_groups_id.id,
'default_assembly_order_code': self.assembly_order_code, 'functional_tool_name_id': functional_tool_assembly_id.id,
'default_production_line_name_id': self.production_line_name_id.id, 'sf_cutting_tool_type_id': self.after_assembly_functional_tool_type_id.id,
'default_machine_tool_name_id': self.machine_tool_name_id.id, 'cutting_tool_integral_model_id': self.integral_product_id.id,
'default_cutter_spacing_code_id': self.cutter_spacing_code_id.id, 'cutting_tool_blade_model_id': self.blade_product_id.id,
'default_functional_tool_name': self.functional_tool_name, 'cutting_tool_cutterbar_model_id': self.bar_product_id.id,
'default_functional_tool_type_id': self.functional_tool_type_id.id, 'cutting_tool_cutterpad_model_id': self.pad_product_id.id,
'default_tool_groups_id': self.tool_groups_id.id, 'cutting_tool_cutterhandle_model_id': self.handle_product_id.id,
'default_functional_tool_diameter': self.functional_tool_diameter, 'cutting_tool_cutterhead_model_id': self.chuck_product_id.id,
'default_knife_tip_r_angle': self.knife_tip_r_angle,
'default_tool_loading_length': self.tool_loading_length, 'functional_tool_diameter': self.after_assembly_functional_tool_diameter,
'default_functional_tool_length': self.functional_tool_length, 'knife_tip_r_angle': self.after_assembly_knife_tip_r_angle,
'default_effective_length': self.effective_length, 'coarse_middle_thin': self.after_assembly_coarse_middle_thin,
'default_whether_standard_knife': self.whether_standard_knife, 'new_former': self.after_assembly_new_former,
'default_coarse_middle_thin': self.coarse_middle_thin, 'tool_loading_length': self.after_assembly_tool_loading_length,
'default_new_former': self.new_former, 'handle_length': self.after_assembly_handle_length,
'default_use_tool_time': self.use_tool_time, 'functional_tool_length': self.after_assembly_functional_tool_length,
'default_reason_for_applying': self.reason_for_applying '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): def _get_code(self, loading_task_source):
""" """
自动生成组装单编码 自动生成组装单编码
@@ -622,6 +1077,8 @@ class FunctionalToolAssembly(models.Model):
code = 'J' + datetime code = 'J' + datetime
elif loading_task_source == '2': elif loading_task_source == '2':
code = 'K' + datetime code = 'K' + datetime
elif loading_task_source == '3':
code = 'S' + datetime
else: else:
code = False code = False
functional_tool_assembly = self.env['sf.functional.tool.assembly'].sudo().search( functional_tool_assembly = self.env['sf.functional.tool.assembly'].sudo().search(
@@ -648,6 +1105,13 @@ class FunctionalToolAssembly(models.Model):
return functional_tool return functional_tool
return False return False
bool_preset_parameter = fields.Boolean('', default=False)
def get_tool_preset_parameter(self):
if not self.bool_preset_parameter:
raise ValidationError('没有获取到测量数据, 请确认刀具预调仪操作是否正确！')
return True
def assemble_single_print(self): def assemble_single_print(self):
""" """
todo 组装单打印 todo 组装单打印
@@ -1032,6 +1496,47 @@ class FunctionalToolDismantle(models.Model):
}) })
logging.info('【%s】刀具拆解成功！' % self.name) logging.info('【%s】刀具拆解成功！' % self.name)
# ==================根据条件创建功能刀具组装单=======================
# 如果报废原因为【寿命到期报废】并且刀柄不报废时， 创建功能刀具组装单
if self.dismantle_cause in ['寿命到期报废'] and not self.scrap_boolean:
# 创建组装单
assembly_id = self.env['sf.functional.tool.assembly'].sudo().create({
'functional_tool_name': self.functional_tool_id.name,
'handle_code_id': self.handle_lot_id.id,
'handle_product_id': self.handle_product_id.id,
'loading_task_source': '3',
'use_tool_time': fields.Datetime.now() + timedelta(hours=4),
'reason_for_applying': '刀具寿命到期'
})
return {
'type': 'ir.actions.act_window',
'res_model': 'sf.functional.tool.assembly',
'view_type': 'form',
'view_mode': 'form',
'res_id': assembly_id.id,
# 'target': 'new'
}
# {
# 'type': 'ir.actions.client',
# 'tag': 'display_notification',
# 'params': {
# 'title': '组装单创建完成',
# 'message': '请组装同名称的功能刀具',
# 'type': 'info'
# }
# }
# 'params': {
# 'title': _('The following replenishment order has been generated'),
# 'message': '%s',
# 'links': [{
# 'label': order.display_name,
# 'url': f'#action={action.id}&id={order.id}&model=purchase.order',
# }],
# 'sticky': False,
# }
def create_tool_picking_scrap(self, datas): def create_tool_picking_scrap(self, datas):
scrap_data = datas['scrap'] scrap_data = datas['scrap']
picking_data = datas['picking'] picking_data = datas['picking']

43
sf_tool_management/models/jikimo_bom.py
View File

@@ -30,9 +30,23 @@ class jikimo_bom(models.Model):
return result return result
def check_types_in_list(self): def check_types_in_list(self):
# 统计每个元素的类型 """
type_counts = Counter(item.cutting_tool_material_id.name for item in self.product_ids) 检查产品列表中的元素是否包含了所有指定的类型，并且每种类型至少出现一次。
return all(count > 0 for count in type_counts.values()) and len(type_counts) == self.options.split('+') :return: 如果条件满足返回True，否则返回False
"""
if not self.product_ids:
return False
try:
# 统计每个类型的出现次数
type_counts = Counter(item.cutting_tool_material_id.name for item in self.product_ids)
# 检查是否每种类型的出现次数都大于0，并且类型的数量与选项字符串中的数量相等
return all(count > 0 for count in type_counts.values()) and len(type_counts) == len(self.options.split('+'))
except AttributeError:
# 如果出现属性错误，说明产品列表中的元素可能缺少必要的属性
return False
# type_counts = Counter(item.cutting_tool_material_id.name for item in self.product_ids)
# return all(count > 0 for count in type_counts.values()) and len(type_counts) == self.options.split('+')
def write(self, vals): def write(self, vals):
# 在更新模型时记录旧的 Many2many ID 列表 # 在更新模型时记录旧的 Many2many ID 列表
@@ -47,9 +61,15 @@ class jikimo_bom(models.Model):
return True return True
else: else:
raise UserError('每种物料最少要有一个') raise UserError('每种物料最少要有一个')
return True
return super(jikimo_bom, self).write(vals) return super(jikimo_bom, self).write(vals)
def bom_product_domains(self, assembly_options): def bom_product_domains(self, assembly_options):
"""
根据装配选项生成产品域列表
:param assembly_options: 装配选项字符串，各选项以'+'分隔
:return: 动态生成的产品搜索条件
"""
self.options = assembly_options self.options = assembly_options
cutting_tool_materials = self.env['sf.cutting.tool.material'].search( cutting_tool_materials = self.env['sf.cutting.tool.material'].search(
[('name', 'in', assembly_options.split('+'))]) [('name', 'in', assembly_options.split('+'))])
@@ -82,23 +102,22 @@ class jikimo_bom(models.Model):
domains = domains + domain domains = domains + domain
if index != 0: if index != 0:
domains = ['|'] + domains domains = ['|'] + domains
# wqwqwe = self.env['product.product'].search(ddd)
# product = self.env['product.product'].search(domain)
# if product:
# products = products + product
domains = domains + [('stock_move_count', '>', 0)] domains = domains + [('stock_move_count', '>', 0)]
return domains return domains
def generate_bill_materials(self, assembly_options): def generate_bill_materials(self, assembly_options):
"""
生成物料清单
根据装配选项生成物料清单，首先获取产品领域，然后搜索相关产品，并设置产品ID。
:param assembly_options: 组装方式
:type assembly_options: 装配选项字符串，各选项以'+'分隔
"""
domains = self.bom_product_domains(assembly_options) domains = self.bom_product_domains(assembly_options)
products = self.env['product.product'].search(domains) products = self.env['product.product'].search(domains)
if products: if products:
self.product_ids = [Command.set(products.ids)] self.product_ids = [Command.set(products.ids)]
# if option.name == '刀盘':
# hilt = self.env['product.product'].search(
# [('cutting_tool_blade_diameter', '=', self.tool_inventory_id.diameter),
# ('cutting_tool_material_id', '=', option.id)])
# self.product_ids = [Command.set(hilt.ids)]k
class jikimo_bom_line(models.Model): class jikimo_bom_line(models.Model):

291
sf_tool_management/models/stock.py
View File

@@ -1,4 +1,9 @@
import logging
from datetime import timedelta, datetime, date
from odoo import api, fields, models, _ from odoo import api, fields, models, _
from odoo.exceptions import ValidationError
class ShelfLocation(models.Model): class ShelfLocation(models.Model):
@@ -58,3 +63,289 @@ class StockPicking(models.Model):
if move_lines: if move_lines:
self.env['stock.move.line'].sudo().button_function_tool_use_verify(move_lines) self.env['stock.move.line'].sudo().button_function_tool_use_verify(move_lines)
return res 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 tool_location_num(self, freight_barcode_id, lot_id):
location_lot = self.env['sf.shelf.location.lot'].sudo().search([('lot_id', '=', lot_id.id), (
'shelf_location_id', '=', freight_barcode_id.id)])
if not location_lot:
raise ValidationError(
f'[{freight_barcode_id.barcode}]货位的[{lot_id.name}]批次物料已用完，请重新选择！')
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:
if obj.handle_code_id.tool_material_status == '在用':
raise ValidationError(f'Rfid为{obj.handle_code_id.rfid}的刀柄已被使用，请重新选择！')
# 修改刀柄序列号状态为【在用】
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:
self.tool_location_num(obj.integral_freight_barcode_id, obj.integral_lot_id)
datas['data'].append(
{'current_location_id': obj.integral_freight_barcode_id, 'lot_id': obj.integral_lot_id})
if obj.blade_product_id:
self.tool_location_num(obj.blade_freight_barcode_id, obj.blade_lot_id)
datas['data'].append(
{'current_location_id': obj.blade_freight_barcode_id, 'lot_id': obj.blade_lot_id})
if obj.bar_product_id:
self.tool_location_num(obj.bar_freight_barcode_id, obj.bar_lot_id)
datas['data'].append(
{'current_location_id': obj.bar_freight_barcode_id, 'lot_id': obj.bar_lot_id})
if obj.pad_product_id:
self.tool_location_num(obj.pad_freight_barcode_id, obj.pad_lot_id)
datas['data'].append(
{'current_location_id': obj.pad_freight_barcode_id, 'lot_id': obj.pad_lot_id})
if obj.chuck_product_id:
self.tool_location_num(obj.chuck_freight_barcode_id, obj.chuck_lot_id)
datas['data'].append(
{'current_location_id': obj.chuck_freight_barcode_id, 'lot_id': obj.chuck_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:
if res['lot_id'].product_qty <= 0:
raise ValidationError(
f'[{res["lot_id"].product_id.name}产品的{res["lot_id"].name}]批次/序列号库存不足！')
# 创建库存移动记录
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)
def set_tool_material(self):
tool_id = self.env.context.get('tool_id')
tool_assembly_id = self.env['sf.functional.tool.assembly'].sudo().search([('id', '=', tool_id)])
if len(self) > 1:
raise ValidationError('请不要多选')
else:
tool_assembly_id.handle_product_id = self.id
tool_assembly_id.handle_code_id = False
return {
'type': 'ir.actions.client',
'tag': 'display_notification',
'params': {
'message': '刀柄信息更改成功',
'type': 'success',
'next': {'type': 'ir.actions.act_window_close'}
}
}
class SfShelfLocationLot(models.Model):
_inherit = 'sf.shelf.location.lot'
product_id = fields.Many2one('product.product', '产品', compute='_compute_product_id', store=True)
cutting_tool_type = fields.Char(string="刀具物料类型", compute='_compute_product_id', store=True)
cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', string='类型',
related='product_id.cutting_tool_type_id')
cutting_tool_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='型号名称',
related='product_id.cutting_tool_model_id')
specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='物料号',
related='product_id.specification_id')
brand_id = fields.Many2one('sf.machine.brand', '品牌', related='product_id.brand_id')
cutting_tool_blade_diameter = fields.Float('刃部直径(mm)', related='product_id.cutting_tool_blade_diameter')
cutting_tool_blade_tip_working_size = fields.Char('刀尖R角(mm)',
related='product_id.cutting_tool_blade_tip_working_size')
cutting_tool_blade_radius = fields.Char('刀尖圆弧半径(mm)',
related='product_id.cutting_tool_blade_tip_circular_arc_radius')
cutting_tool_cutter_arbor_diameter = fields.Float('刀杆直径(mm)',
related='product_id.cutting_tool_cutter_arbor_diameter')
cutting_tool_cutter_head_diameter = fields.Float('刀盘直径(mm)',
related='product_id.cutting_tool_cutter_head_diameter')
fit_blade_shape_id = fields.Many2one('maintenance.equipment.image', '适配刀片形状',
related='product_id.fit_blade_shape_id')
@api.depends('lot_id')
def _compute_product_id(self):
for item in self:
if item.lot_id:
item.product_id = item.lot_id.product_id.id
item.cutting_tool_type = item.lot_id.product_id.cutting_tool_type
def set_tool_material(self):
tool_type = self.env.context.get('tool_type')
tool_id = self.env.context.get('tool_id')
tool_assembly_id = self.env['sf.functional.tool.assembly'].sudo().search([('id', '=', tool_id)])
if len(self) > 1:
raise ValidationError('请不要多选')
if tool_type == '整体式刀具':
tool_assembly_id.integral_freight_barcode_id = self.shelf_location_id.id
tool_assembly_id.integral_lot_id = self.lot_id.id
tool_assembly_id.integral_verify = False
elif tool_type == '刀片':
tool_assembly_id.blade_freight_barcode_id = self.shelf_location_id.id
tool_assembly_id.blade_lot_id = self.lot_id.id
tool_assembly_id.blade_verify = False
elif tool_type == '刀杆':
tool_assembly_id.bar_freight_barcode_id = self.shelf_location_id.id
tool_assembly_id.bar_lot_id = self.lot_id.id
tool_assembly_id.bar_verify = False
elif tool_type == '刀盘':
tool_assembly_id.pad_freight_barcode_id = self.shelf_location_id.id
tool_assembly_id.pad_lot_id = self.lot_id.id
tool_assembly_id.pad_verify = False
return {
'type': 'ir.actions.client',
'tag': 'display_notification',
'params': {
'message': f'[{tool_type}]物料信息更改成功',
'type': 'success',
'next': {'type': 'ir.actions.act_window_close'}
}
}

6
sf_tool_management/models/tool_inventory.py
View File

@@ -14,10 +14,7 @@ class ToolInventory(models.Model):
self._bom_mainfest() self._bom_mainfest()
return self.bom_mainfest() return self.bom_mainfest()
request.session['jikimo_bom_product'] = {'bom_id': int(self.jikimo_bom_ids)} request.session['jikimo_bom_product'] = {'bom_id': int(self.jikimo_bom_ids)}
# context = dict(self.env.context)
# context.update({'jikimo_bom_product': self.jikimo_bom_ids.options})
# if self.functional_cutting_tool_model_id.cutting_tool_type_ids:
# context.update({'jikimo_bom_product_cutting_tool_type': self.functional_cutting_tool_model_id.cutting_tool_type_ids.ids})
return { return {
'type': 'ir.actions.act_window', 'type': 'ir.actions.act_window',
'name': '刀具组装清单', 'name': '刀具组装清单',
@@ -26,7 +23,6 @@ class ToolInventory(models.Model):
'view_id': self.env.ref('sf_tool_management.view_jikimo_bom_form').id, 'view_id': self.env.ref('sf_tool_management.view_jikimo_bom_form').id,
'res_id': int(self.jikimo_bom_ids), 'res_id': int(self.jikimo_bom_ids),
'target': 'current', # Use 'new' to open in a new window/tab 'target': 'current', # Use 'new' to open in a new window/tab
# {'jikimo_bom_product': self.jikimo_bom_ids.options}
} }
# 创建bom单 # 创建bom单

127
sf_tool_management/views/stock.xml
View File

@@ -11,4 +11,131 @@
</xpath> </xpath>
</field> </field>
</record> </record>
<record id="view_tool_product_tree" model="ir.ui.view">
<field name="name">刀柄</field>
<field name="model">product.product</field>
<field name="arch" type="xml">
<tree create="0" export_xlsx="0" delete="0">
<header>
<button string="确认" name="set_tool_material" type="object"
class="treeHeaderBtn"/>
</header>
<field name="name"/>
<field name="cutting_tool_type_id"/>
<field name="cutting_tool_model_id"/>
<field name="specification_id"/>
<field name="cutting_tool_shank_length"/>
<field name="cutting_tool_taper_shank_model"/>
<field name="brand_id"/>
<field name="qty_available" string="数量"/>
</tree>
</field>
</record>
<record id="view_tool_product_search" model="ir.ui.view">
<field name="model">product.product</field>
<field name="arch" type="xml">
<search>
<field name="name"/>
</search>
</field>
</record>
<record id="view_shelf_location_lot_tree_1" model="ir.ui.view">
<field name="name">sf.shelf.location.lot.tree</field>
<field name="model">sf.shelf.location.lot</field>
<field name="arch" type="xml">
<tree create="0" export_xlsx="0" delete="0">
<header>
<button string="确认" name="set_tool_material" type="object"
class="treeHeaderBtn"/>
</header>
<field name="product_id"/>
<field name="cutting_tool_type_id"/>
<field name="cutting_tool_model_id"/>
<field name="specification_id"/>
<field name="cutting_tool_blade_diameter"/>
<field name="cutting_tool_blade_tip_working_size"/>
<field name="brand_id"/>
<field name="shelf_location_id"/>
<field name="lot_id"/>
</tree>
</field>
</record>
<record id="view_shelf_location_lot_tree_2" model="ir.ui.view">
<field name="name">sf.shelf.location.lot.tree</field>
<field name="model">sf.shelf.location.lot</field>
<field name="arch" type="xml">
<tree create="0" export_xlsx="0" delete="0">
<header>
<button string="确认" name="set_tool_material" type="object"
class="treeHeaderBtn"/>
</header>
<field name="product_id"/>
<field name="cutting_tool_type_id"/>
<field name="cutting_tool_model_id"/>
<field name="specification_id"/>
<field name="fit_blade_shape_id"/>
<field name="cutting_tool_blade_radius"/>
<field name="brand_id"/>
<field name="shelf_location_id"/>
<field name="lot_id"/>
</tree>
</field>
</record>
<record id="view_shelf_location_lot_tree_3" model="ir.ui.view">
<field name="name">sf.shelf.location.lot.tree</field>
<field name="model">sf.shelf.location.lot</field>
<field name="arch" type="xml">
<tree create="0" export_xlsx="0" delete="0">
<header>
<button string="确认" name="set_tool_material" type="object"
class="treeHeaderBtn"/>
</header>
<field name="product_id"/>
<field name="cutting_tool_type_id"/>
<field name="cutting_tool_model_id"/>
<field name="specification_id"/>
<field name="cutting_tool_cutter_arbor_diameter"/>
<field name="fit_blade_shape_id"/>
<field name="brand_id"/>
<field name="shelf_location_id"/>
<field name="lot_id"/>
</tree>
</field>
</record>
<record id="view_shelf_location_lot_tree_4" model="ir.ui.view">
<field name="name">sf.shelf.location.lot.tree</field>
<field name="model">sf.shelf.location.lot</field>
<field name="arch" type="xml">
<tree create="0" export_xlsx="0" delete="0">
<header>
<button string="确认" name="set_tool_material" type="object"
class="treeHeaderBtn"/>
</header>
<field name="product_id"/>
<field name="cutting_tool_type_id"/>
<field name="cutting_tool_model_id"/>
<field name="specification_id"/>
<field name="cutting_tool_cutter_head_diameter"/>
<field name="fit_blade_shape_id"/>
<field name="brand_id"/>
<field name="shelf_location_id"/>
<field name="lot_id"/>
</tree>
</field>
</record>
</odoo> </odoo>

330
sf_tool_management/views/tool_base_views.xml
View File

@@ -446,19 +446,23 @@
<field name="use_tool_time"/> <field name="use_tool_time"/>
<field name="production_line_name_id" optional="hide"/> <field name="production_line_name_id" optional="hide"/>
<field name="machine_tool_name_id" optional="hide"/> <field name="machine_tool_name_id" optional="hide"/>
<field name="applicant"/> <field name="applicant" optional="hide"/>
<field name="apply_time"/> <field name="apply_time"/>
<field name="assemble_status" optional="hide"/> <field name="assemble_status" widget='badge'
decoration-info="assemble_status == '0'"
decoration-warning="assemble_status == '01'"
decoration-success="assemble_status == '1'"
/>
<field name="name" invisible="True"/> <!-- <field name="name" invisible="True"/>-->
<field name="machine_tool_code" invisible="True"/> <!-- <field name="machine_tool_code" invisible="True"/>-->
<field name="cutter_spacing_code_id" invisible="True"/> <!-- <field name="cutter_spacing_code_id" invisible="True"/>-->
<field name="whether_standard_knife" invisible="True"/> <!-- <field name="whether_standard_knife" invisible="True"/>-->
<field name="reason_for_applying" invisible="True"/> <!-- <field name="reason_for_applying" invisible="True"/>-->
<field name="functional_tool_type_id" invisible="True"/> <!-- <field name="functional_tool_type_id" invisible="True"/>-->
<button string="组装" name="put_start_preset" type="object" <!-- <button string="组装" name="put_start_preset" type="object"-->
attrs="{'invisible': [('assemble_status', '!=', '0')]}" <!-- attrs="{'invisible': [('assemble_status', '!=', '0')]}"-->
class="btn-primary"/> <!-- class="btn-primary"/>-->
</tree> </tree>
</field> </field>
</record> </record>
@@ -467,19 +471,23 @@
<field name="name">功能刀具组装</field> <field name="name">功能刀具组装</field>
<field name="model">sf.functional.tool.assembly</field> <field name="model">sf.functional.tool.assembly</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form create="0" delete="0" edit="0"> <form create="0" delete="0" edit="1">
<header> <header>
<!-- <button string="修改编码" name="put_assembly_order_code" type="object"--> <button string="开始组装" name="start_preset" type="object"
<!-- class="btn-primary" confirm="是否确认修改编码"/>--> attrs="{'invisible': [('assemble_status', 'not in', ['0'])]}"
<button string="组装" name="put_start_preset" type="object"
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/> class="btn-primary"/>
<field name="assemble_status" widget="statusbar" statusbar_visible="0,1"/> <button string="确认组装" name="functional_tool_assembly" type="object"
attrs="{'invisible': [('assemble_status', 'not in', ['01'])]}"
class="btn-primary"/>
<button name="get_tool_preset_parameter" string="获取测量值"
type="object" class="btn-primary"
attrs="{'invisible': [('assemble_status', 'in', ['0','1','2'])]}"
/>
<field name="assemble_status" widget="statusbar" statusbar_visible="0,01,1"/>
</header> </header>
<sheet> <sheet>
<div class="oe_button_box" name="button_box"> <div class="oe_button_box" name="button_box">
<button class="oe_stat_button" name="open_tool_stock_picking" icon="fa-truck" type="object" <button class="oe_stat_button" name="open_tool_stock_picking" icon="fa-truck" type="object">
attrs="{'invisible': [('assemble_status', '!=', '1')]}">
<div name="delivery_count" class="o_field_widget o_readonly_modifier o_field_statinfo"> <div name="delivery_count" class="o_field_widget o_readonly_modifier o_field_statinfo">
<span class="o_stat_info o_stat_value"> <span class="o_stat_info o_stat_value">
<field name="picking_num"/> <field name="picking_num"/>
@@ -488,6 +496,10 @@
</div> </div>
</button> </button>
</div> </div>
<div class="o_employee_avatar">
<field name="image" widget="image" class="oe_avatar m-0"
attrs="{'readonly': [('assemble_status', '!=', '01')]}"/>
</div>
<div class="oe_title"> <div class="oe_title">
<h1> <h1>
<field name="assembly_order_code"/> <field name="assembly_order_code"/>
@@ -496,116 +508,77 @@
<field name="name" invisible="1"/> <field name="name" invisible="1"/>
<group> <group>
<group> <group>
<field name="production_line_name_id"/> <field name="functional_tool_name"/>
<field name="machine_tool_name_id"/> <field name="functional_tool_type_id"/>
<field name="cutter_spacing_code_id"/> <field name="tool_groups_id"/>
<field name="sf_machine_table_tool_changing_apply_id"
attrs="{'invisible': [('sf_machine_table_tool_changing_apply_id','=',False)]}"/>
<field name="sf_cam_work_order_program_knife_plan_id"
attrs="{'invisible': [('sf_cam_work_order_program_knife_plan_id','=',False)]}"/>
</group> </group>
<group> <group>
<field name="image" nolabel="1" widget="image"/> <field name="functional_tool_diameter" string="刀具直径(mm)"/>
<field name="knife_tip_r_angle"/>
<field name="tool_loading_length" string="总长度(mm)"/>
<field name="functional_tool_length"/>
</group> </group>
</group> </group>
<notebook> <notebook>
<page string="组装信息" attrs="{'invisible': [('assemble_status', '=', '0')]}"> <page string="组装信息">
<group col="1"> <field name="_barcode_scanned" widget="barcode_handler"/>
<group attrs="{'invisible': [('assemble_status', '=', '0')]}">
<group col="1"> <group col="1">
<group> <group col="1">
<div>
<separator string="刀柄:" style="font-size: 13px;"/>
</div>
<group> <group>
<field name="barcode_id" invisible="True"/> <field name="handle_code_id" string="序列号" placeholder="请选择"
<field name="rfid" string="功能刀具rfid"/> options="{'no_create': True, 'no_quick_create': True}"/>
<field name="code"/> <field name="handle_freight_rfid" string="Rfid"/>
<field name="after_assembly_functional_tool_name" <field name="handle_product_id" string="名称"/>
string="功能刀具名称"/> <field name="cutting_tool_cutterhandle_model_id" string="型号"/>
<field name="after_assembly_functional_tool_type_id" <field name="handle_specification_id" string="规格"/>
string="功能刀具类型"/> <field name="sf_tool_brand_id_5" string="品牌"/>
<field name="tool_groups_id"/>
<field name="after_assembly_whether_standard_knife"
string="是否标准刀"/>
<field name="after_assembly_coarse_middle_thin" string="粗/中/精"/>
<field name="after_assembly_new_former" string="新/旧"/>
<field name="cut_time"
attrs="{'invisible': [('after_assembly_new_former', '=', '0')]}"/>
<field name="cut_length"
attrs="{'invisible': [('after_assembly_new_former', '=', '0')]}"/>
<field name="cut_number"
attrs="{'invisible': [('after_assembly_new_former', '=', '0')]}"/>
</group>
<group>
<field name="after_assembly_functional_tool_diameter"
string="刀具直径(mm)"/>
<field name="after_assembly_knife_tip_r_angle" string="刀尖R角(mm)"/>
<field name="after_assembly_tool_loading_length" string="总长度(mm)"/>
<field name="after_assembly_handle_length" string="刀柄长度(mm)"/>
<field name="after_assembly_functional_tool_length"
string="伸出长(mm)"/>
<field name="after_assembly_max_lifetime_value"
string="最大寿命值(min)"/>
<field name="after_assembly_alarm_value" string="报警值(min)"/>
<field name="after_assembly_used_value" string="已使用值(min)"
invisible="1"/>
<field name="after_assembly_effective_length" string="有效长(mm)"
invisible="1"/>
<field name="L_D_number" invisible="1"/>
<field name="hiding_length" invisible="1"/>
</group> </group>
<div>
<button string="更多" name="set_tool_lot" type="object"
class="btn-primary" context="{'tool_type': '刀柄'}"
attrs="{'invisible': [('assemble_status', 'not in', ['0','01'])]}"/>
</div>
</group> </group>
</group> </group>
</group>
<group>
<group col="1" attrs="{'invisible': [('handle_code_id', '=', False)]}">
<div>
<separator string="刀柄:" style="font-size: 13px;"/>
</div>
<group>
<field name="handle_code_id" string="序列号" placeholder="请选择"
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="handle_freight_rfid" string="Rfid"/>
<field name="handle_product_id" string="名称"/>
<field name="cutting_tool_cutterhandle_model_id" string="型号"/>
<field name="handle_specification_id" string="规格"/>
<field name="sf_tool_brand_id_5" string="品牌"/>
</group>
</group>
<group col="1" attrs="{'invisible': [('chuck_freight_barcode_id', '=', False)]}">
<div>
<separator string="夹头:" style="font-size: 13px;"/>
</div>
<group>
<group>
<field name="chuck_freight_barcode_id" string="货位"/>
<field name="chuck_lot_id" string="批次"/>
<field name="chuck_product_id" string="名称"/>
<field name="cutting_tool_cutterhead_model_id" string="型号"/>
<field name="chuck_specification_id" string="规格"/>
<field name="sf_tool_brand_id_6" string="品牌"/>
</group>
</group>
</group>
</group>
<group>
<group col="1"> <group col="1">
<group col="1" <group col="1"
attrs="{'invisible': [('integral_freight_barcode_id', '=', False)]}"> attrs="{'invisible': [('integral_lot_id', '=', False),'|','|','|', ('blade_lot_id', '!=', False),('bar_lot_id', '!=', False),('pad_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
<div> <div>
<separator string="整体式刀具:" style="font-size: 13px;"/> <separator string="整体式刀具:" style="font-size: 13px;"/>
</div> </div>
<group> <group>
<field name="integral_freight_barcode_id" string="货位"/> <group>
<field name="integral_lot_id" string="批次"/> <field name="integral_freight_barcode_id" string="货位"/>
<field name="integral_product_id" string="名称"/> <field name="integral_lot_id" string="批次"/>
<field name="cutting_tool_integral_model_id" string="型号"/> <field name="integral_product_id" string="名称"/>
<field name="integral_specification_id" string="规格"/> <field name="cutting_tool_integral_model_id" string="型号"/>
<field name="sf_tool_brand_id_1" string="品牌"/> <field name="integral_specification_id" string="规格"/>
<field name="sf_tool_brand_id_1" string="品牌"/>
</group>
<group>
<field name="integral_verify" string="" readonly="1"/>
</group>
</group> </group>
</group>
<group col="1"
attrs="{'invisible': [('blade_freight_barcode_id', '=', False)]}">
<div> <div>
<separator string="刀片:" style="font-size: 13px;"/> <button string="更多" name="set_tool_lot" type="object"
class="btn-primary" context="{'tool_type': '整体式刀具'}"
attrs="{'invisible': [('assemble_status', 'not in', ['0','01'])]}"/>
</div> </div>
</group>
</group>
</group>
<group attrs="{'invisible': [('assemble_status', '=', '0')]}">
<group col="1"
attrs="{'invisible': [('blade_lot_id', '=', False),'|', ('integral_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
<div>
<separator string="刀片:" style="font-size: 13px;"/>
</div>
<group>
<group> <group>
<field name="blade_freight_barcode_id" string="货位"/> <field name="blade_freight_barcode_id" string="货位"/>
<field name="blade_lot_id" string="批次"/> <field name="blade_lot_id" string="批次"/>
@@ -614,10 +587,19 @@
<field name="blade_specification_id" string="规格"/> <field name="blade_specification_id" string="规格"/>
<field name="sf_tool_brand_id_2" string="品牌"/> <field name="sf_tool_brand_id_2" string="品牌"/>
</group> </group>
<group>
<field name="blade_verify" string="" readonly="1"/>
</group>
</group> </group>
<div>
<button string="更多" name="set_tool_lot" type="object"
class="btn-primary" context="{'tool_type': '刀片'}"
attrs="{'invisible': [('assemble_status', 'not in', ['0','01'])]}"/>
</div>
</group> </group>
<group col="1"> <group col="1">
<group col="1" attrs="{'invisible': [('bar_freight_barcode_id', '=', False)]}"> <group col="1"
attrs="{'invisible': [('bar_lot_id', '=', False),'|','|',('integral_lot_id', '!=', False),('pad_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
<div> <div>
<separator string="刀杆:" style="font-size: 13px;"/> <separator string="刀杆:" style="font-size: 13px;"/>
</div> </div>
@@ -630,9 +612,18 @@
<field name="bar_specification_id" string="规格"/> <field name="bar_specification_id" string="规格"/>
<field name="sf_tool_brand_id_3" string="品牌"/> <field name="sf_tool_brand_id_3" string="品牌"/>
</group> </group>
<group>
<field name="bar_verify" string="" readonly="1"/>
</group>
</group> </group>
<div>
<button string="更多" name="set_tool_lot" type="object"
class="btn-primary" context="{'tool_type': '刀杆'}"
attrs="{'invisible': [('assemble_status', 'not in', ['0','01'])]}"/>
</div>
</group> </group>
<group col="1" attrs="{'invisible': [('pad_freight_barcode_id', '=', False)]}"> <group col="1"
attrs="{'invisible': [('pad_lot_id', '=', False),'|','|',('integral_lot_id', '!=', False),('bar_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
<div> <div>
<separator string="刀盘:" style="font-size: 13px;"/> <separator string="刀盘:" style="font-size: 13px;"/>
</div> </div>
@@ -645,30 +636,69 @@
<field name="pad_specification_id" string="规格"/> <field name="pad_specification_id" string="规格"/>
<field name="sf_tool_brand_id_4" string="品牌"/> <field name="sf_tool_brand_id_4" string="品牌"/>
</group> </group>
<group>
<field name="pad_verify" string="" readonly="1"/>
</group>
</group> </group>
<div>
<button string="更多" name="set_tool_lot" type="object"
class="btn-primary" context="{'tool_type': '刀盘'}"
attrs="{'invisible': [('assemble_status', 'not in', ['0','01'])]}"/>
</div>
</group> </group>
</group> </group>
</group> </group>
</page> <group col="1" attrs="{'invisible': [('assemble_status', '=', '0')]}">
<page string="申请信息"> <group col="1">
<group> <group string="组装参数信息">
<group> <group>
<field name="functional_tool_name"/> <field name="barcode_id" invisible="True"/>
<field name="functional_tool_type_id"/> <field name="rfid" string="功能刀具rfid"/>
<field name="tool_groups_id"/> <field name="code"/>
<field name="functional_tool_diameter" string="刀具直径(mm)"/> <field name="after_assembly_functional_tool_name"
<field name="knife_tip_r_angle"/> string="功能刀具名称"/>
<field name="tool_loading_length" string="总长度(mm)"/> <field name="after_assembly_functional_tool_type_id"
<field name="functional_tool_length"/> string="功能刀具类型"/>
<field name="effective_length"/> <field name="tool_groups_id"/>
</group> <field name="after_assembly_whether_standard_knife"
<group> string="是否标准刀" invisible="1"/>
<field name="whether_standard_knife"/> <field name="after_assembly_coarse_middle_thin" string="粗/中/精"
<field name="coarse_middle_thin"/> attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="new_former"/> <field name="after_assembly_new_former" string="新/旧"
<field name="use_tool_time"/> attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="reason_for_applying"/> <field name="cut_time"
<!-- <field name="functional_tool_cutting_type"/>--> attrs="{'invisible': [('after_assembly_new_former', '=', '0')]}"/>
<field name="cut_length"
attrs="{'invisible': [('after_assembly_new_former', '=', '0')]}"/>
<field name="cut_number"
attrs="{'invisible': [('after_assembly_new_former', '=', '0')]}"/>
</group>
<group>
<field name="after_assembly_functional_tool_diameter" readonly="0"
string="刀具直径(mm)"
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="after_assembly_knife_tip_r_angle" readonly="0"
string="刀尖R角(mm)"
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="after_assembly_tool_loading_length" readonly="0"
string="总长度(mm)"
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="after_assembly_handle_length" string="刀柄长度(mm)"
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="after_assembly_functional_tool_length"
string="伸出长(mm)"/>
<field name="after_assembly_max_lifetime_value"
string="最大寿命值(min)"/>
<field name="after_assembly_alarm_value" string="报警值(min)"
invisible="1"/>
<field name="after_assembly_used_value" string="已使用值(min)"
invisible="1"/>
<field name="after_assembly_effective_length" string="有效长(mm)"
invisible="1"/>
<field name="L_D_number" invisible="1"/>
<field name="hiding_length" invisible="1"/>
</group>
</group>
</group> </group>
</group> </group>
</page> </page>
@@ -685,9 +715,27 @@
<page string="其他"> <page string="其他">
<group> <group>
<group> <group>
<field name="production_line_name_id"
attrs="{'invisible': [('production_line_name_id','=',False)]}"/>
<field name="machine_tool_name_id"
attrs="{'invisible': [('machine_tool_name_id','=',False)]}"/>
<field name="cutter_spacing_code_id"
attrs="{'invisible': [('cutter_spacing_code_id','=',False)]}"/>
<field name="use_tool_time"/>
<field name="reason_for_applying"/>
<field name="sf_machine_table_tool_changing_apply_id"
attrs="{'invisible': [('sf_machine_table_tool_changing_apply_id','=',False)]}"/>
<field name="sf_cam_work_order_program_knife_plan_id"
attrs="{'invisible': [('sf_cam_work_order_program_knife_plan_id','=',False)]}"/>
<field name="check_box_1" invisible="True"/> <field name="check_box_1" invisible="True"/>
<field name="remark"/> <field name="remark"/>
</group> </group>
<group>
<field name="effective_length"/>
<field name="whether_standard_knife"/>
<field name="coarse_middle_thin" invisible="1"/>
<field name="new_former" invisible="1"/>
</group>
</group> </group>
</page> </page>
</notebook> </notebook>
@@ -705,20 +753,19 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search> <search>
<field name="functional_tool_name"/> <field name="functional_tool_name"/>
<field name="tool_groups_id"/>
<field name="functional_tool_diameter"/>
<field name="knife_tip_r_angle"/>
<field name="assembly_order_code"/> <field name="assembly_order_code"/>
<field name="code" string="功能刀具编码"/> <field name="code" string="功能刀具编码"/>
<field name="barcode_id"/> <field name="barcode_id"/>
<field name="functional_tool_type_id"/>
<field name="tool_groups_id"/> <filter name="no_assemble_status" string="未组装" domain="[('assemble_status', 'in', ['0','01'])]"/>
<field name="loading_task_source" string="任务来源"/>
<field name="production_line_name_id"/>
<field name="machine_tool_name_id"/>
<field name="applicant"/>
<filter name="no_assemble_status" string="未组装" domain="[('assemble_status', '=', '0')]"/>
<filter name="yes_assemble_status" string="已组装" domain="[('assemble_status', '=', '1')]"/> <filter name="yes_assemble_status" string="已组装" domain="[('assemble_status', '=', '1')]"/>
<separator/> <separator/>
<filter string="已归档" name="inactive" domain="[('active', '=', False)]"/> <filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
<searchpanel> <searchpanel>
<field name="assemble_status" enable_counters="1" icon="fa-filter"/>
<field name="functional_tool_type_id" enable_counters="1" icon="fa-filter"/> <field name="functional_tool_type_id" enable_counters="1" icon="fa-filter"/>
</searchpanel> </searchpanel>
@@ -743,7 +790,7 @@
<field name="view_mode">tree,form,search</field> <field name="view_mode">tree,form,search</field>
<!-- <field name="view_id" ref="sf_functional_tool_assembly_tree"/>--> <!-- <field name="view_id" ref="sf_functional_tool_assembly_tree"/>-->
<field name="search_view_id" ref="sf_functional_tool_assembly_search"/> <field name="search_view_id" ref="sf_functional_tool_assembly_search"/>
<field name="context">{'search_default_no_assemble_status':1}</field> <field name="context">{'search_default_no_assemble_status':[1,01]}</field>
</record> </record>
@@ -844,7 +891,8 @@
<group attrs="{'invisible': [('dismantle_cause', 'not in', ['寿命到期报废','崩刀报废'])]}"> <group attrs="{'invisible': [('dismantle_cause', 'not in', ['寿命到期报废','崩刀报废'])]}">
<!-- <group col="3">--> <!-- <group col="3">-->
<group> <group>
<field name="scrap_boolean" string="是否报废" readonly="0"/> <field name="scrap_boolean" string="是否报废"
attrs="{'readonly': [('state' , '=', '已拆解')]}"/>
</group> </group>
<!-- <group></group>--> <!-- <group></group>-->
<!-- <group>--> <!-- <group>-->

1
sf_tool_management/wizard/jikimo_bom_wizard.py
View File

@@ -15,7 +15,6 @@ class JikimoBomWizard(models.TransientModel):
('刀柄+刀杆+刀片', '刀柄+刀杆+刀片'), ('刀柄+刀杆+刀片', '刀柄+刀杆+刀片'),
('刀柄+刀盘+刀片', '刀柄+刀盘+刀片') ('刀柄+刀盘+刀片', '刀柄+刀盘+刀片')
], string='组装方式', required=True) ], string='组装方式', required=True)
# assembly_options_ids = fields.Many2many('sf.cutting.tool.material', string="组装方式")
is_ok = fields.Boolean('确认上述信息正确无误。') is_ok = fields.Boolean('确认上述信息正确无误。')
def submit(self): def submit(self):

526
sf_tool_management/wizard/wizard.py
View File

@@ -598,361 +598,175 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
else: else:
record.L_D_number = 0 record.L_D_number = 0
def functional_tool_assembly(self): # def functional_tool_assembly(self):
""" # """
功能刀具组装 # 功能刀具组装
:return: # :return:
""" # """
logging.info('功能刀具开始组装！') # logging.info('功能刀具开始组装！')
# 获取组装单对象 # # 获取组装单对象
functional_tool_assembly = self.env['sf.functional.tool.assembly'].search([ # functional_tool_assembly = self.env['sf.functional.tool.assembly'].search([
('assembly_order_code', '=', self.assembly_order_code), # ('assembly_order_code', '=', self.assembly_order_code),
('machine_tool_name_id', '=', self.machine_tool_name_id.id), # ('machine_tool_name_id', '=', self.machine_tool_name_id.id),
('cutter_spacing_code_id', '=', self.cutter_spacing_code_id.id), # ('cutter_spacing_code_id', '=', self.cutter_spacing_code_id.id),
('assemble_status', '=', '0'), # ('assemble_status', '=', '0'),
]) # ])
# 对物料做必填判断 # # 对物料做必填判断
self.materials_must_be_judged() # self.materials_must_be_judged()
#
product_id = self.env['product.product'] # product_id = self.env['product.product']
# 创建组装入库单 # # 创建组装入库单
# 创建功能刀具批次/序列号记录 # # 创建功能刀具批次/序列号记录
stock_lot = product_id.create_assemble_warehouse_receipt(self.id, functional_tool_assembly, self) # stock_lot = product_id.create_assemble_warehouse_receipt(self.id, functional_tool_assembly, self)
# 封装功能刀具数据，用于更新组装单信息 # # 封装功能刀具数据，用于更新组装单信息
desc_1 = self.get_desc_1(stock_lot) # desc_1 = self.get_desc_1(stock_lot)
# 封装功能刀具数据，用于创建功能刀具记录 # # 封装功能刀具数据，用于创建功能刀具记录
desc_2 = self.get_desc_2(stock_lot, functional_tool_assembly) # desc_2 = self.get_desc_2(stock_lot, functional_tool_assembly)
# 创建功能刀具组装入库单 # # 创建功能刀具组装入库单
self.env['stock.picking'].create_tool_stocking_picking(stock_lot, functional_tool_assembly, self) # self.env['stock.picking'].create_tool_stocking_picking(stock_lot, functional_tool_assembly, self)
# 创建刀具物料出库单 # # 创建刀具物料出库单
self.env['stock.picking'].create_tool_stocking_picking1(self) # self.env['stock.picking'].create_tool_stocking_picking1(self)
#
# ============================创建功能刀具列表、安全库存记录=============================== # # ============================创建功能刀具列表、安全库存记录===============================
# 创建功能刀具列表记录 # # 创建功能刀具列表记录
record_1 = self.env['sf.functional.cutting.tool.entity'].create(desc_2) # 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({ # self.env['sf.real.time.distribution.of.functional.tools'].create_or_edit_safety_stock({
'functional_name_id': self.after_name_id.id # 'functional_name_id': self.after_name_id.id
}, record_1) # }, record_1)
#
# =====================修改功能刀具组装单、机床换刀申请、CAM工单程序用刀计划的状态============== # # =====================修改功能刀具组装单、机床换刀申请、CAM工单程序用刀计划的状态==============
# 修改功能刀具组装单信息 # # 修改功能刀具组装单信息
functional_tool_assembly.write(desc_1) # functional_tool_assembly.write(desc_1)
if functional_tool_assembly.sf_machine_table_tool_changing_apply_id: # if functional_tool_assembly.sf_machine_table_tool_changing_apply_id:
# 修改机床换刀申请的状态 # # 修改机床换刀申请的状态
self.env['sf.machine.table.tool.changing.apply'].sudo().search([ # self.env['sf.machine.table.tool.changing.apply'].sudo().search([
('id', '=', functional_tool_assembly.sf_machine_table_tool_changing_apply_id.id) # ('id', '=', functional_tool_assembly.sf_machine_table_tool_changing_apply_id.id)
]).write({'status': '3'}) # ]).write({'status': '3'})
elif functional_tool_assembly.sf_cam_work_order_program_knife_plan_id: # elif functional_tool_assembly.sf_cam_work_order_program_knife_plan_id:
# 修改CAM工单程序用刀计划状态 # # 修改CAM工单程序用刀计划状态
cam_plan = self.env['sf.cam.work.order.program.knife.plan'].sudo().search([ # cam_plan = self.env['sf.cam.work.order.program.knife.plan'].sudo().search([
('id', '=', functional_tool_assembly.sf_cam_work_order_program_knife_plan_id.id) # ('id', '=', functional_tool_assembly.sf_cam_work_order_program_knife_plan_id.id)
]) # ])
cam_plan.write({'plan_execute_status': '2'}) # cam_plan.write({'plan_execute_status': '2'})
#
logging.info('功能刀具组装完成！') # logging.info('功能刀具组装完成！')
#
# 关闭弹出窗口 # # 关闭弹出窗口
return {'type': 'ir.actions.act_window_close'} # return {'type': 'ir.actions.act_window_close'}
#
def materials_must_be_judged(self): # def materials_must_be_judged(self):
""" # """
功能刀具组装必填判断 # 功能刀具组装必填判断
""" # """
# 物料必填校验 # # 物料必填校验
if not self.handle_code_id: # if not self.handle_code_id:
raise ValidationError('缺少【刀柄】物料信息！') # raise ValidationError('缺少【刀柄】物料信息！')
if not self.integral_product_id and not self.blade_product_id: # if not self.integral_product_id and not self.blade_product_id:
raise ValidationError('【整体式刀具】和【刀片】必须填写一个！') # raise ValidationError('【整体式刀具】和【刀片】必须填写一个！')
if self.blade_product_id: # if self.blade_product_id:
if not self.bar_product_id and not self.pad_product_id: # if not self.bar_product_id and not self.pad_product_id:
raise ValidationError('【刀盘】和【刀杆】必须填写一个！') # raise ValidationError('【刀盘】和【刀杆】必须填写一个！')
# 组装参数必填校验 # # 组装参数必填校验
if self.after_assembly_functional_tool_length == 0: # if self.after_assembly_functional_tool_length == 0:
raise ValidationError('组装参数信息【伸出长】不能为0！') # raise ValidationError('组装参数信息【伸出长】不能为0！')
if self.after_assembly_max_lifetime_value == 0: # if self.after_assembly_max_lifetime_value == 0:
raise ValidationError('组装参数信息【最大寿命值】不能为0！') # raise ValidationError('组装参数信息【最大寿命值】不能为0！')
if self.after_assembly_alarm_value == 0: # if self.after_assembly_alarm_value == 0:
raise ValidationError('组装参数信息【报警值】不能为0！') # raise ValidationError('组装参数信息【报警值】不能为0！')
# if self.after_assembly_effective_length == 0: # # if self.after_assembly_effective_length == 0:
# raise ValidationError('组装参数信息【有效长】不能为0！！！') # # raise ValidationError('组装参数信息【有效长】不能为0！！！')
# if self.hiding_length == 0: # # if self.hiding_length == 0:
# raise ValidationError('组装参数信息【避空长】不能为0！！！') # # raise ValidationError('组装参数信息【避空长】不能为0！！！')
if self.after_assembly_functional_tool_diameter == 0: # if self.after_assembly_functional_tool_diameter == 0:
raise ValidationError('组装参数信息【刀具直径】不能为0！') # raise ValidationError('组装参数信息【刀具直径】不能为0！')
if self.after_assembly_tool_loading_length == 0: # if self.after_assembly_tool_loading_length == 0:
raise ValidationError('组装参数信息【总长度】不能为0！！！') # raise ValidationError('组装参数信息【总长度】不能为0！！！')
if self.after_assembly_handle_length == 0: # if self.after_assembly_handle_length == 0:
raise ValidationError('组装参数信息【刀柄长度】不能为0！') # raise ValidationError('组装参数信息【刀柄长度】不能为0！')
if self.after_assembly_tool_loading_length < self.after_assembly_handle_length: # if self.after_assembly_tool_loading_length < self.after_assembly_handle_length:
raise ValidationError('组装参数信息【刀柄长度】不能大于【总长度】！') # raise ValidationError('组装参数信息【刀柄长度】不能大于【总长度】！')
#
def get_desc_1(self, stock_lot): # def get_desc_1(self, stock_lot):
return { # return {
'start_preset_bool': False, # 'start_preset_bool': False,
'barcode_id': stock_lot.id, # 'barcode_id': stock_lot.id,
'code': self.code, # 'code': self.code,
'rfid': self.rfid, # 'rfid': self.rfid,
'tool_groups_id': self.after_tool_groups_id.id, # 'tool_groups_id': self.after_tool_groups_id.id,
'handle_code_id': self.handle_code_id.id, # 'handle_code_id': self.handle_code_id.id,
'integral_freight_barcode_id': self.integral_freight_barcode_id.id, # 'integral_freight_barcode_id': self.integral_freight_barcode_id.id,
'integral_lot_id': self.integral_freight_lot_id.lot_id.id, # 'integral_lot_id': self.integral_freight_lot_id.lot_id.id,
'blade_freight_barcode_id': self.blade_freight_barcode_id.id, # 'blade_freight_barcode_id': self.blade_freight_barcode_id.id,
'blade_lot_id': self.blade_freight_lot_id.lot_id.id, # 'blade_lot_id': self.blade_freight_lot_id.lot_id.id,
'bar_freight_barcode_id': self.bar_freight_barcode_id.id, # 'bar_freight_barcode_id': self.bar_freight_barcode_id.id,
'bar_lot_id': self.bar_freight_lot_id.lot_id.id, # 'bar_lot_id': self.bar_freight_lot_id.lot_id.id,
'pad_freight_barcode_id': self.pad_freight_barcode_id.id, # 'pad_freight_barcode_id': self.pad_freight_barcode_id.id,
'pad_lot_id': self.pad_freight_lot_id.lot_id.id, # 'pad_lot_id': self.pad_freight_lot_id.lot_id.id,
'chuck_freight_barcode_id': self.chuck_freight_barcode_id.id, # 'chuck_freight_barcode_id': self.chuck_freight_barcode_id.id,
'chuck_lot_id': self.chuck_freight_lot_id.lot_id.id, # 'chuck_lot_id': self.chuck_freight_lot_id.lot_id.id,
#
'after_assembly_functional_tool_name': self.after_assembly_functional_tool_name, # 'after_assembly_functional_tool_name': self.after_assembly_functional_tool_name,
'after_assembly_functional_tool_type_id': self.after_assembly_functional_tool_type_id.id, # 'after_assembly_functional_tool_type_id': self.after_assembly_functional_tool_type_id.id,
'after_assembly_functional_tool_diameter': self.after_assembly_functional_tool_diameter, # 'after_assembly_functional_tool_diameter': self.after_assembly_functional_tool_diameter,
'after_assembly_knife_tip_r_angle': self.after_assembly_knife_tip_r_angle, # 'after_assembly_knife_tip_r_angle': self.after_assembly_knife_tip_r_angle,
'after_assembly_new_former': self.after_assembly_new_former, # 'after_assembly_new_former': self.after_assembly_new_former,
'cut_time': self.cut_time, # 'cut_time': self.cut_time,
'cut_length': self.cut_length, # 'cut_length': self.cut_length,
'cut_number': self.cut_number, # 'cut_number': self.cut_number,
'after_assembly_whether_standard_knife': self.after_assembly_whether_standard_knife, # 'after_assembly_whether_standard_knife': self.after_assembly_whether_standard_knife,
'after_assembly_coarse_middle_thin': self.after_assembly_coarse_middle_thin, # 'after_assembly_coarse_middle_thin': self.after_assembly_coarse_middle_thin,
'after_assembly_max_lifetime_value': self.after_assembly_max_lifetime_value, # 'after_assembly_max_lifetime_value': self.after_assembly_max_lifetime_value,
'after_assembly_alarm_value': self.after_assembly_alarm_value, # 'after_assembly_alarm_value': self.after_assembly_alarm_value,
'after_assembly_used_value': self.after_assembly_used_value, # 'after_assembly_used_value': self.after_assembly_used_value,
'after_assembly_tool_loading_length': self.after_assembly_tool_loading_length, # 'after_assembly_tool_loading_length': self.after_assembly_tool_loading_length,
'after_assembly_handle_length': self.after_assembly_handle_length, # 'after_assembly_handle_length': self.after_assembly_handle_length,
'after_assembly_functional_tool_length': self.after_assembly_functional_tool_length, # 'after_assembly_functional_tool_length': self.after_assembly_functional_tool_length,
'after_assembly_effective_length': self.after_assembly_effective_length, # 'after_assembly_effective_length': self.after_assembly_effective_length,
'L_D_number': self.L_D_number, # 'L_D_number': self.L_D_number,
'hiding_length': self.hiding_length, # 'hiding_length': self.hiding_length,
'assemble_status': '1', # 'assemble_status': '1',
'tool_loading_person': self.env.user.name, # 'tool_loading_person': self.env.user.name,
'image': self.image, # 'image': self.image,
'tool_loading_time': fields.Datetime.now() # 'tool_loading_time': fields.Datetime.now()
} # }
#
def get_desc_2(self, stock_lot, functional_tool_assembly_id): # def get_desc_2(self, stock_lot, functional_tool_assembly_id):
return { # return {
'barcode_id': stock_lot.id, # 'barcode_id': stock_lot.id,
'code': self.code, # 'code': self.code,
'name': self.after_name_id.name, # 'name': self.after_name_id.name,
'tool_name_id': self.after_name_id.id, # 'tool_name_id': self.after_name_id.id,
'rfid': self.rfid, # 'rfid': self.rfid,
'tool_groups_id': self.after_tool_groups_id.id, # 'tool_groups_id': self.after_tool_groups_id.id,
'functional_tool_name_id': functional_tool_assembly_id.id, # 'functional_tool_name_id': functional_tool_assembly_id.id,
'sf_cutting_tool_type_id': self.after_assembly_functional_tool_type_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_integral_model_id': self.integral_product_id.id,
'cutting_tool_blade_model_id': self.blade_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_cutterbar_model_id': self.bar_product_id.id,
'cutting_tool_cutterpad_model_id': self.pad_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_cutterhandle_model_id': self.handle_product_id.id,
'cutting_tool_cutterhead_model_id': self.chuck_product_id.id, # 'cutting_tool_cutterhead_model_id': self.chuck_product_id.id,
#
'functional_tool_diameter': self.after_assembly_functional_tool_diameter, # 'functional_tool_diameter': self.after_assembly_functional_tool_diameter,
'knife_tip_r_angle': self.after_assembly_knife_tip_r_angle, # 'knife_tip_r_angle': self.after_assembly_knife_tip_r_angle,
'coarse_middle_thin': self.after_assembly_coarse_middle_thin, # 'coarse_middle_thin': self.after_assembly_coarse_middle_thin,
'new_former': self.after_assembly_new_former, # 'new_former': self.after_assembly_new_former,
'tool_loading_length': self.after_assembly_tool_loading_length, # 'tool_loading_length': self.after_assembly_tool_loading_length,
'handle_length': self.after_assembly_handle_length, # 'handle_length': self.after_assembly_handle_length,
'functional_tool_length': self.after_assembly_functional_tool_length, # 'functional_tool_length': self.after_assembly_functional_tool_length,
'effective_length': self.after_assembly_effective_length, # 'effective_length': self.after_assembly_effective_length,
#
'max_lifetime_value': self.after_assembly_max_lifetime_value, # 'max_lifetime_value': self.after_assembly_max_lifetime_value,
'alarm_value': self.after_assembly_alarm_value, # 'alarm_value': self.after_assembly_alarm_value,
'used_value': self.after_assembly_used_value, # 'used_value': self.after_assembly_used_value,
'whether_standard_knife': self.after_assembly_whether_standard_knife, # 'whether_standard_knife': self.after_assembly_whether_standard_knife,
'L_D_number': self.L_D_number, # 'L_D_number': self.L_D_number,
'hiding_length': self.hiding_length, # 'hiding_length': self.hiding_length,
'cut_time': self.cut_time, # 'cut_time': self.cut_time,
'cut_length': self.cut_length, # 'cut_length': self.cut_length,
'cut_number': self.cut_number, # 'cut_number': self.cut_number,
'image': self.image, # 'image': self.image,
} # }
class StockPicking(models.Model):
_inherit = 'stock.picking'
def create_tool_stocking_picking(self, stock_lot, functional_tool_assembly, 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': functional_tool_assembly.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.after_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, tool_assembly_order_id, functional_tool_assembly, 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)

8
sf_tool_management/wizard/wizard_view.xml
View File

@@ -427,10 +427,10 @@
</group> </group>
</sheet> </sheet>
<footer> <footer>
<button string="确定" name="functional_tool_assembly" type="object" class="btn-primary" <!-- <button string="确定" name="functional_tool_assembly" type="object" class="btn-primary"-->
attrs="{'invisible': [('obtain_measurement_status', '=', False),('enable_tool_presetter', '=', True)]}" <!-- attrs="{'invisible': [('obtain_measurement_status', '=', False),('enable_tool_presetter', '=', True)]}"-->
confirm="是否确认申请组装"/> <!-- confirm="是否确认申请组装"/>-->
<button string="取消" class="btn-secondary" special="cancel"/> <!-- <button string="取消" class="btn-secondary" special="cancel"/>-->
</footer> </footer>
</form> </form>
</field> </field>