From 6ac7c020bd5824fc638b53e0747e9534b32d11ab Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 30 Dec 2025 14:32:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BB=9F=E4=B8=80=E6=92=A4=E5=9B=9E?=
 =?UTF-8?q?=E5=92=8C=E6=92=A4=E9=94=80=E7=9A=84=E8=A1=A8=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/qm/services.py  | 4 ++--
 apps/qm/views.py     | 2 ++
 apps/wpm/services.py | 4 ++--
 apps/wpm/views.py    | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/qm/services.py b/apps/qm/services.py
index ac7a45dd..8de5259e 100644
--- a/apps/qm/services.py
+++ b/apps/qm/services.py
@@ -184,10 +184,10 @@ def ftestwork_revert(ins: FtestWork):
                     raise ParseError(f'找不到{item.defect.name}的车间库存: {str(e)}')
                 wmx.count = wmx.count - item.count
                 if wmx.count < 0:
-                    raise ParseError("数量不足,撤销失败")
+                    raise ParseError("数量不足,撤回失败")
                 wmx.save()
     else:
-        raise ParseError("该检验工作不支持撤销")
+        raise ParseError("该检验工作不支持撤回")
     ins.submit_user = None
     ins.submit_time = None
     ins.save()
diff --git a/apps/qm/views.py b/apps/qm/views.py
index e0f29ea2..65dc165b 100644
--- a/apps/qm/views.py
+++ b/apps/qm/views.py
@@ -338,6 +338,8 @@ class FtestWorkViewSet(CustomModelViewSet):
         """
         ins:FtestWork = self.get_object()
         if ins.submit_time:
+            if self.request.user != ins.submit_user:
+                raise ParseError('只能由提交人撤回')
             ftestwork_revert(ins)
         else:
             raise ParseError('该检验工作未提交')
diff --git a/apps/wpm/services.py b/apps/wpm/services.py
index 37db83d0..3f296312 100644
--- a/apps/wpm/services.py
+++ b/apps/wpm/services.py
@@ -950,7 +950,7 @@ def handover_revert(handover:Handover, handler:User=None):
     ticket:Ticket = handover.ticket
     if ticket:
         # 首先把ticket改回开始状态
-        WfService.retreat(ticket=ticket, suggestion="撤销交接单", handler=handler, next_handler=handover.create_by)
+        WfService.retreat(ticket=ticket, suggestion="撤回交接单", handler=handler, next_handler=handover.create_by)
     mids = []
     # handover_type = handover.type
     # handover_mtype = handover.mtype
@@ -971,7 +971,7 @@ def handover_revert(handover:Handover, handler:User=None):
         wm = item.wm
         wm_to = item.wm_to
         if wm is None or wm_to is None:
-            raise ParseError('该交接单不支持撤销2!')
+            raise ParseError('该交接单不支持撤回2!')
         if wm == wm_to:
             # 此时是自己交给自己，不需要做任何操作
             pass
diff --git a/apps/wpm/views.py b/apps/wpm/views.py
index 1c18407d..236bd779 100644
--- a/apps/wpm/views.py
+++ b/apps/wpm/views.py
@@ -446,9 +446,9 @@ class MlogViewSet(CustomModelViewSet):
             raise ParseError("该日志存在审批!")
         user = request.user
         if ins.submit_time is None:
-            raise ParseError("日志未提交不可撤销")
+            raise ParseError("日志未提交不可撤回")
         if user != ins.submit_user:
-            raise ParseError("非提交人不可撤销!")
+            raise ParseError("非提交人不可撤回!")
         now = timezone.now()
         mlog_revert(ins, user, now)
         return Response(MlogSerializer(instance=ins).data)