|
|
@@ -549,7 +549,7 @@
|
|
|
(select
|
|
|
lot_code from biz_lot
|
|
|
where from_id = id) as
|
|
|
- fromName,t1.is_waste_recycling,t1.is_superaddition,t3.is_waste,t1.is_amend,t1.production_plan_detail_id,t2.company_alias,t2.production_plan_no,t2.product_description ,t2.line_number,t3.create_time,t4.dept_name,t4.dept_id,(select lot_code from biz_lot where t3.from_id =biz_lot.id ) as fromCode from biz_daywork t1
|
|
|
+ fromName,t1.is_waste_recycling,t1.is_superaddition,t3.is_waste,t1.is_amend,t1.production_plan_detail_id,t2.company_alias,t2.production_plan_no,t2.product_description ,t2.line_number,t1.create_time,t4.dept_name,t4.dept_id,(select lot_code from biz_lot where t3.from_id =biz_lot.id ) as fromCode from biz_daywork t1
|
|
|
left join biz_production_plan_detail t2 on t1.production_plan_detail_id = t2.id
|
|
|
left join biz_lot t3 on t1.lot_id = t3.id
|
|
|
left join sys_dept t4 on t1.dept_id = t4.dept_id
|
|
|
@@ -578,8 +578,8 @@
|
|
|
<!-- t1.is_waste_recycling = #{flag} OR t1.is_waste = #{flag} OR t1.is_amend = #{flag}-->
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- <if test="startTime != null ">AND t3.create_time > #{startTime}</if>
|
|
|
- <if test="endTime != null ">AND t3.create_time < #{endTime}</if>
|
|
|
+ <if test="startTime != null ">AND t1.create_time > #{startTime}</if>
|
|
|
+ <if test="endTime != null ">AND t1.create_time < #{endTime}</if>
|
|
|
</trim>
|
|
|
order by t1.lot_code asc
|
|
|
</select>
|
