|
|
@@ -474,10 +474,10 @@
|
|
|
) AS original_carrier
|
|
|
FROM biz_daywork t1
|
|
|
LEFT JOIN biz_product t2 ON t1.product_id = t2.id
|
|
|
- LEFT JOIN biz_technological_process t3 ON t1.technological_process_id=t3.id
|
|
|
+ LEFT JOIN biz_lot t3 ON t1.lot_id=t3.id
|
|
|
left join biz_production_plan_detail t4 on t1.production_plan_detail_id = t4.id
|
|
|
<trim prefix=" WHERE" suffix="" suffixOverrides="AND">
|
|
|
- t1.deleted = 0
|
|
|
+ t1.deleted = 0 and t3.deleted = 0
|
|
|
<if test="tenantId != null and tenantId != 0">AND t1.tenant_id = #{tenantId}</if>
|
|
|
<if test="dayworkIds != null and dayworkIds.size > 0">
|
|
|
AND t1.id IN
|
|
|
@@ -525,7 +525,7 @@
|
|
|
) AS original_carrier
|
|
|
FROM biz_daywork t1
|
|
|
LEFT JOIN biz_product t2 ON t1.product_id = t2.id
|
|
|
- LEFT JOIN biz_technological_process t3 ON t1.technological_process_id=t3.id
|
|
|
+ LEFT JOIN biz_lot t3 ON t1.lot_id=t3.id
|
|
|
left join biz_production_plan_detail t4 on t1.production_plan_detail_id = t4.id
|
|
|
<trim prefix=" WHERE" suffix="" suffixOverrides="AND">
|
|
|
t1.deleted = 0
|
