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

Merge branch 'feature/夹具物料搜索' into feature/零件特采接口优化

Browse Source
This commit is contained in:
yuxianghui
2024-03-25 16:51:04 +08:00
parent ee3c0d702d 48cd8399f4
commit 37ea48dbee
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_quality/models/quality.py
View File

@@ -19,7 +19,10 @@ class QualityCheck(models.Model):
# headers = Common.get_headers(self, token, sf_secret_key) # headers = Common.get_headers(self, token, sf_secret_key)
headers = {'Authorization': 'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A'} headers = {'Authorization': 'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A'}
crea_url = "https://x24467i973.zicp.fun/AutoDeviceApi/PartSpecProc" crea_url = "https://x24467i973.zicp.fun/AutoDeviceApi/PartSpecProc"
val = ['0037835872'] origin = self.picking_id.origin
production_id = self.env['mrp.production'].sudo().search([('name', '=', origin)])
rfid = '' if not production_id.workorder_ids else production_id.workorder_ids[-1].rfid_code or ''
val = [rfid]
r = requests.post(crea_url, json=val, headers=headers) r = requests.post(crea_url, json=val, headers=headers)
ret = r.json() ret = r.json()
logging.info('_register_quality_check:%s' % ret) logging.info('_register_quality_check:%s' % ret)
@@ -33,4 +36,5 @@ class QualityCheck(models.Model):
'quality_state': 'fail', 'quality_state': 'fail',
'user_id': self.env.user.id, 'user_id': self.env.user.id,
'control_date': datetime.now()}) 'control_date': datetime.now()})
if self.picking_id and 'WH/MO/' in self.picking_id.origin:
self._register_quality_check() self._register_quality_check()

10
sf_tool_management/models/base.py
View File

@@ -15,7 +15,7 @@ class FunctionalCuttingToolEntity(models.Model):
tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id') tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id')
code = fields.Char('编码') code = fields.Char('编码')
rfid = fields.Char('rfid', readonly=True) rfid = fields.Char('Rfid', readonly=True)
name = fields.Char('名称') name = fields.Char('名称')
functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称', readonly=True) functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称', readonly=True)
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True) barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
@@ -222,7 +222,7 @@ class FunctionalToolWarning(models.Model):
_description = '功能刀具预警' _description = '功能刀具预警'
code = fields.Char('编码', related='functional_tool_name_id.code') code = fields.Char('编码', related='functional_tool_name_id.code')
rfid = fields.Char('rfid', related='functional_tool_name_id.rfid') rfid = fields.Char('Rfid', related='functional_tool_name_id.rfid')
tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id') tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id')
name = fields.Char('名称', invisible=True, readonly=True, related='functional_tool_name_id.name') name = fields.Char('名称', invisible=True, readonly=True, related='functional_tool_name_id.name')
# 机床信息 # 机床信息
@@ -296,7 +296,7 @@ class StockMoveLine(models.Model):
knife_tip_r_angle = fields.Float(string='刀尖R角(mm)') knife_tip_r_angle = fields.Float(string='刀尖R角(mm)')
install_tool_time = fields.Datetime("刀具组装时间", default=fields.Datetime.now()) install_tool_time = fields.Datetime("刀具组装时间", default=fields.Datetime.now())
code = fields.Char('编码') code = fields.Char('编码')
rfid = fields.Char('rfid') rfid = fields.Char('Rfid')
tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组') tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组')
@api.model @api.model
@@ -502,7 +502,7 @@ class MachineTableToolChangingApply(models.Model):
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', store=True, barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', store=True,
domain=[('product_id.name', '=', '功能刀具')], domain=[('product_id.name', '=', '功能刀具')],
related='functional_tool_name_id.barcode_id') related='functional_tool_name_id.barcode_id')
rfid = fields.Char('rfid', related='functional_tool_name_id.rfid') rfid = fields.Char('Rfid', related='functional_tool_name_id.rfid')
functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', domain=[('assemble_status', '=', '1')], functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', domain=[('assemble_status', '=', '1')],
string='功能刀具名称') string='功能刀具名称')
functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', store=True, functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', store=True,
@@ -828,7 +828,7 @@ class FunctionalToolAssembly(models.Model):
obj.name = obj.after_assembly_functional_tool_name obj.name = obj.after_assembly_functional_tool_name
code = fields.Char('功能刀具编码', readonly=True) code = fields.Char('功能刀具编码', readonly=True)
rfid = fields.Char('rfid', readonly=True) rfid = fields.Char('Rfid', readonly=True)
tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', readonly=True) tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', readonly=True)
name = fields.Char(string='名称', readonly=True, compute='_compute_name') name = fields.Char(string='名称', readonly=True, compute='_compute_name')
assembly_order_code = fields.Char(string='组装单编码', readonly=True) assembly_order_code = fields.Char(string='组装单编码', readonly=True)

6
sf_tool_management/wizard/wizard.py
View File

@@ -9,7 +9,7 @@ class ToolChangeRequirementInformation(models.TransientModel):
_description = '换刀需求信息' _description = '换刀需求信息'
code = fields.Char('编码', readonly=True) code = fields.Char('编码', readonly=True)
rfid = fields.Char('rfid', readonly=True) rfid = fields.Char('Rfid', readonly=True)
tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', readonly=True) tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', readonly=True)
name = fields.Char('名称', related='maintenance_equipment_id.name', store=True, readonly=True) name = fields.Char('名称', related='maintenance_equipment_id.name', store=True, readonly=True)
maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='CNC机床', readonly=True) maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='CNC机床', readonly=True)
@@ -323,7 +323,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
# 组装功能刀具参数信息 # 组装功能刀具参数信息
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号') barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号')
rfid = fields.Char('rfid', required=True) rfid = fields.Char('Rfid', required=True)
tool_code = fields.Char(string='功能刀具编码', readonly=True, compute='_compute_tool_code') tool_code = fields.Char(string='功能刀具编码', readonly=True, compute='_compute_tool_code')
after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', compute='_compute_name') after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', compute='_compute_name')
after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model',
@@ -455,7 +455,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
if obj.rfid: if obj.rfid:
tool_entity = self.env['sf.functional.cutting.tool.entity'].sudo().search([('rfid', '=', obj.rfid)]) tool_entity = self.env['sf.functional.cutting.tool.entity'].sudo().search([('rfid', '=', obj.rfid)])
if tool_entity: if tool_entity:
raise ValidationError('【%s】的rfid已被使用，请重新录入！！！' % obj.rfid) raise ValidationError('【%s】的Rfid已被使用，请重新录入！！！' % obj.rfid)
def functional_tool_assembly(self): def functional_tool_assembly(self):
""" """