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

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

Browse Source 
Merge Request: 日计划量对工单id去重

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2255?initial=true
This commit is contained in:
胡尧
2025-06-25 08:44:32 +08:00
committed by Coding
parent 91bad533c3 133eac4a5c
commit 4099756d15
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_machine_connect/controllers/controllers.py
View File

@@ -707,9 +707,11 @@ class Sf_Dashboard_Connect(http.Controller):
interval_plan_orders = plan_order_messages.filtered( interval_plan_orders = plan_order_messages.filtered(
lambda o: o.create_date >= start_time lambda o: o.create_date >= start_time
and o.create_date <= end_time and o.create_date <= end_time
) )
interval_orders = request.env['mrp.workorder'].sudo().browse(interval_plan_orders.mapped('res_id')) interval_order_ids = set(interval_plan_orders.mapped('res_id'))
interval_orders = request.env['mrp.workorder'].sudo().browse(interval_order_ids)
if line == '业绩总览': if line == '业绩总览':
interval_orders = interval_orders.filtered(lambda o: o.routing_type in ['人工线下加工', 'CNC加工']) interval_orders = interval_orders.filtered(lambda o: o.routing_type in ['人工线下加工', 'CNC加工'])
elif line == '人工线下加工中心': elif line == '人工线下加工中心':