更新排产查询增加项目号订单号查询字段

mes/src/main/java/com/ximai/mes/pro/domain/task/ProTaskWorkunit.java

@@ -195,4 +195,10 @@ public class ProTaskWorkunit extends BaseEntity {
     private BigDecimal quantityWait;
 
     private int percent;
+
+
+    @ApiModelProperty("订单单号")
+    private String orderCode;
+    @ApiModelProperty("项目号")
+    private String customerProjectNo;
 }

mes/src/main/java/com/ximai/mes/pro/domain/vo/task/ProTaskWorkunitQuery.java

@@ -86,7 +86,10 @@ public class ProTaskWorkunitQuery extends BaseEntity {
     private String workunitName;
 
     private String workorderCode;
-
+    @ApiModelProperty("订单单号")
+    private String orderCode;
+    @ApiModelProperty("项目号")
+    private String customerProjectNo;
     @ApiModelProperty("是否委外,1:是，0:否")
     private Integer outsourced;
 

mes/src/main/java/com/ximai/mes/pro/mapper/task/ProTaskWorkunitMapper.java

@@ -141,7 +141,7 @@ public interface ProTaskWorkunitMapper {
     @Select(value = "select t.task_id, t.task_code, t.task_name\n" +
             "\t, t.workstation_id, t.workstation_code, ws.workstation_name\n" +
             "\t, t.process_id, t.process_code, t.process_name\n" +
-            "\t, t.item_id, wo.product_code as item_code, wo.product_name as item_name, t.specification, t.unit_of_measure\n" +
+            "\t, t.item_id, wo.product_code as item_code, wo.product_name as item_name,wo.customer_project_no,wo.order_code, t.specification, t.unit_of_measure\n" +
             "\t, ptw.task_workunit_id, ptw.quantity, ptw.create_by, t.quantity_wait, ptw.quantity_produced, ptw.quantity_changed\n" +
             "\t, t.client_id, t.client_code, t.client_name, t.client_nick, t.is_last_process, ptw.schedule_start_date\n" +
             "\t, t.duration, ptw.schedule_end_date, t.color_code, t.request_date\n" +

mes/src/main/java/com/ximai/mes/pro/service/impl/task/ProTaskWorkunitServiceImpl.java

@@ -425,6 +425,8 @@ public class ProTaskWorkunitServiceImpl implements IProTaskWorkunitService {
         query.le(proTaskWorkunit.getScheduleEndDateTo() != null, "ptw.schedule_start_date", proTaskWorkunit.getScheduleEndDateTo());
         query.eq(StringUtils.isNotEmpty(proTaskWorkunit.getArrangeCode()), "t.arrange_code", proTaskWorkunit.getArrangeCode());
         query.eq(proTaskWorkunit.getOutsourced()!=null, "ptw.outsourced", proTaskWorkunit.getOutsourced());
+        query.eq(proTaskWorkunit.getCustomerProjectNo()!=null, "wo.customer_project_no", proTaskWorkunit.getCustomerProjectNo());
+        query.eq(proTaskWorkunit.getOrderCode()!=null, "wo.order_code", proTaskWorkunit.getOrderCode());
         query.gt("ptw.quantity",0);
         query.orderByAsc("schedule_start_date");
         List<ProTaskWorkunit> list = proTaskWorkunitService.selectTaskWorkUnitJoinTask(query);