Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-wms/src/main/java/com/klp/domain/vo/WmsSchedulePlanDetailVo.java

@@ -41,10 +41,10 @@ public class WmsSchedulePlanDetailVo {
     private Long lineId;
 
     /**
-     * 批次id
+     * 生产任务id(原批次id)
      */
-    @ExcelProperty(value = "批次id")
-    private Long batchId;
+    @ExcelProperty(value = "生产任务id")
+    private Long taskId;
 
     /**
      * 产品ID
@@ -108,4 +108,15 @@ public class WmsSchedulePlanDetailVo {
     @ExcelProperty(value = "批次号")
     private String batchNo;
 
+    /**
+     * 计划名称
+     */
+    @ExcelProperty(value = "计划名称")
+    private String planName;
+
+    /**
+     * 计划编码
+     */
+    @ExcelProperty(value = "计划编码")
+    private String planCode;
 }