From 20c6a67f346df75ab25c56f15da5442cbfb8410d Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 6 Jul 2023 15:03:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A7=E4=BD=8D=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=EF=BC=8C=E4=BB=A5=E5=8F=8A=E4=BA=A7=E5=93=81=E6=98=BE?=
 =?UTF-8?q?=E9=9A=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_warehouse/models/model.py | 2 +-
 sf_warehouse/views/view.xml  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py
index cdbaded9..4990d233 100644
--- a/sf_warehouse/models/model.py
+++ b/sf_warehouse/models/model.py
@@ -90,7 +90,7 @@ class SfLocation(models.Model):
                 record.location_status = '占用'
             else:
                 record.product_id = False
-                record.location_status = '空闲'
+                # record.location_status = '空闲'
 
     @api.depends('location_type')
     def _compute_hide_what(self):
diff --git a/sf_warehouse/views/view.xml b/sf_warehouse/views/view.xml
index c0e7f145..f5a41d43 100644
--- a/sf_warehouse/views/view.xml
+++ b/sf_warehouse/views/view.xml
@@ -29,7 +29,7 @@
                         <field name="location_type"/>
                         <field name="channel" attrs="{'invisible': [('hide_shelf', '=', False)], 'required': [('hide_shelf', '!=', False)]}"/>
                         <field name="direction" attrs="{'invisible': [('hide_shelf', '=', False)], 'required': [('hide_shelf', '!=', False)]}"/>
-                        <field name="product_sn_id" attrs="{'invisible': [('hide_location', '=', False)], 'required': [('hide_location', '!=', False)]}"/>
+                        <field name="product_sn_id" attrs="{'invisible': [('hide_location', '=', False)], 'required': [('hide_location', '!=', False), ('location_status', '=', '空闲')]}"/>
 
                     </group>
                     <group>
@@ -38,7 +38,7 @@
                         <field name="shelf_height" attrs="{'invisible': [('hide_shelf', '=', False)], 'required': [('hide_shelf', '!=', False)]}"/>
                         <field name="shelf_layer" attrs="{'invisible': [('hide_shelf', '=', False)], 'required': [('hide_shelf', '!=', False)]}"/>
                         <field name="layer_capacity" attrs="{'invisible': [('hide_shelf', '=', False)], 'required': [('hide_shelf', '!=', False)]}"/>
-                        <field name="product_id" attrs="{'invisible': [('hide_location', '=', False)], 'required': [('hide_location', '!=', False)]}"/>
+                        <field name="product_id" attrs="{'invisible': [('hide_location', '=', False)], 'required': [('hide_location', '!=', False), ('location_status', '=', '空闲')]}"/>
                         <field name="location_status" attrs="{'invisible': [('hide_location', '=', False)], 'required': [('hide_location', '!=', False)]}"/>
 
                     </group>