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

klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentPart.java

@@ -28,6 +28,14 @@ public class EqpEquipmentPart extends BaseEntity {
      * 巡检部位
      */
     private String inspectPart;
+    /**
+     * 产线
+     */
+    private String productionLine;
+    /**
+     * 产线段
+     */
+    private String lineSection;
     /**
      * 备注
      */

klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentPartBo.java

@@ -28,6 +28,16 @@ public class EqpEquipmentPartBo extends BaseEntity {
      */
     private String inspectPart;
 
+    /**
+     * 产线
+     */
+    private String productionLine;
+
+    /**
+     * 产线段
+     */
+    private String lineSection;
+
     /**
      * 备注
      */

klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentPartVo.java

@@ -33,6 +33,18 @@ public class EqpEquipmentPartVo {
     @ExcelProperty(value = "巡检部位")
     private String inspectPart;
 
+    /**
+     * 产线
+     */
+    @ExcelProperty(value = "产线")
+    private String productionLine;
+
+    /**
+     * 产线段
+     */
+    @ExcelProperty(value = "产线段")
+    private String lineSection;
+
     /**
      * 备注
      */

klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentPartServiceImpl.java

@@ -79,6 +79,8 @@ public class EqpEquipmentPartServiceImpl implements IEqpEquipmentPartService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<EqpEquipmentPart> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getInspectPart()), EqpEquipmentPart::getInspectPart, bo.getInspectPart());
+        lqw.eq(StringUtils.isNotBlank(bo.getProductionLine()), EqpEquipmentPart::getProductionLine, bo.getProductionLine());
+        lqw.eq(StringUtils.isNotBlank(bo.getLineSection()), EqpEquipmentPart::getLineSection, bo.getLineSection());
         return lqw;
     }
 

klp-mes/src/main/resources/mapper/eqp/EqpEquipmentPartMapper.xml

@@ -7,6 +7,8 @@
     <resultMap type="com.klp.mes.eqp.domain.EqpEquipmentPart" id="EqpEquipmentPartResult">
         <result property="partId" column="part_id"/>
         <result property="inspectPart" column="inspect_part"/>
+        <result property="productionLine" column="production_line"/>
+        <result property="lineSection" column="line_section"/>
         <result property="remark" column="remark"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>