更新生产排产BUG

mes/src/main/java/com/ximai/mes/report/request/WorkOrderProgressRequest.java

@@ -40,4 +40,11 @@ public class WorkOrderProgressRequest {
      */
     @ApiModelProperty(   "产品名称")
     private String productName;
+
+    @ApiModelProperty(   "工单状态")
+    private String  workOrderStatus;
+
+    @ApiModelProperty(   "产线")
+    private String lineName;
+
 }

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

@@ -267,12 +267,15 @@
         pro_workorder pw
         LEFT JOIN pro_feedback fe ON fe.workorder_id = pw.workorder_id
         left join pro_task task on task.task_id = fe.task_id
+        left join md_item item on item.item_id = pw.product_id
         <where>
             <if test="workorderCode != null  and workorderCode != ''">and  pw.workorder_code  = #{workorderCode}</if>
             <if test="productId != null ">and pw.product_id = #{productId}</if>
             <if test="productCode != null  and productCode != ''">and pw.product_code = #{productCode}</if>
             <if test="orderCode != null and orderCode !=''">and pw.order_code = #{orderCode}</if>
             <if test="customerProjectNo != null and customerProjectNo !=''">and pw.customer_project_no = #{customerProjectNo}</if>
+            <if test="workOrderStatus != null and workOrderStatus !=''">and pw.status = #{workOrderStatus}</if>
+            <if test="lineName != null and lineName !=''">and item.line_name = #{lineName} </if>
         </where>
         GROUP BY
         pw.workorder_id,