diff --git a/app/service/systemMethods/order/wave.js b/app/service/systemMethods/order/wave.js index abf04ac..0f5dd3f 100644 --- a/app/service/systemMethods/order/wave.js +++ b/app/service/systemMethods/order/wave.js @@ -4186,7 +4186,10 @@ class WaveService extends OrderBaseService { SUM(CASE WHEN od.print_status = 'fin' THEN 1 ELSE 0 END) AS print_fin_count, SUM(CASE WHEN od.inspection_status = 'fin' THEN 1 ELSE 0 END) AS review_fin_count, SUM(CASE WHEN od.inspection_status = 'error' THEN 1 ELSE 0 END) AS review_error_count, - SUM(CASE WHEN od.inspection_status NOT IN ('fin', 'error') THEN 1 ELSE 0 END) AS review_none_count + SUM(CASE WHEN od.inspection_status NOT IN ('fin', 'error') THEN 1 ELSE 0 END) AS review_none_count, + SUM(CASE WHEN od.pick_status = 'none' THEN 1 ELSE 0 END) AS pick_none_count, + SUM(CASE WHEN od.pick_status = 'fin' THEN 1 ELSE 0 END) AS pick_fin_count, + SUM(CASE WHEN od.pick_status = 'error' THEN 1 ELSE 0 END) AS pick_error_count FROM ( SELECT wave_id FROM wms_wave_batch @@ -4232,7 +4235,10 @@ class WaveService extends OrderBaseService { COALESCE(wave_order_stats.print_fin_count, 0) AS print_fin_count, COALESCE(wave_order_stats.review_fin_count, 0) AS review_fin_count, COALESCE(wave_order_stats.review_error_count, 0) AS review_error_count, - COALESCE(wave_order_stats.review_none_count, 0) AS review_none_count + COALESCE(wave_order_stats.review_none_count, 0) AS review_none_count, + COALESCE(wave_order_stats.pick_none_count, 0) AS pick_none_count, + COALESCE(wave_order_stats.pick_fin_count, 0) AS pick_fin_count, + COALESCE(wave_order_stats.pick_error_count, 0) AS pick_error_count ${batchListFromSql} ORDER BY wb.total_orders DESC, wb.wave_id DESC LIMIT :limit OFFSET :offset @@ -4300,6 +4306,9 @@ class WaveService extends OrderBaseService { const expressErrorCount = Number(batch && batch.post_error_count || 0); const printNoneCount = Number(batch && batch.print_none_count || 0); const printFinCount = Number(batch && batch.print_fin_count || 0); + const pickNoneCount = Number(batch && batch.pick_none_count || 0); + const pickFinCount = Number(batch && batch.pick_fin_count || 0); + const pickErrorCount = Number(batch && batch.pick_error_count || 0); const reviewFinCount = Number(batch && batch.review_fin_count || 0); const reviewErrorCount = Number(batch && batch.review_error_count || 0); const unreviewedOrderCount = orderCount - reviewFinCount; @@ -4341,6 +4350,12 @@ class WaveService extends OrderBaseService { partial: '部分打印', finished: '已打印', }), + pick_assignment_status: this.resolveAssignmentStatus(orderCount, pickNoneCount, pickFinCount, pickErrorCount, { + none: '未拣货', + partial: '部分拣货', + finished: '已拣货', + error: '拣货异常', + }), review_assignment_status: reviewAssignmentStatus, unreviewed_order_count: unreviewedOrderCount, };