From ba8bc4fb721ea5bf8016df3346c2a6141d5eb15f Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 5 Sep 2024 17:50:04 +0800
Subject: [PATCH] fix: handover_submit

---
 apps/wpm/serializers.py | 2 +-
 apps/wpm/services.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py
index 6cd931a4..ec551dd8 100644
--- a/apps/wpm/serializers.py
+++ b/apps/wpm/serializers.py
@@ -582,12 +582,12 @@ class HandoverSerializer(CustomModelSerializer):
         if wm:
             attrs['handoverb'] = [{"wm": wm, "count": attrs["count"] }]
             handoverb = attrs['handoverb']
+            attrs['batch'] = wm.batch
         elif handoverb:
             wm: WMaterial = handoverb[0]["wm"]
         else:
             raise ParseError('必须指定车间库存')
         attrs['material'] = wm.material
-        attrs['batch'] = wm.batch
         attrs['send_dept'] = wm.belong_dept
         if handoverb[0]["wm"].mgroup:
             attrs['send_mgroup'] = handoverb[0]["wm"].mgroup
diff --git a/apps/wpm/services.py b/apps/wpm/services.py
index 60a70e6b..61ccac0e 100644
--- a/apps/wpm/services.py
+++ b/apps/wpm/services.py
@@ -580,7 +580,7 @@ def handover_submit(handover: Handover, user: User, now: Union[datetime.datetime
             if wm_from is None:
                 raise ParseError('找不到车间库存')
         
-            count_x = wm_from.count - handover.count
+            count_x = wm_from.count - xcount
             if count_x < 0:
                 raise ParseError('车间库存不足!')
             else: