From 6f2043e7e72a88253a5355a1cba2709664f2fff5 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 24 Apr 2024 18:33:15 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=B7=A5=E5=8D=95tree=E8=A7=86?=
=?UTF-8?q?=E5=9B=BE=E3=80=81from=E8=A7=86=E5=9B=BE=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E4=BA=BA=E5=B7=A5=E7=BC=96=E7=A8=8B=E5=AD=97=E6=AE=B5=EF=BC=8C?=
=?UTF-8?q?=E5=8F=8A=E4=BA=BA=E5=B7=A5=E7=BC=96=E7=A8=8B=E7=AD=9B=E9=80=89?=
=?UTF-8?q?=E9=A1=B9=EF=BC=9B2=E3=80=81=E5=BA=8F=E5=88=97=E5=8F=B7?=
=?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=B7=BB=E5=8A=A0=E6=A0=B9=E6=8D=AERfid?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=9A=84=E9=80=89=E9=A1=B9=EF=BC=9B3?=
=?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E9=9B=B6=E4=BB=B6=E7=89=B9=E9=87=87?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BC=98=E5=8C=96MES=E8=A3=85?=
=?UTF-8?q?=E5=88=80=E7=94=B3=E8=AF=B7=E6=8E=A5=E5=8F=A3=E3=80=81=E4=BC=98?=
=?UTF-8?q?=E5=8C=96=E6=9C=BA=E5=BA=8A=E5=88=80=E5=BA=93=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/WorkCenterBarcodes.xml | 7 +++++-
.../views/mrp_production_addional_change.xml | 1 +
sf_manufacturing/views/mrp_workorder_view.xml | 5 +++++
sf_manufacturing/views/stock_lot_views.xml | 22 +++++++++++++++++++
sf_quality/models/quality.py | 3 +++
.../models/maintenance_equipment.py | 5 +++--
sf_tool_management/models/mrp_workorder.py | 5 +++--
7 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/sf_machine_connect/views/WorkCenterBarcodes.xml b/sf_machine_connect/views/WorkCenterBarcodes.xml
index 0a0cccd6..d44c8a82 100644
--- a/sf_machine_connect/views/WorkCenterBarcodes.xml
+++ b/sf_machine_connect/views/WorkCenterBarcodes.xml
@@ -10,6 +10,7 @@
+
@@ -19,7 +20,11 @@
-
+
+
+
+
+
\ No newline at end of file
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 6ba78573..3cc85e64 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -66,6 +66,7 @@
+
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 0cc541e7..37174039 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -23,6 +23,9 @@
+
+
+
@@ -173,6 +176,8 @@
attrs="{'invisible': [('production_state','=', 'draft')], 'readonly': [('is_user_working', '=', True)]}"
sum="real duration"/>
+
+
+
+ stock.production.lot.view
+ stock.lot
+
+
+
+
+
+
+
+
+
+ stock.production.lot.tree.inherit.product.expiry
+ stock.lot
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sf_quality/models/quality.py b/sf_quality/models/quality.py
index 92914344..c738d4e1 100644
--- a/sf_quality/models/quality.py
+++ b/sf_quality/models/quality.py
@@ -20,6 +20,9 @@ class QualityCheck(models.Model):
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]
+ # todo 需修改
+ val = ['0037818516']
+ logging.info('获取到的工单信息%s' % val)
r = requests.post(crea_url, json=val, headers=headers)
ret = r.json()
logging.info('_register_quality_check:%s' % ret)
diff --git a/sf_tool_management/models/maintenance_equipment.py b/sf_tool_management/models/maintenance_equipment.py
index fef6c67c..135bf200 100644
--- a/sf_tool_management/models/maintenance_equipment.py
+++ b/sf_tool_management/models/maintenance_equipment.py
@@ -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'])
diff --git a/sf_tool_management/models/mrp_workorder.py b/sf_tool_management/models/mrp_workorder.py
index 45ddb317..b4f420f5 100644
--- a/sf_tool_management/models/mrp_workorder.py
+++ b/sf_tool_management/models/mrp_workorder.py
@@ -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()