From 67f3c312de153e3a779976697b75b89a883725cb Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Thu, 18 Apr 2024 20:46:09 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=BD=9C=E4=B8=9A=E8=AF=A6=E6=83=85=E9=80=89?=
 =?UTF-8?q?=E5=8F=96=E7=9B=AE=E6=A0=87=E8=B4=A7=E4=BD=8D=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_warehouse/models/model.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py
index 718a5877..98a4b513 100644
--- a/sf_warehouse/models/model.py
+++ b/sf_warehouse/models/model.py
@@ -854,12 +854,14 @@ class Sf_stock_move_line(models.Model):
     def _check_destination_location_id(self):
         for item in self:
             if item:
-                line_destination_location_ids = []
-                for obj in item.picking_id.move_line_ids:
-                    if obj.destination_location_id:
-                        line_destination_location_ids.append(obj.destination_location_id.barcode)
-                if item.destination_location_id.barcode in line_destination_location_ids:
-                    raise ValidationError('【%s】货位已经被占用，请重新选择！！！' % item.destination_location_id.barcode)
+                i = 0
+                barcode = item.destination_location_id.barcode
+                for line in item.picking_id.move_line_ids_without_package:
+                    if barcode and barcode == line.destination_location_id.barcode:
+                        i += 1
+                        if i > 1:
+                            raise ValidationError(
+                                '【%s】货位已经被占用，请重新选择！！！' % item.destination_location_id.barcode)
 
 
 class SfStockPicking(models.Model):