From 6ae0abac94d17e9882a5a92ef69f7d2a43025225 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 24 Feb 2023 17:47:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E7=A7=8D=E4=B8=8B=E5=8F=91=E6=96=B9?=
=?UTF-8?q?=E5=BC=8F=E5=9D=87=E5=8F=AF=E8=A2=AB=E8=AE=B0=E5=BD=95=EF=BC=8C?=
=?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=B5=8B=E8=AF=95=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_machine_connect/models/ftp_client.py | 15 ++++++++++++---
sf_machine_connect/views/ftp_button.xml | 6 +++---
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/sf_machine_connect/models/ftp_client.py b/sf_machine_connect/models/ftp_client.py
index 63648e67..c0465afa 100644
--- a/sf_machine_connect/models/ftp_client.py
+++ b/sf_machine_connect/models/ftp_client.py
@@ -95,11 +95,18 @@ class FtpButton(models.Model):
# ftp.upload_file(remotepath=file_path_remote, localpath=file_path_local)
# _logger.info("=====================22================")
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_time': 'up_time',
- 'influence_record': 'self.sequence_number',
+ 'delivery_time': up_time,
+ '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:
_logger.info("=====================================", e)
raise UserError('NC下发执行超时, 请检查下发状态')
@@ -369,6 +376,8 @@ class DeliveryRecord(models.Model):
delivery_time = fields.Char(string='下发时间', readonly=True)
influence_record = fields.Char(string='影响记录', readonly=True)
workorder_id = fields.Many2one('mrp.workorder', string='工单')
+ sf_cnc_processing_id = fields.Many2one('sf.cnc.processing', string='NC')
+
# @api.model
# def create(self, values):
diff --git a/sf_machine_connect/views/ftp_button.xml b/sf_machine_connect/views/ftp_button.xml
index b5b3a21b..6e20e0d0 100644
--- a/sf_machine_connect/views/ftp_button.xml
+++ b/sf_machine_connect/views/ftp_button.xml
@@ -14,12 +14,12 @@
+ ("user_permissions","!=",True)]}' optional="hide"/>
-
-
+
+