更新工单查询

mes/src/main/java/com/ximai/mes/pro/controller/proWorkOrder/ProWorkorderController.java

@@ -109,6 +109,14 @@ public class ProWorkorderController extends BaseController {
     public TableDataInfo<ProWorkorder> scheduleList(ProWorkorderQuery proWorkorder) {
         startPage();
         QueryWrapper<ProWorkorder> query = new QueryWrapper<>();
+        query.like(StringUtils.isNotEmpty(proWorkorder.getOrderCode()), "t1.order_code",
+                proWorkorder.getOrderCode());
+        query.like(StringUtils.isNotEmpty(proWorkorder.getOrderSerial()), "t1.order_serial",
+                proWorkorder.getOrderSerial());
+
+        query.like(StringUtils.isNotEmpty(proWorkorder.getCustomerProjectNo()), "t1.customer_project_no",
+                proWorkorder.getCustomerProjectNo());
+
         query.like(StringUtils.isNotEmpty(proWorkorder.getWorkorderCode()), "t1.workorder_code",
                 proWorkorder.getWorkorderCode());
         query.like(StringUtils.isNotEmpty(proWorkorder.getProductCode()), "t1.product_code",

mes/src/main/java/com/ximai/mes/pro/domain/vo/ProWorkorderQuery.java

@@ -229,9 +229,11 @@ public class ProWorkorderQuery extends BaseEntity {
     private String parentId;
     @ApiModelProperty("订单单号")
     private String orderCode;
-
     @ApiModelProperty("订单序号")
     private String orderSerial;
+    @ApiModelProperty("项目号")
+    private String customerProjectNo;
+
     @TableField(exist = false)
     private List<Long> workorderIds;
 

mes/src/main/resources/mapper/pro/proWorkOrder/ProWorkorderMapper.xml

@@ -130,6 +130,8 @@
             <if test="parentId != null ">and pw.parent_id = #{parentId}</if>
             <if test="status != null  and status != ''">and pw.status = #{status}</if>
             <if test="arrangeCode != null and arrangeCode !=''">and pw.arrange_code = #{arrangeCode}</if>
+            <if test="customerProjectNo != null and customerProjectNo !=''">and pw.customer_project_no = #{customerProjectNo}</if>
+            <if test="orderSerial != null and orderSerial !=''">and pw.order_serial = #{orderSerial}</if>
             <if test="statusArr != null">and pw.status in
                 <foreach item="status" collection="statusArr" open="(" separator="," close=")">
                     #{status}