From 9d96e0681c6976817e436782d23bc1d8d9ef1f78 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Thu, 25 Apr 2024 14:02:51 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B3=A8=E9=87=8AMES=E8=A3=85?=
=?UTF-8?q?=E5=88=80=E6=8C=87=E4=BB=A4=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=88=A0?=
=?UTF-8?q?=E9=99=A4=E6=89=80=E4=BB=A5=E8=AF=A5=E6=8E=A5=E5=8F=A3=E7=9A=84?=
=?UTF-8?q?=E8=B0=83=E7=94=A8=EF=BC=9B=E6=B3=A8=E9=87=8A=E8=B4=A8=E9=87=8F?=
=?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=A4=B1=E8=B4=A5=E6=97=B6=E5=AF=B9=E9=9B=B6?=
=?UTF-8?q?=E4=BB=B6=E7=89=B9=E9=87=87=E6=8E=A5=E5=8F=A3=E7=9A=84=E8=B0=83?=
=?UTF-8?q?=E7=94=A8=EF=BC=9B2=E3=80=81=E5=BA=8F=E5=88=97=E5=8F=B7?=
=?UTF-8?q?=E6=A8=A1=E5=9E=8Bfrom=E7=95=8C=E9=9D=A2=E4=B8=B4=E6=97=B6?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE=EF=BC=8C=E8=A7=A3=E5=86=B3?=
=?UTF-8?q?=E5=B7=A5=E5=8E=82=E5=BD=95=E5=85=A5=E7=9A=84=E6=9C=89=E4=BA=9B?=
=?UTF-8?q?=E5=88=80=E6=9F=84=E5=BA=8F=E5=88=97=E5=8F=B7=E5=AD=98=E5=9C=A8?=
=?UTF-8?q?=E4=BD=8D=E6=95=B0=E5=B0=91=E4=BA=8E10=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98=EF=BC=88=E9=80=9A=E8=BF=87SQL=E5=9C=A8=E5=B7=A6?=
=?UTF-8?q?=E4=BE=A7=E8=A1=A5=E9=9B=B6=EF=BC=89=EF=BC=88=E5=B7=B2=E9=9A=90?=
=?UTF-8?q?=E8=97=8F=EF=BC=89=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_manufacturing/models/stock.py | 7 ++++
sf_manufacturing/views/stock_lot_views.xml | 3 ++
sf_quality/models/quality.py | 14 ++++----
sf_tool_management/models/base.py | 4 ---
sf_tool_management/models/mrp_workorder.py | 35 ++++++++++----------
sf_tool_management/views/tool_base_views.xml | 2 --
sf_tool_management/wizard/wizard.py | 1 -
7 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 94a9d646..df9ed02e 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -269,6 +269,13 @@ class ProductionLot(models.Model):
rfid = fields.Char('Rfid', readonly=True)
product_specification = fields.Char('规格', compute='_compute_product_specification', store=True)
+ def search_lot_put_rfid(self):
+ # 使用SQL将所有刀柄Rfid不满十位的值在前方补零
+ self.env.cr.execute(
+ '''UPDATE stock_lot SET rfid = LPAD(rfid, 10, '0') WHERE rfid IS NOT NULL AND LENGTH(rfid) < 10'''
+ )
+ self.env.cr.commit()
+
@api.depends('product_id')
def _compute_product_specification(self):
for stock in self:
diff --git a/sf_manufacturing/views/stock_lot_views.xml b/sf_manufacturing/views/stock_lot_views.xml
index 87b81802..2aed0d2c 100644
--- a/sf_manufacturing/views/stock_lot_views.xml
+++ b/sf_manufacturing/views/stock_lot_views.xml
@@ -19,6 +19,9 @@
+
+
+
diff --git a/sf_quality/models/quality.py b/sf_quality/models/quality.py
index c738d4e1..6fc04154 100644
--- a/sf_quality/models/quality.py
+++ b/sf_quality/models/quality.py
@@ -31,10 +31,10 @@ class QualityCheck(models.Model):
else:
raise ValidationError("零件特采发送失败")
- def do_fail(self):
- self.write({
- 'quality_state': 'fail',
- 'user_id': self.env.user.id,
- 'control_date': datetime.now()})
- if self.picking_id and 'WH/MO/' in self.picking_id.origin:
- self._register_quality_check()
+ # def do_fail(self):
+ # self.write({
+ # 'quality_state': 'fail',
+ # 'user_id': self.env.user.id,
+ # 'control_date': datetime.now()})
+ # if self.picking_id and 'WH/MO/' in self.picking_id.origin:
+ # self._register_quality_check()
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index e6e5d1eb..ed1cf129 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -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):
"""
申请装刀
diff --git a/sf_tool_management/models/mrp_workorder.py b/sf_tool_management/models/mrp_workorder.py
index b4f420f5..44c4ef95 100644
--- a/sf_tool_management/models/mrp_workorder.py
+++ b/sf_tool_management/models/mrp_workorder.py
@@ -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):
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 1db89ddb..274d3bcc 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -321,8 +321,6 @@
attrs="{'invisible': [('plan_execute_status', '!=', '0')]}" confirm="是否确认申请装刀"/>
-
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index 267e9a32..7a4f1553 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -602,7 +602,6 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
('id', '=', functional_tool_assembly.sf_cam_work_order_program_knife_plan_id.id)
])
cam_plan.write({'plan_execute_status': '2'})
- self.env['sf.cnc.processing'].register_cnc_processing(cam_plan)
# 关闭弹出窗口
return {'type': 'ir.actions.act_window_close'}