更新生产排产BUG

mes/src/main/java/com/ximai/mes/report/response/WorkOrderProgressListResponse.java

@@ -56,7 +56,11 @@ public class WorkOrderProgressListResponse {
     @ApiModelProperty("需求时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date requestDate;
+    @ApiModelProperty("工单状态")
 
     private String status;
+    @ApiModelProperty("产线")
+
+    private String lineName;
 }
 

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

@@ -262,6 +262,7 @@
         pw.in_drawing_no,
         pw.erp_create_time,
         pw.erp_update_time ,
+        item.line_name,
         sum(case task.is_last_process when 0  THEN  0 ELSE fe.quantity_qualify + fe.quantity_unqualify  END)  as quantity_produced
         FROM
         pro_workorder pw
@@ -358,7 +359,8 @@
         pw.customer_project_no,
         pw.in_drawing_no,
         pw.erp_create_time,
-        pw.erp_update_time
+        pw.erp_update_time,
+        item.line_name
     </select>
 
     <insert id="insertProWorkorder" parameterType="ProWorkorder" useGeneratedKeys="true" keyProperty="workorderId">