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

三种下发方式均可被记录，本地测试成功

Browse Source
This commit is contained in:
mgw
2023-02-24 17:47:28 +08:00
parent 5fbe834528
commit 6ae0abac94
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sf_machine_connect/models/ftp_client.py
View File

@@ -95,11 +95,18 @@ class FtpButton(models.Model):
# ftp.upload_file(remotepath=file_path_remote, localpath=file_path_local) # ftp.upload_file(remotepath=file_path_remote, localpath=file_path_local)
# _logger.info("=====================22================") # _logger.info("=====================22================")
up_time = str(datetime.now()) up_time = str(datetime.now())
self.workorder_id.delivery_records.create({
self.env['delivery.record'].create({
'workorder_id': self.workorder_id.id,
'delivery_type': '单个下发', 'delivery_type': '单个下发',
'delivery_time': 'up_time', 'delivery_time': up_time,
'influence_record': 'self.sequence_number', 'influence_record': self.sequence_number,
}) })
# self.workorder_id.delivery_records.sudo().create({
# 'delivery_type': '单个下发',
# 'delivery_time': 'up_time',
# 'influence_record': 'self.sequence_number',
# })
except Exception as e: except Exception as e:
_logger.info("=====================================", e) _logger.info("=====================================", e)
raise UserError('NC下发执行超时, 请检查下发状态') raise UserError('NC下发执行超时, 请检查下发状态')
@@ -369,6 +376,8 @@ class DeliveryRecord(models.Model):
delivery_time = fields.Char(string='下发时间', readonly=True) delivery_time = fields.Char(string='下发时间', readonly=True)
influence_record = fields.Char(string='影响记录', readonly=True) influence_record = fields.Char(string='影响记录', readonly=True)
workorder_id = fields.Many2one('mrp.workorder', string='工单') workorder_id = fields.Many2one('mrp.workorder', string='工单')
sf_cnc_processing_id = fields.Many2one('sf.cnc.processing', string='NC')
# @api.model # @api.model
# def create(self, values): # def create(self, values):

6
sf_machine_connect/views/ftp_button.xml
View File

@@ -14,12 +14,12 @@
<field name="user_permissions" invisible="1"/> <field name="user_permissions" invisible="1"/>
<field name="state" invisible="1"/> <field name="state" invisible="1"/>
<field name="button_state" attrs='{"invisible": ["|",("state","!=","progress"), <field name="button_state" attrs='{"invisible": ["|",("state","!=","progress"),
("user_permissions","!=",True)]}' optional="show"/> ("user_permissions","!=",True)]}' optional="hide"/>
<!-- <button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序" --> <!-- <button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序" -->
<!-- attrs='{"invisible": ["|",("state","!=","progress"), --> <!-- attrs='{"invisible": ["|",("state","!=","progress"), -->
<!-- ("user_permissions","!=",True)]}'/> --> <!-- ("user_permissions","!=",True)]}'/> -->
<button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序" context="{'default_workorder_id': id}"/> <!-- <button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序" context="{'default_cnc_ids': cnc_ids}"/> -->
<!-- <button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序"/>--> <button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序" context="{'default_sf_cnc_processing_id': id}"/>
<!-- <button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序"--> <!-- <button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序"-->
<!-- />--> <!-- />-->