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

1、注释MES装刀指令接口，删除所以该接口的调用；注释质量检测失败时对零件特采接口的调用；2、序列号模型from界面临时添加按钮，解决工厂录入的有些刀柄序列号存在位数少于10的问题（通过SQL在左侧补零）（已隐藏）；

Browse Source
This commit is contained in:
yuxianghui
2024-04-25 14:02:51 +08:00
parent 6f2043e7e7
commit 9d96e0681c
7 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_tool_management/models/base.py
View File

@@ -258,10 +258,6 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
names = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
return categories.browse(names)
def knife_plan_cnc_processing(self):
# MES装刀指令接口 測試
self.env['sf.cnc.processing'].register_cnc_processing(self)
def apply_for_tooling(self):
"""
申请装刀

35
sf_tool_management/models/mrp_workorder.py
View File

@@ -11,24 +11,23 @@ class CNCprocessing(models.Model):
_description = 'CNC加工用刀检测'
# ==========MES装刀指令接口==========
def register_cnc_processing(self, knife_plan):
config = self.env['res.config.settings'].get_values()
# 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.zfill(10),
'ToolId': int(knife_plan.cam_cutter_spacing_code[1:])
}
r = requests.post(crea_url, json=val, headers=headers)
ret = r.json()
logging.info('register_cnc_processing:%s' % ret)
if ret['Succeed']:
return "MES装刀指令发送成功"
else:
raise ValidationError("MES装刀指令发送失败")
# def register_cnc_processing(self, knife_plan):
# config = self.env['res.config.settings'].get_values()
# # 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"
# val = {
# 'DeviceId': knife_plan.machine_table_name,
# '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()
# logging.info('register_cnc_processing:%s' % ret)
# if ret['Succeed']:
# return "MES装刀指令发送成功"
# else:
# raise ValidationError("MES装刀指令发送失败")
@api.model_create_multi
def create(self, vals):