jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

Browse Source
This commit is contained in:
jinling.yang
2024-05-09 18:29:45 +08:00
parent 38298f4a32 494b6c69da
commit c4609e35a5
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jikimo_frontend/static/src/scss/custom_style.scss
View File

@@ -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 { .o_field_widget.o_readonly_modifier.o_required_modifier.o_field_many2one[name=production_id] .o_form_uri {
font-weight: bold; font-weight: bold;
font-size: 20px; font-size: 20px;
}
// 修改 【批量排程】【配送】 按钮UI
.btn-secondary {
color: #fff;
background-color: #4A4F59;
border-color: #4A4F59;
} }

13
sf_manufacturing/models/mrp_workorder.py
View File

@@ -482,8 +482,9 @@ class ResMrpWorkOrder(models.Model):
'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids, 'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,
route.routing_type, route.routing_type,
production.product_id), production.product_id),
'date_planned_start': False, # 设定初始化值，避免出现变成bool问题
'date_planned_finished': False, 'date_planned_start': datetime.now(),
'date_planned_finished': datetime.now() + timedelta(days=1),
'duration_expected': duration_expected, 'duration_expected': duration_expected,
'duration': 0, 'duration': 0,
'workpiece_delivery_ids': False if not route.routing_type == '装夹预调' else self._json_workpiece_delivery_list( '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, self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,
route.routing_type, route.routing_type,
production.product_id), production.product_id),
'date_planned_start': False, 'date_planned_start': datetime.now(),
'date_planned_finished': False, 'date_planned_finished': datetime.now() + timedelta(days=1),
'duration_expected': 60, 'duration_expected': 60,
'duration': 0 'duration': 0
}] }]
@@ -726,8 +727,8 @@ class ResMrpWorkOrder(models.Model):
'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids, 'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,
route.routing_type, route.routing_type,
production.product_id), production.product_id),
'date_planned_start': False, 'date_planned_start': datetime.now(),
'date_planned_finished': False, 'date_planned_finished': datetime.now() + timedelta(days=1),
'duration_expected': 60, 'duration_expected': 60,
'duration': 0, 'duration': 0,