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

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

@@ -95,8 +95,17 @@ public class WmsSchedulePlanDetailVo {
      * 天数
      */
     private Integer days;
-    //产线名字
+
+    /**
+     * 产线名字
+     */
     @ExcelProperty(value = "产线名字")
     private String lineName;
 
+    /**
+     * 批次号
+     */
+    @ExcelProperty(value = "批次号")
+    private String batchNo;
+
 }

klp-wms/src/main/resources/mapper/klp/WmsSchedulePlanDetailMapper.xml

@@ -38,9 +38,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsSchedulePlanDetailVo">
         SELECT *,
-        wpl.line_name AS lineName
+        wpl.line_name AS lineName,
+        wbt.batch_no AS batchNo
         FROM wms_schedule_plan_detail wspd
-            left join wms_production_line wpl on wspd.line_id = wpl.line_id
+        left join wms_production_line wpl on wspd.line_id = wpl.line_id
+        left join wms_batch wbt on wspd.batch_id = wbt.batch_id
         ${ew.customSqlSegment}
     </select>