入库,收货,上架,出库。拣货作业单,拣货单管理,查询BUG修改
This commit is contained in:
@@ -124,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
and a.notice_number = #{noticeNumber}
|
||||
</if>
|
||||
<if test="outOrderNumber != null and outOrderNumber != ''">
|
||||
and a.out_order_number = #{outOrderNumber}
|
||||
and a.out_order_number like concat('%', #{outOrderNumber}, '%')
|
||||
</if>
|
||||
<!-- 出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-拣货中 6-波次中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 -->
|
||||
<if test="status != null ">
|
||||
@@ -151,6 +151,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="auditRemark != null and auditRemark != ''">
|
||||
and a.audit_remark = #{auditRemark}
|
||||
</if>
|
||||
<if test="checkTaskDistribution != null ">
|
||||
and a.check_task_distribution = #{checkTaskDistribution}
|
||||
</if>
|
||||
<if test="auditBy != null ">
|
||||
and a.audit_by = #{auditBy}
|
||||
</if>
|
||||
@@ -265,6 +268,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="createTimeStart != null and createTimeStart != ''">
|
||||
and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeStart}
|
||||
</if>
|
||||
<if test="createTimeEnd != null and createTimeEnd != ''">
|
||||
and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeEnd}
|
||||
</if>
|
||||
<if test="auditTimeStart != null and auditTimeStart != ''">
|
||||
and date_format(a.audit_time,'%Y-%m-%d') >= #{auditTimeStart}
|
||||
</if>
|
||||
<if test="auditTimeEnd != null and auditTimeEnd != ''">
|
||||
and date_format(a.audit_time,'%Y-%m-%d') <= #{auditTimeEnd}
|
||||
</if>
|
||||
<choose>
|
||||
<when test="delFlag != null"> and a.del_flag = #{delFlag} </when>
|
||||
<otherwise> and a.del_flag = 1 </otherwise>
|
||||
|
||||
Reference in New Issue
Block a user