From f3c98c972774f05af9a9bec8edcaf2fe4c300491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E7=84=B1?= Date: Thu, 9 May 2024 11:18:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?//=20=E4=BF=AE=E6=94=B9=20=E3=80=90?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=8E=92=E7=A8=8B=E3=80=91=E3=80=90=E9=85=8D?= =?UTF-8?q?=E9=80=81=E3=80=91=20=E6=8C=89=E9=92=AEUI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_frontend/static/src/scss/custom_style.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss index 73d5ce96..b70cc749 100644 --- a/jikimo_frontend/static/src/scss/custom_style.scss +++ b/jikimo_frontend/static/src/scss/custom_style.scss @@ -496,4 +496,11 @@ div:has(.o_required_modifier) > label::before { .o_field_widget.o_readonly_modifier.o_required_modifier.o_field_many2one[name=production_id] .o_form_uri { font-weight: bold; font-size: 20px; +} + +// 修改 【批量排程】【配送】 按钮UI +.btn-secondary { + color: #fff; + background-color: #4A4F59; + border-color: #4A4F59; } \ No newline at end of file From 138e22255e257d76857725c1ab29d2fc20783ddc Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Thu, 9 May 2024 14:51:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=BA=E5=B7=A5=E5=8D=95=E9=A2=84?= =?UTF-8?q?=E8=AE=A1=E6=97=B6=E9=97=B4=E5=A2=9E=E5=8A=A0=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_workorder.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 817e6421..a486d477 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -482,8 +482,9 @@ class ResMrpWorkOrder(models.Model): 'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids, route.routing_type, production.product_id), - 'date_planned_start': False, - 'date_planned_finished': False, + # 设定初始化值，避免出现变成bool问题 + 'date_planned_start': datetime.now(), + 'date_planned_finished': datetime.now() + timedelta(days=1), 'duration_expected': duration_expected, 'duration': 0, 'workpiece_delivery_ids': False if not route.routing_type == '装夹预调' else self._json_workpiece_delivery_list( @@ -514,8 +515,8 @@ class ResMrpWorkOrder(models.Model): self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids, route.routing_type, production.product_id), - 'date_planned_start': False, - 'date_planned_finished': False, + 'date_planned_start': datetime.now(), + 'date_planned_finished': datetime.now() + timedelta(days=1), 'duration_expected': 60, 'duration': 0 }] @@ -723,8 +724,8 @@ class ResMrpWorkOrder(models.Model): 'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids, route.routing_type, production.product_id), - 'date_planned_start': False, - 'date_planned_finished': False, + 'date_planned_start': datetime.now(), + 'date_planned_finished': datetime.now() + timedelta(days=1), 'duration_expected': 60, 'duration': 0,