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

1.补充agv优化代码

Browse Source 
2.修复刀具物料同步
This commit is contained in:
jinling.yang
2024-04-09 17:10:53 +08:00
parent 8eee9d9173
commit abdb636176
3 changed files with 201 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sf_manufacturing/models/mrp_workorder.py
View File

@@ -974,16 +974,24 @@ class WorkPieceDelivery(models.Model):
# 配送至avg小车
def _delivery_avg(self):
res = {'reqCode': urllib.parse.quote(self.production_id.name), 'reqTime': '', 'clientCode': '', 'tokenCode': '',
'taskTyp': 'F01', 'ctnrTyp': '', 'ctnrCode': '', 'wbCode': '006848AB006774', 'positionCodePath': [],
config = self.env['res.config.settings'].get_values()
agv_site = self.env['res.agv.site'].search([])
positionCode_Arr = []
if agv_site:
for item in agv_site:
positionCode_Arr.append({
'positionCode': item.content,
'code': item.type
})
res = {'reqCode': self.production_id.name, 'reqTime': '', 'clientCode': '', 'tokenCode': '',
'taskTyp': config['task_type_no'], 'ctnrTyp': '', 'ctnrCode': '', 'wbCode': config['wbcode'],
'positionCodePath': positionCode_Arr,
'podCode': '',
'podDir': '', 'materialLot': '', 'priority': '', 'taskCode': '', 'agvCode': '', 'materialLot': '',
'data': ''}
config = self.env['res.config.settings'].get_values()
try:
logging.info('AGV请求路径:%s' % config['agv_rcs_url'])
logging.info('AGV-json:%s' % res)
headers = {'Content-Type': 'application/json'}
ret = requests.post((config['agv_rcs_url']), json=res, headers=headers)
ret = ret.json()

3
sf_mrs_connect/models/res_config_setting.py
View File

@@ -97,6 +97,7 @@ class ResConfigSettings(models.TransientModel):
sf_secret_key = config.get_param('sf_secret_key', default='')
sf_url = config.get_param('sf_url', default='')
agv_rcs_url = config.get_param('agv_rcs_url', default='')
wbcode = config.get_param('wbcode', default='')
agv_code = config.get_param('agv_code', default='')
task_type_no = config.get_param('task_type_no', default='')
ftp_host = config.get_param('ftp_host', default='')
@@ -109,6 +110,7 @@ class ResConfigSettings(models.TransientModel):
sf_secret_key=sf_secret_key,
sf_url=sf_url,
agv_rcs_url=agv_rcs_url,
wbcode=wbcode,
agv_code=agv_code,
task_type_no=task_type_no,
ftp_host=ftp_host,
@@ -125,6 +127,7 @@ class ResConfigSettings(models.TransientModel):
ir_config.set_param("sf_secret_key", self.sf_secret_key or "")
ir_config.set_param("sf_url", self.sf_url or "")
ir_config.set_param("agv_rcs_url", self.agv_rcs_url or "")
ir_config.set_param("wbcode", self.wbcode or "")
ir_config.set_param("agv_code", self.agv_code or "")
ir_config.set_param("task_type_no", self.task_type_no or "")
ir_config.set_param("ftp_host", self.ftp_host or "")

67
sf_mrs_connect/models/sync_common.py
View File

@@ -1952,10 +1952,7 @@ class CuttingSpeed(models.Model):
'active': item['active'],
})
else:
if item['active'] is False:
item.write({'active': False})
else:
self.write({
cutting_speed.write({
'execution_standard_id': self.env['sf.international.standards'].search(
[('code', '=', item['execution_standard_code'])]).id,
'material_name_id': self.env['sf.materials.model'].search(
@@ -1969,7 +1966,8 @@ class CuttingSpeed(models.Model):
'tensile_strength': item['tensile_strength'],
'hardness': item['hardness'],
'cutting_speed': item['cutting_speed'],
'application': item['application'], })
'application': item['application'],
'active': item['active']})
else:
raise ValidationError("切削速度认证未通过")
@@ -2006,10 +2004,7 @@ class CuttingSpeed(models.Model):
'active': item['active'],
})
else:
if item['active'] is False:
item.write({'active': False})
else:
self.write({
cutting_speed.write({
'execution_standard_id': self.env['sf.international.standards'].search(
[('code', '=', item['execution_standard_code'])]).id,
'material_name_id': self.env['sf.materials.model'].search(
@@ -2023,7 +2018,8 @@ class CuttingSpeed(models.Model):
'tensile_strength': item['tensile_strength'],
'hardness': item['hardness'],
'cutting_speed': item['cutting_speed'],
'application': item['application'], })
'application': item['application'],
'active': item['active']})
else:
raise ValidationError("切削速度认证未通过")
@@ -2098,16 +2094,14 @@ class CuttingSpeed(models.Model):
'active': item['active'],
})
else:
if item['active'] is False:
item.write({'active': False})
else:
self.write({
feed_per_tooth.write({
'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(
[('name', '=', item['cutting_width_depth'])]).id,
'blade_diameter': item['blade_diameter'],
'feed_per_tooth': item['feed_per_tooth'], })
'feed_per_tooth': item['feed_per_tooth'],
'active': item['active']})
else:
raise ValidationError("每齿走刀量认证未通过")
@@ -2136,16 +2130,14 @@ class CuttingSpeed(models.Model):
'active': item['active'],
})
else:
if item['active'] is False:
item.write({'active': False})
else:
self.write({
feed_per_tooth.write({
'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(
[('name', '=', item['cutting_width_depth'])]).id,
'blade_diameter': item['blade_diameter'],
'feed_per_tooth': item['feed_per_tooth'], })
'feed_per_tooth': item['feed_per_tooth'],
'active': item['active']})
else:
raise ValidationError("每齿走刀量认证未通过")
@@ -2771,10 +2763,7 @@ class CuttingToolBasicParameters(models.Model):
'active': integral_tool_item['active'],
})
else:
if integral_tool_item['active'] is False:
integral_tool.write({'active': False})
else:
self.write({
integral_tool.write({
'name': integral_tool_item['name'],
'total_length': integral_tool_item['total_length'],
'blade_diameter': integral_tool_item['blade_diameter'],
@@ -2835,10 +2824,7 @@ class CuttingToolBasicParameters(models.Model):
'active': blade_item['active'],
})
else:
if blade_item['active'] is False:
blade.write({'active': False})
else:
self.write({
blade.write({
'name': blade_item['name'],
'length': blade_item['length'],
'thickness': blade_item['thickness'],
@@ -2863,6 +2849,7 @@ class CuttingToolBasicParameters(models.Model):
'blade_tip_height_tolerance': blade_item['tip_height_tolerance'],
'inscribed_circle_tolerance': blade_item['internal_circle_tolerance'],
'thickness_tolerance': blade_item['thickness_tolerance'],
'active': blade_item['active']
})
if 'basic_parameters_chuck' in result['cutting_tool_basic_parameters_yesterday_list']:
if result['cutting_tool_basic_parameters_yesterday_list']['basic_parameters_chuck']:
@@ -2894,10 +2881,7 @@ class CuttingToolBasicParameters(models.Model):
'active': chuck_item['active'],
})
else:
if chuck_item['active'] is False:
chuck.write({'active': False})
else:
self.write({
chuck.write({
'name': chuck_item['name'],
'er_size_model': chuck_item['size_model'],
'min_clamping_diameter': chuck_item['clamping_diameter_min'],
@@ -2911,6 +2895,7 @@ class CuttingToolBasicParameters(models.Model):
'weight': chuck_item['weight'],
'max_load_capacity': chuck_item['load_capacity_max'],
'cooling_jacket': chuck_item['cooling_sleeve_model'],
'active': chuck_item['active']
})
if 'basic_parameters_cutter_arbor' in result['cutting_tool_basic_parameters_yesterday_list']:
if result['cutting_tool_basic_parameters_yesterday_list']['basic_parameters_cutter_arbor']:
@@ -2955,10 +2940,7 @@ class CuttingToolBasicParameters(models.Model):
'active': cutter_arbor_item['active'],
})
else:
if cutter_arbor_item['active'] is False:
cutter_arbor.write({'active': False})
else:
self.write({
cutter_arbor.write({
'name': cutter_arbor_item['name'],
'height': cutter_arbor_item['height'],
'width': cutter_arbor_item['width'],
@@ -2986,6 +2968,7 @@ class CuttingToolBasicParameters(models.Model):
'pressing_plate': cutter_arbor_item['fit_plate_model'],
'screw': cutter_arbor_item['fit_screw_model'],
'spanner': cutter_arbor_item['fit_wrench_model'],
'active': cutter_arbor_item['active']
})
if 'basic_parameters_cutter_head' in result['cutting_tool_basic_parameters_yesterday_list']:
if result['cutting_tool_basic_parameters_yesterday_list']['basic_parameters_cutter_head']:
@@ -3023,10 +3006,7 @@ class CuttingToolBasicParameters(models.Model):
'active': cutter_head_item['active'],
})
else:
if cutter_head_item['active'] is False:
cutter_head.write({'active': False})
else:
self.write({
cutter_head.write({
'name': cutter_head_item['name'],
'install_blade_tip_num': cutter_head_item['number_blade_installed'],
'blade_diameter': cutter_head_item['blade_diameter'],
@@ -3046,6 +3026,7 @@ class CuttingToolBasicParameters(models.Model):
'spanner': cutter_head_item['fit_wrench_model'],
'is_cooling_hole': cutter_head_item['is_cooling_hole'],
'locating_slot_code': cutter_head_item['locator_slot_code'],
'active': cutter_head_item['active']
})
if 'basic_parameters_knife_handle' in result['cutting_tool_basic_parameters_yesterday_list']:
if result['cutting_tool_basic_parameters_yesterday_list']['basic_parameters_knife_handle']:
@@ -3085,10 +3066,7 @@ class CuttingToolBasicParameters(models.Model):
'active': knife_handle_item['active'],
})
else:
if knife_handle_item['active'] is False:
knife_handle.write({'active': False})
else:
self.write({
knife_handle.write({
'name': knife_handle_item['name'],
'total_length': knife_handle_item['total_length'],
'taper_shank_model': knife_handle_item['taper_shank_model'],
@@ -3109,6 +3087,7 @@ class CuttingToolBasicParameters(models.Model):
'screw': knife_handle_item['fit_wrench_model'],
'nut': knife_handle_item['fit_nut_model'],
'dynamic_balance_class': knife_handle_item['dynamic_balance_class'],
'active': knife_handle_item['active']
})
else:
raise ValidationError("刀具物料基本参数认证未通过")