|
@@ -21,7 +21,6 @@
|
|
|
left join kxs_machine_advance_info info on info.order_id = a.id
|
|
left join kxs_machine_advance_info info on info.order_id = a.id
|
|
|
<where>
|
|
<where>
|
|
|
and a.del_flag = 0
|
|
and a.del_flag = 0
|
|
|
- and info.is_confirm = 1
|
|
|
|
|
and info.is_return = 0
|
|
and info.is_return = 0
|
|
|
and info.is_apply = 0
|
|
and info.is_apply = 0
|
|
|
and a.warehouse_id = #{warehouseId}
|
|
and a.warehouse_id = #{warehouseId}
|
|
@@ -41,7 +40,6 @@
|
|
|
</if>
|
|
</if>
|
|
|
and b.is_apply = 0
|
|
and b.is_apply = 0
|
|
|
and b.is_return = 0
|
|
and b.is_return = 0
|
|
|
- and b.is_confirm in (0,1)
|
|
|
|
|
group by to_user_id) as warehouse_user
|
|
group by to_user_id) as warehouse_user
|
|
|
|
|
|
|
|
|
|
|
|
@@ -53,7 +51,6 @@
|
|
|
where a.del_flag = 0
|
|
where a.del_flag = 0
|
|
|
and b.is_apply = 0
|
|
and b.is_apply = 0
|
|
|
and b.is_return = 0
|
|
and b.is_return = 0
|
|
|
- and b.is_confirm in (0, 1)
|
|
|
|
|
and a.to_user_id = #{userId}
|
|
and a.to_user_id = #{userId}
|
|
|
</select>
|
|
</select>
|
|
|
<select id="selectToUserList" resultType="java.util.Map">
|
|
<select id="selectToUserList" resultType="java.util.Map">
|
|
@@ -76,7 +73,6 @@
|
|
|
and a.to_user_id = #{toUserId}
|
|
and a.to_user_id = #{toUserId}
|
|
|
and b.is_apply = 0
|
|
and b.is_apply = 0
|
|
|
and b.is_return = 0
|
|
and b.is_return = 0
|
|
|
- and b.is_confirm in (0, 1)
|
|
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<resultMap type="com.kxs.store.api.vo.kxsapp.userAdvance.AdvanceDevModalVO" id="AdvanceDevModalMap">
|
|
<resultMap type="com.kxs.store.api.vo.kxsapp.userAdvance.AdvanceDevModalVO" id="AdvanceDevModalMap">
|
mac