Merge branch 'refs/heads/develop' into feature/tool_standard_library_process
# Conflicts: # sf_manufacturing/models/mrp_workorder.py
This commit is contained in:
liaodanlong
@@ -61,7 +61,7 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
|
||||
for panel in ret['processing_panel'].split(','):
|
||||
# 查询状态为进行中且工序类型为CNC加工的工单
|
||||
cnc_workorder_has = production.workorder_ids.filtered(
|
||||
lambda ach: ach.routing_type == 'CNC加工' and ach.state not in ['progress', 'done',
|
||||
lambda ach: ach.routing_type in ['CNC加工', '人工线下加工'] and ach.state not in ['progress', 'done',
|
||||
'rework',
|
||||
'cancel'] and ach.processing_panel == panel)
|
||||
if cnc_workorder_has:
|
||||
@@ -76,7 +76,7 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
|
||||
for panel in ret['processing_panel'].split(','):
|
||||
# 查询状态为进行中且工序类型为CNC加工的工单
|
||||
cnc_workorder = productions.workorder_ids.filtered(
|
||||
lambda ac: ac.routing_type == 'CNC加工' and ac.state not in ['progress', 'done', 'rework'
|
||||
lambda ac: ac.routing_type in ['CNC加工', '人工线下加工'] and ac.state not in ['progress', 'done', 'rework'
|
||||
'cancel'] and ac.processing_panel == panel)
|
||||
if cnc_workorder:
|
||||
# program_path_tmp_panel = os.path.join('C://Users//43484//Desktop//fsdownload//test',
|
||||
@@ -91,19 +91,21 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
|
||||
logging.info('panel_file_path:%s' % panel_file_path)
|
||||
cnc_workorder.write({'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
|
||||
pre_workorder = productions.workorder_ids.filtered(
|
||||
lambda ap: ap.routing_type == '装夹预调' and ap.state not in ['done', 'rework'
|
||||
lambda ap: ap.routing_type in ['装夹预调', '人工线下加工'] and ap.state not in ['done', 'rework'
|
||||
'cancel'] and ap.processing_panel == panel)
|
||||
if pre_workorder:
|
||||
pre_workorder.write(
|
||||
{'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())})
|
||||
productions.write({'programming_state': '已编程', 'work_state': '已编程'})
|
||||
productions.filtered(lambda p: p.production_type == '人工线下加工').write({'manual_quotation': True})
|
||||
logging.info('已更新制造订单编程状态:%s' % productions.ids)
|
||||
|
||||
# 对制造订单所有面的cnc工单的程序用刀进行校验
|
||||
try:
|
||||
logging.info(f'已更新制造订单：{productions}')
|
||||
re_tool_chekout = False
|
||||
re_tool_chekout = productions.production_cnc_tool_checkout()
|
||||
productions_temp = productions.filtered(lambda p: p.production_type == '自动化产线加工')
|
||||
re_tool_chekout = productions_temp.production_cnc_tool_checkout()
|
||||
if re_tool_chekout:
|
||||
return json.JSONEncoder().encode({'status': -3, 'message': '对cnc工单的程序用刀进行校验失败'})
|
||||
except Exception as e:
|
||||
@@ -200,6 +202,17 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
|
||||
'send_time': ret['send_time'],
|
||||
})
|
||||
logging.info('已创建无效功能刀具的编程记录:%s' % production.name)
|
||||
elif ret['reprogramming_reason']:
|
||||
production.programming_record_ids.create({
|
||||
'number': len(production.programming_record_ids) + 1,
|
||||
'production_id': production.id,
|
||||
'reason': ret['reprogramming_reason'],
|
||||
'programming_method': ret['programme_way'],
|
||||
'current_programming_count': ret['reprogramming_num'],
|
||||
'target_production_id': productions_reprogram,
|
||||
'apply_time': ret['trigger_time'],
|
||||
'send_time': ret['send_time'],
|
||||
})
|
||||
else:
|
||||
logging.info('无对应状态，不需更新编程记录')
|
||||
|
||||
|
||||
@@ -1988,6 +1988,9 @@ class CuttingSpeed(models.Model):
|
||||
})
|
||||
else:
|
||||
cutting_speed.write({
|
||||
'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
|
||||
[('code', '=', item['standard_library_code'].replace("JKM", result[
|
||||
'factory_short_name']))]).id,
|
||||
'execution_standard_id': self.env['sf.international.standards'].search(
|
||||
[('code', '=', item['execution_standard_code'])]).id,
|
||||
'material_name_id': self.env['sf.materials.model'].search(
|
||||
@@ -2040,6 +2043,9 @@ class CuttingSpeed(models.Model):
|
||||
})
|
||||
else:
|
||||
cutting_speed.write({
|
||||
'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
|
||||
[('code', '=', item['standard_library_code'].replace("JKM", result[
|
||||
'factory_short_name']))]).id,
|
||||
'execution_standard_id': self.env['sf.international.standards'].search(
|
||||
[('code', '=', item['execution_standard_code'])]).id,
|
||||
'material_name_id': self.env['sf.materials.model'].search(
|
||||
@@ -2130,6 +2136,9 @@ class CuttingSpeed(models.Model):
|
||||
})
|
||||
else:
|
||||
feed_per_tooth.write({
|
||||
'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
|
||||
[('code', '=', item['standard_library_code'].replace("JKM", result[
|
||||
'factory_short_name']))]).id,
|
||||
'materials_type_id': self.env['sf.materials.model'].search(
|
||||
[('materials_no', '=', item['materials_type_code'])]).id,
|
||||
'cutting_width_depth_id': self.env['sf.cutting.width.depth'].search(
|
||||
@@ -2168,6 +2177,9 @@ class CuttingSpeed(models.Model):
|
||||
})
|
||||
else:
|
||||
feed_per_tooth.write({
|
||||
'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
|
||||
[('code', '=', item['standard_library_code'].replace("JKM", result[
|
||||
'factory_short_name']))]).id,
|
||||
'materials_type_id': self.env['sf.materials.model'].search(
|
||||
[('materials_no', '=', item['materials_type_code'])]).id,
|
||||
'cutting_width_depth_id': self.env['sf.cutting.width.depth'].search(
|
||||
@@ -2454,6 +2466,11 @@ class CuttingToolBasicParameters(models.Model):
|
||||
else:
|
||||
self.search([('code', '=', integral_tool_item['code'])]).write({
|
||||
'name': integral_tool_item['name'],
|
||||
'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
|
||||
[(
|
||||
'code', '=',
|
||||
integral_tool_item['standard_library_code'].replace("JKM", result[
|
||||
'factory_short_name']))]).id,
|
||||
'total_length': integral_tool_item['total_length'],
|
||||
'blade_diameter': integral_tool_item['blade_diameter'],
|
||||
'blade_length': integral_tool_item['blade_length'],
|
||||
@@ -2516,6 +2533,9 @@ class CuttingToolBasicParameters(models.Model):
|
||||
else:
|
||||
self.search([('code', '=', blade_item['code'])]).write({
|
||||
'name': blade_item['name'],
|
||||
'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
|
||||
[('code', '=', blade_item['standard_library_code'].replace("JKM", result[
|
||||
'factory_short_name']))]).id,
|
||||
'length': blade_item['length'],
|
||||
'thickness': blade_item['thickness'],
|
||||
'cutting_blade_length': blade_item['cutting_blade_length'],
|
||||
@@ -2573,6 +2593,9 @@ class CuttingToolBasicParameters(models.Model):
|
||||
else:
|
||||
self.search([('code', '=', chuck_item['code'])]).write({
|
||||
'name': chuck_item['name'],
|
||||
'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
|
||||
[('code', '=', chuck_item['standard_library_code'].replace("JKM", result[
|
||||
'factory_short_name']))]).id,
|
||||
'er_size_model': chuck_item['size_model'],
|
||||
'min_clamping_diameter': chuck_item['clamping_diameter_min'],
|
||||
'max_clamping_diameter': chuck_item['clamping_diameter_max'],
|
||||
@@ -2632,6 +2655,9 @@ class CuttingToolBasicParameters(models.Model):
|
||||
else:
|
||||
self.search([('code', '=', cutter_arbor_item['code'])]).write({
|
||||
'name': cutter_arbor_item['name'],
|
||||
'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
|
||||
[('code', '=', cutter_arbor_item['standard_library_code'].replace("JKM", result[
|
||||
'factory_short_name']))]).id,
|
||||
'height': cutter_arbor_item['height'],
|
||||
'width': cutter_arbor_item['width'],
|
||||
'total_length': cutter_arbor_item['total_length'],
|
||||
@@ -2697,6 +2723,9 @@ class CuttingToolBasicParameters(models.Model):
|
||||
else:
|
||||
self.search([('code', '=', cutter_head_item['code'])]).write({
|
||||
'name': cutter_head_item['name'],
|
||||
'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
|
||||
[('code', '=', cutter_head_item['standard_library_code'].replace("JKM", result[
|
||||
'factory_short_name']))]).id,
|
||||
'install_blade_tip_num': cutter_head_item['number_blade_installed'],
|
||||
'blade_diameter': cutter_head_item['blade_diameter'],
|
||||
'cutter_head_diameter': cutter_head_item['cutter_diameter'],
|
||||
@@ -2727,6 +2756,9 @@ class CuttingToolBasicParameters(models.Model):
|
||||
[('code', '=', knife_handle_item['code']), ('active', 'in', [True, False])])
|
||||
val = {
|
||||
'name': knife_handle_item['name'],
|
||||
'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
|
||||
[('code', '=', knife_handle_item['standard_library_code'].replace("JKM", result[
|
||||
'factory_short_name']))]).id,
|
||||
'taper_shank_model': knife_handle_item['taper_shank_model'],
|
||||
'total_length': knife_handle_item['total_length'],
|
||||
'flange_shank_length': knife_handle_item['flange_length'],
|
||||
@@ -2751,9 +2783,6 @@ class CuttingToolBasicParameters(models.Model):
|
||||
if not knife_handle:
|
||||
val['code'] = knife_handle_item['code']
|
||||
val['cutting_tool_type'] = '刀柄'
|
||||
val['standard_library_id'] = self.env['sf.cutting_tool.standard.library'].search(
|
||||
[('code', '=', knife_handle_item['standard_library_code'].replace("JKM", result[
|
||||
'factory_short_name']))]).id
|
||||
self.create(val)
|
||||
else:
|
||||
self.search([('code', '=', knife_handle_item['code'])]).write(val)
|
||||
@@ -2809,6 +2838,11 @@ class CuttingToolBasicParameters(models.Model):
|
||||
else:
|
||||
integral_tool.write({
|
||||
'name': integral_tool_item['name'],
|
||||
'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
|
||||
[(
|
||||
'code', '=',
|
||||
integral_tool_item['standard_library_code'].replace("JKM", result[
|
||||
'factory_short_name']))]).id,
|
||||
'total_length': integral_tool_item['total_length'],
|
||||
'blade_diameter': integral_tool_item['blade_diameter'],
|
||||
'blade_length': integral_tool_item['blade_length'],
|
||||
@@ -2871,6 +2905,9 @@ class CuttingToolBasicParameters(models.Model):
|
||||
else:
|
||||
blade.write({
|
||||
'name': blade_item['name'],
|
||||
'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
|
||||
[('code', '=', blade_item['standard_library_code'].replace("JKM", result[
|
||||
'factory_short_name']))]).id,
|
||||
'length': blade_item['length'],
|
||||
'thickness': blade_item['thickness'],
|
||||
'cutting_blade_length': blade_item['cutting_blade_length'],
|
||||
@@ -2928,6 +2965,9 @@ class CuttingToolBasicParameters(models.Model):
|
||||
else:
|
||||
chuck.write({
|
||||
'name': chuck_item['name'],
|
||||
'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
|
||||
[('code', '=', chuck_item['standard_library_code'].replace("JKM", result[
|
||||
'factory_short_name']))]).id,
|
||||
'er_size_model': chuck_item['size_model'],
|
||||
'min_clamping_diameter': chuck_item['clamping_diameter_min'],
|
||||
'max_clamping_diameter': chuck_item['clamping_diameter_max'],
|
||||
@@ -2987,6 +3027,9 @@ class CuttingToolBasicParameters(models.Model):
|
||||
else:
|
||||
cutter_arbor.write({
|
||||
'name': cutter_arbor_item['name'],
|
||||
'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
|
||||
[('code', '=', cutter_arbor_item['standard_library_code'].replace("JKM", result[
|
||||
'factory_short_name']))]).id,
|
||||
'height': cutter_arbor_item['height'],
|
||||
'width': cutter_arbor_item['width'],
|
||||
'total_length': cutter_arbor_item['total_length'],
|
||||
@@ -3053,6 +3096,9 @@ class CuttingToolBasicParameters(models.Model):
|
||||
else:
|
||||
cutter_head.write({
|
||||
'name': cutter_head_item['name'],
|
||||
'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
|
||||
[('code', '=', cutter_head_item['standard_library_code'].replace("JKM", result[
|
||||
'factory_short_name']))]).id,
|
||||
'install_blade_tip_num': cutter_head_item['number_blade_installed'],
|
||||
'blade_diameter': cutter_head_item['blade_diameter'],
|
||||
'cutter_head_diameter': cutter_head_item['cutter_diameter'],
|
||||
@@ -3114,6 +3160,9 @@ class CuttingToolBasicParameters(models.Model):
|
||||
else:
|
||||
knife_handle.write({
|
||||
'name': knife_handle_item['name'],
|
||||
'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
|
||||
[('code', '=', knife_handle_item['standard_library_code'].replace("JKM", result[
|
||||
'factory_short_name']))]).id,
|
||||
'total_length': knife_handle_item['total_length'],
|
||||
'taper_shank_model': knife_handle_item['taper_shank_model'],
|
||||
'flange_shank_length': knife_handle_item['flange_length'],
|
||||
|
||||
Reference in New Issue
Block a user