From 6f3d423da198f28f406cdadf482850fa85c6a79d Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Sat, 18 May 2024 19:52:27 +0800
Subject: [PATCH] =?UTF-8?q?cnc=E5=B7=A5=E5=8D=95=E5=92=8C=E8=A7=A3?=
=?UTF-8?q?=E9=99=A4=E8=A3=85=E5=A4=B9=E5=B7=A5=E5=8D=95=E9=9A=90=E8=97=8F?=
=?UTF-8?q?=E3=80=90=E5=B7=A5=E5=BA=8F=E7=8A=B6=E6=80=81=E3=80=91=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=EF=BC=8C=E8=A3=85=E5=A4=B9=E9=A2=84=E8=B0=83=E5=B7=A5?=
=?UTF-8?q?=E5=8D=95=E5=B7=B2=E5=AE=8C=E6=88=90=E5=90=8E=E3=80=90=E5=B7=A5?=
=?UTF-8?q?=E5=BA=8F=E7=8A=B6=E6=80=81=E3=80=91=E5=AD=97=E6=AE=B5=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E2=80=9C=E8=A3=85=E5=A4=B9=E9=A2=84=E8=B0=83=E5=AE=8C?=
=?UTF-8?q?=E6=88=90=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_manufacturing/models/mrp_workorder.py | 6 +++---
sf_manufacturing/views/mrp_workorder_view.xml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index dee1258a..0c3dac0e 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -154,10 +154,10 @@ class ResMrpWorkOrder(models.Model):
process_state = fields.Selection([
('待装夹', '待装夹'),
('待检测', '待检测'),
- ('待加工', '待加工'),
+ ('待加工', '装夹预调完工'),
('待解除装夹', '待解除装夹'),
('已完工', '已完工'),
- ], string='工序状态', default='待装夹')
+ ], string='工序状态', default='待装夹', readonly='True')
# 加工图纸
processing_drawing = fields.Binary(string='加工图纸', related='production_id.part_drawing')
@@ -841,7 +841,7 @@ class ResMrpWorkOrder(models.Model):
raise UserError("请对前置三元检测定位参数进行计算定位")
if not record.rfid_code:
raise UserError("请扫RFID码进行绑定")
- record.process_state = '待加工'
+ record.process_state = '装夹预调完成'
# record.write({'process_state': '待加工'})
record.production_id.process_state = '待加工'
if record.routing_type == 'CNC加工':
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index f447fd77..94f469ea 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -171,7 +171,7 @@
-
+
计划加工时间