|
@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
from biz_taks_stock_lot t1
|
|
from biz_taks_stock_lot t1
|
|
<trim prefix=" WHERE" suffix="" suffixOverrides="AND">
|
|
<trim prefix=" WHERE" suffix="" suffixOverrides="AND">
|
|
t1.deleted = 0 and t1.dept_id = #{deptId} and t1.take_stock_period_id = #{takeStockPeriodId} and t1.daywork_id != 0
|
|
t1.deleted = 0 and t1.dept_id = #{deptId} and t1.take_stock_period_id = #{takeStockPeriodId} and t1.daywork_id != 0
|
|
- and t1.is_waste = 0
|
|
|
|
|
|
+ and t1.is_waste = 0 and t1.status <2
|
|
<if test="keywords != null and keywords != ''"> AND t1.lot_code LIKE CONCAT('%',#{keywords},'%')
|
|
<if test="keywords != null and keywords != ''"> AND t1.lot_code LIKE CONCAT('%',#{keywords},'%')
|
|
<!-- OR-->
|
|
<!-- OR-->
|
|
<!-- t1.daywork_id in (select daywork_id from-->
|
|
<!-- t1.daywork_id in (select daywork_id from-->
|