更新生产排产BUG

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

@@ -4,6 +4,8 @@ import com.ximai.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class WorkOrderProgressRequest {
     /**
@@ -42,7 +44,7 @@ public class WorkOrderProgressRequest {
     private String productName;
 
     @ApiModelProperty(   "工单状态")
-    private String  workOrderStatus;
+    private List<String> workOrderStatus;
 
     @ApiModelProperty(   "产线")
     private String lineName;

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

@@ -274,7 +274,13 @@
             <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="workOrderStatus != null">
+                and
+                <foreach collection="workOrderStatus" item="status" separator=" or " open="(" close=")" >
+                    pw.status = #{status}
+                </foreach>
+            </if>
+
             <if test="lineName != null and lineName !=''">and item.line_name = #{lineName} </if>
         </where>
         GROUP BY