From 6461e3a42379f0d7368175ef8e8c314b9d86dc42 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Thu, 25 Jan 2024 17:36:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A7=E6=9E=B6=E8=B4=A7?= =?UTF-8?q?=E4=BD=8D=E7=9C=8B=E6=9D=BF=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_frontend/static/src/scss/custom_style.scss | 4 ++-- sf_warehouse/models/model.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss index d8e2ab85..12e18c1c 100644 --- a/jikimo_frontend/static/src/scss/custom_style.scss +++ b/jikimo_frontend/static/src/scss/custom_style.scss @@ -79,9 +79,9 @@ td.o_required_modifier { } .oe_kanban_card.kanban_color_1 { - background-color: #27FEA9 !important; + background-color: #fff !important; opacity: 0.7; - color: #fff; + color: #777; } .oe_kanban_card.kanban_color_3 { diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py index a53dae86..bb2e23e5 100644 --- a/sf_warehouse/models/model.py +++ b/sf_warehouse/models/model.py @@ -238,8 +238,8 @@ class ShelfLocation(models.Model): record.storage_time = datetime.datetime.now() if record.location_status == '空闲': record.storage_time = False - else: - pass + if record.location_status == '禁用': + record.storage_time = False name = fields.Char('名称', required=True, size=20) barcode = fields.Char('编码', copy=False, size=15) @@ -309,7 +309,7 @@ class ShelfLocation(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):