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

调整记录匹配条件；优化排程单状态变化

Browse Source
This commit is contained in:
mgw
2024-09-23 14:29:52 +08:00
parent 15981aadf1
commit e9ab4270a9
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sf_machine_connect/controllers/controllers.py
View File

@@ -489,11 +489,14 @@ class Sf_Dashboard_Connect(http.Controller):
for time_interval in time_intervals: for time_interval in time_intervals:
start_time, end_time = time_interval start_time, end_time = time_interval
# print(start_time, end_time)
orders = plan_obj.search([('production_line_id.name', '=', line), ('state', 'in', ['finished']), orders = plan_obj.search([
(date_field_name, '>=', start_time.strftime('%Y-%m-%d 00:00:00')), ('production_line_id.name', '=', line),
(date_field_name, '<', end_time.strftime('%Y-%m-%d 00:00:00')) ('state', 'in', ['finished']),
]) (date_field_name, '>=', start_time.strftime('%Y-%m-%d %H:%M:%S')),
(date_field_name, '<=', end_time.strftime('%Y-%m-%d %H:%M:%S')) # 包括结束时间
])
# 使用小时和分钟作为键，确保每个小时的数据有独立的键 # 使用小时和分钟作为键，确保每个小时的数据有独立的键
key = start_time.strftime('%H:%M:%S') # 只取小时:分钟:秒作为键 key = start_time.strftime('%H:%M:%S') # 只取小时:分钟:秒作为键
time_count_dict[key] = len(orders) time_count_dict[key] = len(orders)

6
sf_manufacturing/models/mrp_workorder.py
View File

@@ -1082,6 +1082,12 @@ class ResMrpWorkOrder(models.Model):
# 重写工单开始按钮方法 # 重写工单开始按钮方法
def button_start(self): def button_start(self):
if self.routing_type == 'CNC加工':
self.env['sf.production.plan'].sudo().search([('name', '=', self.production_id.name)]).write({
'state': 'processing',
'actual_start_time': datetime.now()
})
if self.routing_type == '装夹预调': if self.routing_type == '装夹预调':
# 判断是否有坯料的序列号信息 # 判断是否有坯料的序列号信息
boolean = False boolean = False