Compare commits
2 Commits
7fc87580d7
...
a033aa2b5e
| Author | SHA1 | Date |
|---|---|---|
|
|
a033aa2b5e | |
|
|
d989bbc299 |
|
|
@ -65,6 +65,9 @@
|
||||||
<tr>
|
<tr>
|
||||||
<td><span>数量: <span style="display: inline;" th:text="${item.printNum}"></span></span></td>
|
<td><span>数量: <span style="display: inline;" th:text="${item.printNum}"></span></span></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><span>批次号: <span style="display: inline;" th:text="${item.batchNo}"></span></span></td>
|
||||||
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ public class StructuralPackageOrderSearchQO extends SearchBaseQO {
|
||||||
private String externalOrderNo;
|
private String externalOrderNo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 机台id
|
* 机台编号
|
||||||
*/
|
*/
|
||||||
private Long workbenchId;
|
private String workbenchCode;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -23,8 +23,8 @@
|
||||||
<if test="request.externalOrderNo!=null and request.externalOrderNo!=''">
|
<if test="request.externalOrderNo!=null and request.externalOrderNo!=''">
|
||||||
and o.external_order_no=#{request.externalOrderNo}
|
and o.external_order_no=#{request.externalOrderNo}
|
||||||
</if>
|
</if>
|
||||||
<if test="request.workbenchId!=null">
|
<if test="request.workbenchCode!=null and request.workbenchCode!=''">
|
||||||
and o.workbench_id=#{request.workbenchId}
|
and wb."no" ilike concat('%', #{request.workbenchCode}, '%')
|
||||||
</if>
|
</if>
|
||||||
<if test="request.startDate!=null">
|
<if test="request.startDate!=null">
|
||||||
and o.create_time>= #{request.startDate}
|
and o.create_time>= #{request.startDate}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue