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

Accept Merge Request #2256: (feature/6711 -> develop)

Browse Source 
Merge Request: 待完工工单明细，控制时间为大于48小时，小于当前时间

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2256?initial=true
This commit is contained in:
胡尧
2025-06-25 09:43:11 +08:00
committed by Coding
parent 4099756d15 f165bec662
commit 372f95d812
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sf_machine_connect/controllers/controllers.py
View File

@@ -912,17 +912,10 @@ class Sf_Dashboard_Connect(http.Controller):
# ])
not_done_orders = work_order_obj.search(work_order_domain + [
('state', 'in', ['ready', 'progress']),
('date_planned_start', '>=', time_48_hours_ago)
('date_planned_start', '>=', time_48_hours_ago),
('date_planned_start', '<=', current_time)
], order='id asc'
)
# not_done_orders = request.env['mrp.workorder'].sudo().browse(plan_order_messages.mapped('res_id'))
# if line == '业绩总览':
# not_done_orders = not_done_orders.filtered(lambda o: o.routing_type in ['人工线下加工', 'CNC加工'])
# elif line == '人工线下加工中心':
# not_done_orders = not_done_orders.filtered(lambda o: o.routing_type == '人工线下加工')
# else:
# not_done_orders = not_done_orders.filtered(lambda o: o.routing_type == 'CNC加工' and o.production_line_id.name == line)
# 完成订单
# 获取当前时间，并计算24小时前的时间