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

- 在WmsMaterialCoil实体类中新增actualThickness字段
- 在WmsMaterialCoilAllExportVo导出对象中添加厚度导出映射
- 在WmsMaterialCoilBo业务对象中增加厚度查询条件支持
- 在WmsMaterialCoilExportVo导出对象中补充厚度字段定义
- 更新WmsMaterialCoilMapper.xml映射文件中的厚度字段映射
- 在WmsMaterialCoilServiceImpl服务实现中加入厚度查询逻辑
- 在WmsMaterialCoilVo视图对象中添加厚度字段定义

klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java

@@ -174,6 +174,11 @@ public class WmsMaterialCoil extends BaseEntity {
      */
     private BigDecimal actualWidth;
 
+    /**
+     * 实测厚度（单位：毫米）
+     */
+    private String actualThickness;
+
     /**
      * 生产开始时间
      */

klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java

@@ -294,6 +294,11 @@ public class WmsMaterialCoilBo extends BaseEntity {
      */
     private BigDecimal actualWidth;
 
+    /**
+     * 实测厚度（单位：毫米）
+     */
+    private String actualThickness;
+
     /**
      * 生产开始时间
      */

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

@@ -201,4 +201,11 @@ public class WmsMaterialCoilAllExportVo {
      */
     @ExcelProperty(value = "销售人员")
     private String saleName;
+
+
+    /**
+     * 实测厚度（单位：毫米）
+     */
+    @ExcelProperty(value = "实测厚度")
+    private String actualThickness;
 }

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

@@ -128,6 +128,11 @@ public class WmsMaterialCoilExportVo {
     @ExcelProperty(value = "长度")
     private BigDecimal length;
 
+    /**
+     * 实测厚度
+     */
+    private String actualThickness;
+
     /**
      * 材质
      */

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

@@ -279,6 +279,11 @@ public class WmsMaterialCoilVo extends BaseEntity {
     @ExcelProperty(value = "实测宽度")
     private BigDecimal actualWidth;
 
+    /**
+     * 实测厚度（单位：毫米）
+     */
+    private String actualThickness;
+
     /**
      * 生产开始时间
      */

klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java

@@ -508,6 +508,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         qw.eq(bo.getActualLength() != null, "mc.actual_length", bo.getActualLength());
         // 实测宽度
         qw.eq(bo.getActualWidth() != null, "mc.actual_width", bo.getActualWidth());
+        // 实测厚度
+        qw.eq(StringUtils.isNotBlank(bo.getActualThickness()), "mc.actual_thickness", bo.getActualThickness());
         // 生产开始时间
         qw.eq(bo.getProductionStartTime() != null, "mc.production_start_time", bo.getProductionStartTime());
         // 生产结束时间

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

@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="length" column="length"/>
         <result property="actualLength" column="actual_length"/>
         <result property="actualWidth" column="actual_width"/>
+        <result property="actualThickness" column="actual_thickness"/>
         <result property="productionStartTime" column="production_start_time"/>
         <result property="productionEndTime" column="production_end_time"/>
         <result property="productionDuration" column="production_duration"/>
@@ -110,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mc.length,
             mc.actual_length,
             mc.actual_width,
+            mc.actual_thickness,
             mc.production_start_time,
             mc.production_end_time,
             mc.production_duration,
@@ -207,6 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mc.length,
             mc.actual_length,
             mc.actual_width,
+            mc.actual_thickness,
             mc.production_start_time,
             mc.production_end_time,
             mc.production_duration,
@@ -506,6 +509,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mc.net_weight AS netWeight,
             -- 长度
             mc.length AS length,
+            --  实测厚度
+            mc.actual_thickness AS actualThickness,
             --  镀层种类
             mc.coating_type AS coatingType,
             --  调制度