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 diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 4bb54548..5c8ecdd6 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 }] @@ -726,8 +727,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,