From c4805c8d8e2d3126c8528f380e849dd6b38adb74 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sat, 15 Apr 2023 21:02:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=9B=B8=E5=85=B3=E6=96=B9=E4=B8=AD?=
 =?UTF-8?q?=E9=80=94=E5=85=A5=E5=8E=82=E6=97=B6=E5=9B=A0=E4=BA=8B=E5=8A=A1?=
 =?UTF-8?q?=E5=BC=95=E5=8F=91=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/rpm/serializers.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/rpm/serializers.py b/apps/rpm/serializers.py
index 9afea63a..dfed379c 100644
--- a/apps/rpm/serializers.py
+++ b/apps/rpm/serializers.py
@@ -250,13 +250,17 @@ class RpjmemberCreateSerializer(CustomModelSerializer):
                 rpjc.save()
             if ins.is_manager:
                 Rpjmember.objects.exclude(id=ins.id).update(is_manager=False)
-            if rpj.state in [Rpj.RPJ_ENTER, Rpj.RPJ_WORKING]: # 如果是待入厂后添加的
-                # 需要执行入厂操作
-                ins.note = '后入厂'
-                ins.save()
+        if rpj.state in [Rpj.RPJ_ENTER, Rpj.RPJ_WORKING]: # 如果是待入厂后添加的
+            # 需要执行入厂操作
+            try:
                 rpj_member_come(ins)
                 rpj_certificate_in(ins)
-                RpjLog.objects.create(rpj=rpj, operation='member_come', remployee=remployee, create_by=self.context['request'].user, reason=validated_data.get('reason', ''))
+                ins.note = '后入厂'
+                ins.save()
+            except Exception:
+                ins.delete()
+                raise
+            RpjLog.objects.create(rpj=rpj, operation='member_come', remployee=remployee, create_by=self.context['request'].user, reason=validated_data.get('reason', ''))
         return ins