From 07d854a740504f9a8d02b25c5cc257b293b2010b Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 14 Jan 2025 09:25:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=B4=A8=E6=A3=80=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E4=B8=BA=E8=BF=94=E5=B7=A5=E6=97=B6=EF=BC=8C=E5=88=B6?=
 =?UTF-8?q?=E9=80=A0=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=BA=E8=BF=94=E5=B7=A5=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index f88667a0..96c2ea84 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1284,7 +1284,9 @@ class ResMrpWorkOrder(models.Model):
                                                                          '报废'] or record.is_rework is True else '',
                     'test_results': record.test_results,
                     'test_report': record.detection_report})],
-                                            'is_scrap': True if record.test_results == '报废' else False})
+                                            'is_scrap': True if record.test_results == '报废' else False,
+                                            'state': 'rework' if (record.routing_type != 'CNC加工' and record.test_results == '返工') else record.state
+                                            })
             if record.routing_type == '解除装夹':
                 '''
                 记录结束时间