Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化刀具基本参数同步
# Conflicts: # sf_dlm_management/views/product_template_management_view.xml
This commit is contained in:
jinling.yang
@@ -23,12 +23,11 @@ class Sf_Mrs_Connect(http.Controller):
|
||||
ret = json.loads(datas)
|
||||
ret = json.loads(ret['result'])
|
||||
# 查询状态为进行中且类型为获取CNC加工程序的工单
|
||||
cnc_workorder = request.env['mrp.workorder'].with_user(
|
||||
request.env.ref("base.user_admin")).search([('production_id.name', '=', ret['production_order_no']),
|
||||
('routing_type', '=', '获取CNC加工程序'),
|
||||
('state', '=', 'progress')])
|
||||
if cnc_workorder:
|
||||
cnc_workorder.glb_file = base64.b64encode(ret['glb_file'])
|
||||
cnc_production = request.env['mrp.production'].with_user(
|
||||
request.env.ref("base.user_admin")).search([('name', '=', ret['production_order_no'])])
|
||||
if cnc_production:
|
||||
if ret['glb_file']:
|
||||
cnc_production.glb_file = base64.b64encode(ret['glb_file'])
|
||||
# 拉取所有加工面的程序文件
|
||||
# i = 1
|
||||
for r in ret['processing_panel']:
|
||||
@@ -37,10 +36,10 @@ class Sf_Mrs_Connect(http.Controller):
|
||||
ret['folder_name'], r)
|
||||
if not download_state:
|
||||
res['status'] = -2
|
||||
res['message'] = '制造订单号为%s的CNC程序文件从FTP拉取失败' % (cnc_workorder.production_id.name)
|
||||
res['message'] = '制造订单号为%s的CNC程序文件从FTP拉取失败' % (cnc_production.name)
|
||||
return json.JSONEncoder().encode(res)
|
||||
request.env['sf.cnc.processing'].with_user(
|
||||
request.env.ref("base.user_admin")).cnc_processing_create(cnc_workorder, ret)
|
||||
request.env.ref("base.user_admin")).cnc_processing_create(cnc_production, ret)
|
||||
return json.JSONEncoder().encode(res)
|
||||
else:
|
||||
res = {'status': 0, 'message': '该制造订单暂未开始'}
|
||||
|
||||
@@ -1466,6 +1466,39 @@ class SyncFixtureModel(models.Model):
|
||||
for item in result['fixture_model_yesterday_list']:
|
||||
if item:
|
||||
fixture_model = self.search([("code", '=', item['code'])])
|
||||
zero_chuck_list = []
|
||||
for zero_chuck_id in item['zero_chuck_ids']:
|
||||
zero_chuck_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_zero_chuck_param(zero_chuck_id))
|
||||
zero_tray_list = []
|
||||
for zero_tray_id in item['zero_tray_ids']:
|
||||
zero_tray_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_zero_tray_param(zero_tray_id))
|
||||
pneumatic_fixture_list = []
|
||||
for pneumatic_fixture_id in item['pneumatic_fixture_ids']:
|
||||
pneumatic_fixture_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_pneumatic_fixture_param(
|
||||
pneumatic_fixture_id))
|
||||
jaw_vice_fixture_list = []
|
||||
for jaw_vice_fixture_id in item['jaw_vice_fixture_ids']:
|
||||
jaw_vice_fixture_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_jaw_vice_fixture_param(
|
||||
jaw_vice_fixture_id))
|
||||
magnet_fixture_list = []
|
||||
for magnet_fixture_id in item['magnet_fixture_ids']:
|
||||
magnet_fixture_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_magnet_fixture_param(
|
||||
magnet_fixture_id))
|
||||
adapter_board_fixture_list = []
|
||||
for adapter_board_fixture_id in item['adapter_board_fixture_ids']:
|
||||
adapter_board_fixture_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_adapter_board_fixture_param(
|
||||
adapter_board_fixture_id))
|
||||
scroll_chuck_list = []
|
||||
for scroll_chuck_id in item['scroll_chuck_ids']:
|
||||
scroll_chuck_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_scroll_chuck_param(
|
||||
scroll_chuck_id))
|
||||
if not fixture_model:
|
||||
self.create({
|
||||
"name": item['name'],
|
||||
@@ -1475,56 +1508,35 @@ class SyncFixtureModel(models.Model):
|
||||
"multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
|
||||
[('code', '=', item['multi_mounting_type_code'])]).id,
|
||||
"brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
|
||||
"clamping_way": item['clamping_way'],
|
||||
"port_type": item['port_type'],
|
||||
"model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
|
||||
"length": item['length'],
|
||||
"width": item['width'],
|
||||
"height": item['height'],
|
||||
"weight": item['weight'],
|
||||
"clamp_workpiece_length_max": item['clamp_workpiece_length_max'],
|
||||
"clamp_workpiece_width_max": item['clamp_workpiece_width_max'],
|
||||
"clamp_workpiece_height_max": item['clamp_workpiece_height_max'],
|
||||
"clamp_workpiece_diameter_max": item['clamp_workpiece_diameter_max'],
|
||||
"maximum_carrying_weight": item['maximum_carrying_weight'],
|
||||
"maximum_clamping_force": item['maximum_clamping_force'],
|
||||
"materials_model_id": self.env['sf.materials.model'].search(
|
||||
[('materials_no', '=', item['materials_model_code'])]).id,
|
||||
"driving_way": item['driving_way'],
|
||||
"apply_machine_tool_type_ids": self.env['sf.machine_tool.type'].sudo()._get_ids(
|
||||
item['apply_machine_tool_type_code']),
|
||||
"through_hole_size": item['through_hole_size'],
|
||||
"screw_size": item['screw_size'],
|
||||
"zero_chuck_ids": zero_chuck_list,
|
||||
"zero_tray_ids": zero_tray_list,
|
||||
"pneumatic_fixture_ids": pneumatic_fixture_list,
|
||||
"jaw_vice_fixture_ids": jaw_vice_fixture_list,
|
||||
"magnet_fixture_ids": magnet_fixture_list,
|
||||
"adapter_board_fixture_ids": adapter_board_fixture_list,
|
||||
"scroll_chuck_ids": scroll_chuck_list,
|
||||
"status": item['status'],
|
||||
"active": item['active'],
|
||||
})
|
||||
else:
|
||||
fixture_model.write({
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"fixture_material_id": self.env['sf.fixture.material'].search(
|
||||
[('code', '=', item['fixture_material_code'])]).id,
|
||||
"multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
|
||||
[('code', '=', item['multi_mounting_type_code'])]).id,
|
||||
"brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
|
||||
"clamping_way": item['clamping_way'],
|
||||
"port_type": item['port_type'],
|
||||
"model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
|
||||
"length": item['length'],
|
||||
"width": item['width'],
|
||||
"height": item['height'],
|
||||
"weight": item['weight'],
|
||||
"clamp_workpiece_length_max": item['clamp_workpiece_length_max'],
|
||||
"clamp_workpiece_width_max": item['clamp_workpiece_width_max'],
|
||||
"clamp_workpiece_height_max": item['clamp_workpiece_height_max'],
|
||||
"clamp_workpiece_diameter_max": item['clamp_workpiece_diameter_max'],
|
||||
"maximum_carrying_weight": item['maximum_carrying_weight'],
|
||||
"maximum_clamping_force": item['maximum_clamping_force'],
|
||||
"materials_model_id": self.env['sf.materials.model'].search(
|
||||
[('materials_no', '=', item['materials_model_code'])]).id,
|
||||
"driving_way": item['driving_way'],
|
||||
"apply_machine_tool_type_ids": self.env['sf.machine_tool.type'].sudo()._get_ids(
|
||||
item['apply_machine_tool_type_code']),
|
||||
"through_hole_size": item['through_hole_size'],
|
||||
"screw_size": item['screw_size'],
|
||||
"zero_chuck_ids": zero_chuck_list,
|
||||
"zero_tray_ids": zero_tray_list,
|
||||
"pneumatic_fixture_ids": pneumatic_fixture_list,
|
||||
"jaw_vice_fixture_ids": jaw_vice_fixture_list,
|
||||
"magnet_fixture_ids": magnet_fixture_list,
|
||||
"adapter_board_fixture_ids": adapter_board_fixture_list,
|
||||
"scroll_chuck_ids": scroll_chuck_list,
|
||||
"status": item['status'],
|
||||
"active": item['active'],
|
||||
})
|
||||
else:
|
||||
@@ -1544,6 +1556,39 @@ class SyncFixtureModel(models.Model):
|
||||
for item in result['fixture_model_all_list']:
|
||||
if item:
|
||||
fixture_model = self.search([("code", '=', item['code'])])
|
||||
zero_chuck_list = []
|
||||
for zero_chuck_id in item['zero_chuck_ids']:
|
||||
zero_chuck_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_zero_chuck_param(zero_chuck_id))
|
||||
zero_tray_list = []
|
||||
for zero_tray_id in item['zero_tray_ids']:
|
||||
zero_tray_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_zero_tray_param(zero_tray_id))
|
||||
pneumatic_fixture_list = []
|
||||
for pneumatic_fixture_id in item['pneumatic_fixture_ids']:
|
||||
pneumatic_fixture_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_pneumatic_fixture_param(
|
||||
pneumatic_fixture_id))
|
||||
jaw_vice_fixture_list = []
|
||||
for jaw_vice_fixture_id in item['jaw_vice_fixture_ids']:
|
||||
jaw_vice_fixture_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_jaw_vice_fixture_param(
|
||||
jaw_vice_fixture_id))
|
||||
magnet_fixture_list = []
|
||||
for magnet_fixture_id in item['magnet_fixture_ids']:
|
||||
magnet_fixture_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_magnet_fixture_param(
|
||||
magnet_fixture_id))
|
||||
adapter_board_fixture_list = []
|
||||
for adapter_board_fixture_id in item['adapter_board_fixture_ids']:
|
||||
adapter_board_fixture_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_adapter_board_fixture_param(
|
||||
adapter_board_fixture_id))
|
||||
scroll_chuck_list = []
|
||||
for scroll_chuck_id in item['scroll_chuck_ids']:
|
||||
scroll_chuck_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_scroll_chuck_param(
|
||||
scroll_chuck_id))
|
||||
if not fixture_model:
|
||||
self.create({
|
||||
"name": item['name'],
|
||||
@@ -1553,56 +1598,35 @@ class SyncFixtureModel(models.Model):
|
||||
"multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
|
||||
[('code', '=', item['multi_mounting_type_code'])]).id,
|
||||
"brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
|
||||
"clamping_way": item['clamping_way'],
|
||||
"port_type": item['port_type'],
|
||||
"model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
|
||||
"length": item['length'],
|
||||
"width": item['width'],
|
||||
"height": item['height'],
|
||||
"weight": item['weight'],
|
||||
"clamp_workpiece_length_max": item['clamp_workpiece_length_max'],
|
||||
"clamp_workpiece_width_max": item['clamp_workpiece_width_max'],
|
||||
"clamp_workpiece_height_max": item['clamp_workpiece_height_max'],
|
||||
"clamp_workpiece_diameter_max": item['clamp_workpiece_diameter_max'],
|
||||
"maximum_carrying_weight": item['maximum_carrying_weight'],
|
||||
"maximum_clamping_force": item['maximum_clamping_force'],
|
||||
"materials_model_id": self.env['sf.materials.model'].search(
|
||||
[('materials_no', '=', item['materials_model_code'])]).id,
|
||||
"driving_way": item['driving_way'],
|
||||
"apply_machine_tool_type_ids": self.env['sf.machine_tool.type'].sudo()._get_ids(
|
||||
item['apply_machine_tool_type_code']),
|
||||
"through_hole_size": item['through_hole_size'],
|
||||
"screw_size": item['screw_size'],
|
||||
"zero_chuck_ids": zero_chuck_list,
|
||||
"zero_tray_ids": zero_tray_list,
|
||||
"pneumatic_fixture_ids": pneumatic_fixture_list,
|
||||
"jaw_vice_fixture_ids": jaw_vice_fixture_list,
|
||||
"magnet_fixture_ids": magnet_fixture_list,
|
||||
"adapter_board_fixture_ids": adapter_board_fixture_list,
|
||||
"scroll_chuck_ids": scroll_chuck_list,
|
||||
"status": item['status'],
|
||||
"active": item['active'],
|
||||
})
|
||||
else:
|
||||
fixture_model.write({
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"fixture_material_id": self.env['sf.fixture.material'].search(
|
||||
[('code', '=', item['fixture_material_code'])]).id,
|
||||
"multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
|
||||
[('code', '=', item['multi_mounting_type_code'])]).id,
|
||||
"brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
|
||||
"clamping_way": item['clamping_way'],
|
||||
"port_type": item['port_type'],
|
||||
"model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
|
||||
"length": item['length'],
|
||||
"width": item['width'],
|
||||
"height": item['height'],
|
||||
"weight": item['weight'],
|
||||
"clamp_workpiece_length_max": item['clamp_workpiece_length_max'],
|
||||
"clamp_workpiece_width_max": item['clamp_workpiece_width_max'],
|
||||
"clamp_workpiece_height_max": item['clamp_workpiece_height_max'],
|
||||
"clamp_workpiece_diameter_max": item['clamp_workpiece_diameter_max'],
|
||||
"maximum_carrying_weight": item['maximum_carrying_weight'],
|
||||
"maximum_clamping_force": item['maximum_clamping_force'],
|
||||
"materials_model_id": self.env['sf.materials.model'].search(
|
||||
[('materials_no', '=', item['materials_model_code'])]).id,
|
||||
"driving_way": item['driving_way'],
|
||||
"apply_machine_tool_type_ids": self.env['sf.machine_tool.type'].sudo()._get_ids(
|
||||
item['apply_machine_tool_type_code']),
|
||||
"through_hole_size": item['through_hole_size'],
|
||||
"screw_size": item['screw_size'],
|
||||
"zero_chuck_ids": zero_chuck_list,
|
||||
"zero_tray_ids": zero_tray_list,
|
||||
"pneumatic_fixture_ids": pneumatic_fixture_list,
|
||||
"jaw_vice_fixture_ids": jaw_vice_fixture_list,
|
||||
"magnet_fixture_ids": magnet_fixture_list,
|
||||
"adapter_board_fixture_ids": adapter_board_fixture_list,
|
||||
"scroll_chuck_ids": scroll_chuck_list,
|
||||
"status": item['status'],
|
||||
"active": item['active'],
|
||||
})
|
||||
else:
|
||||
|
||||
Reference in New Issue
Block a user