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

Accept Merge Request #1001: (feature/制造代码优化 -> develop)

Browse Source 
Merge Request: 为工单预计时间增加初始值

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1001?initial=true
This commit is contained in:
马广威
2024-05-09 14:52:39 +08:00
committed by Coding
parent 7200d03733 e2d3b36683
commit 494b6c69da
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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,