From 4f9ac16a070f85b28b3139ffd732f32f301aa233 Mon Sep 17 00:00:00 2001 From: hujiaying Date: Wed, 11 Sep 2024 17:48:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92=E6=8E=92?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E5=B7=B2=E5=8F=96=E6=B6=88=E7=9A=84=E4=B8=8D?= =?UTF-8?q?=E5=8D=A0=E7=94=A8=E5=B0=8F=E6=97=B6=E6=88=96=E6=97=A5=E4=BA=A7?= =?UTF-8?q?=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_workcenter.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sf_manufacturing/models/mrp_workcenter.py b/sf_manufacturing/models/mrp_workcenter.py index 4a9af4c7..017f89b8 100644 --- a/sf_manufacturing/models/mrp_workcenter.py +++ b/sf_manufacturing/models/mrp_workcenter.py @@ -207,7 +207,8 @@ class ResWorkcenter(models.Model): date_planned_end = date_planned_end.strftime('%Y-%m-%d') plan_ids = self.env['sf.production.plan'].sudo().search([('date_planned_start', '>=', date_planned_start), ('date_planned_start', '<', - date_planned_end), ('state', '!=', 'draft')]) + date_planned_end), + ('state', 'not in', ['draft', 'cancel'])]) if plan_ids: sum_qty = sum([p.product_qty for p in plan_ids]) if sum_qty >= self.default_capacity: @@ -222,7 +223,8 @@ class ResWorkcenter(models.Model): date_planned_end = date_planned_end.strftime('%Y-%m-%d %H:00:00') plan_ids = self.env['sf.production.plan'].sudo().search([('date_planned_start', '>=', date_planned_start), ('date_planned_start', '<', - date_planned_end), ('state', '!=', 'draft')]) + date_planned_end), + ('state', 'not in', ['draft', 'cancel'])]) if plan_ids: sum_qty = sum([p.product_qty for p in plan_ids])