Compare commits

...

2 Commits

Author SHA1 Message Date
曹鹏飞 a033aa2b5e feat: bug-739 钢构件搜索的机台号改为通过机台编号模糊搜索 2025-09-25 10:57:30 +08:00
曹鹏飞 d989bbc299 feat: bug-200 整张打印添加行:批次号 2025-09-25 10:48:28 +08:00
3 changed files with 7 additions and 4 deletions

View File

@ -65,6 +65,9 @@
<tr>
<td><span>数量: <span style="display: inline;" th:text="${item.printNum}"></span></span></td>
</tr>
<tr>
<td><span>批次号: <span style="display: inline;" th:text="${item.batchNo}"></span></span></td>
</tr>
</table>
</div>
</div>

View File

@ -26,7 +26,7 @@ public class StructuralPackageOrderSearchQO extends SearchBaseQO {
private String externalOrderNo;
/**
* 机台id
* 机台编号
*/
private Long workbenchId;
private String workbenchCode;
}

View File

@ -23,8 +23,8 @@
<if test="request.externalOrderNo!=null and request.externalOrderNo!=''">
and o.external_order_no=#{request.externalOrderNo}
</if>
<if test="request.workbenchId!=null">
and o.workbench_id=#{request.workbenchId}
<if test="request.workbenchCode!=null and request.workbenchCode!=''">
and wb."no" ilike concat('%', #{request.workbenchCode}, '%')
</if>
<if test="request.startDate!=null">
and o.create_time>= #{request.startDate}