1、工单tree视图、from视图添加人工编程字段,及人工编程筛选项;2、序列号模型添加根据Rfid搜索的选项;3、修改零件特采接口,优化MES装刀申请接口、优化机床刀库接口;

This commit is contained in:
yuxianghui
2024-04-24 18:33:15 +08:00
parent 9778245ee7
commit 6f2043e7e7
7 changed files with 43 additions and 5 deletions

View File

@@ -63,10 +63,11 @@ class SfMaintenanceEquipment(models.Model):
for data in datas:
maintenance_equipment_id = self.search([('name', '=', data['DeviceId'])])
if maintenance_equipment_id:
tool_id = '%s%s' % (data['ToolId'][0:1], data['ToolId'][1:].zfill(2))
equipment_tool_id = self.env['maintenance.equipment.tool'].sudo().search(
[('equipment_id', '=', maintenance_equipment_id.id), ('code', '=', data['ToolId'])])
[('equipment_id', '=', maintenance_equipment_id.id), ('code', '=', tool_id)])
functional_tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search(
[('rfid', '=', data['RfidCode'])])
[('rfid', '=', str(int(data['RfidCode'])))])
time = None
if data['AddDatetime']:
datatime = str(data['AddDatetime'])

View File

@@ -16,10 +16,11 @@ class CNCprocessing(models.Model):
# token = sf_sync_config['token'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A]
headers = {'Authorization': config['center_control_Authorization']}
crea_url = config['center_control_url'] + "/AutoDeviceApi/ToolLoadInstruct"
# todo
val = {
'DeviceId': knife_plan.machine_table_name,
'RfidCode': knife_plan.sf_functional_tool_assembly_id.rfid,
'ToolId': int(knife_plan.cutter_spacing_code_id.code[1:])
'RfidCode': knife_plan.sf_functional_tool_assembly_id.rfid.zfill(10),
'ToolId': int(knife_plan.cam_cutter_spacing_code[1:])
}
r = requests.post(crea_url, json=val, headers=headers)
ret = r.json()