Merge remote-tracking branch 'origin/master'

op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItem.java

@@ -30,7 +30,7 @@ public class EquCheckItem extends BaseEntity {
 	private String itemName;
 
 	/** 检查项方法/工具 */
-	@Excel(name = "检查项方法/工具")
+	@Excel(name = "检查项方法")
 	private String itemMethod;
 
 	/** 维护类型编码 */
@@ -50,19 +50,15 @@ public class EquCheckItem extends BaseEntity {
 	private String factoryCode;
 
 	/** 备用字段1 */
-	@Excel(name = "备用字段1")
 	private String attr1;
 
 	/** 备用字段2 */
-	@Excel(name = "备用字段2")
 	private String attr2;
 
 	/** 备用字段3 */
-	@Excel(name = "备用字段3")
 	private String attr3;
 
 	/** 删除标识 */
-	@Excel(name = "删除标识")
 	private String delFlag;
 
 	/** 创建时间 */
@@ -96,12 +92,15 @@ public class EquCheckItem extends BaseEntity {
 	private String updateTimeEnd;
 
 	// 检查项工具
+	@Excel(name = "检查项工具")
 	private String itemTools;
 
 	// 循环周期类型
+	@Excel(name = "循环周期类型")
 	private String itemLoopType;
 
 	// 循环周期
+	@Excel(name = "循环周期")
 	private int itemLoop;
 
 	public int getItemLoop() {

op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java

@@ -41,19 +41,15 @@ public class EquFaultType extends BaseEntity {
 	private String factoryCode;
 
 	/** 备用字段1 */
-	@Excel(name = "备用字段1")
 	private String attr1;
 
 	/** 备用字段2 */
-	@Excel(name = "备用字段2")
 	private String attr2;
 
 	/** 备用字段3 */
-	@Excel(name = "备用字段3")
 	private String attr3;
 
 	/** 删除标志 */
-	@Excel(name = "删除标志")
 	private String delFlag;
 
 	// 创建日期范围list

op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java

@@ -31,19 +31,16 @@ public class EquPlan extends BaseEntity {
 	private String planName;
 
 	/** 车间 */
-	@Excel(name = "车间")
+	@Excel(name = "车间编码")
 	private String planWorkshop;
 
 	/** 产线 */
-	@Excel(name = "产线")
 	private String planProdLine;
 
 	/** 设备名称 */
-	@Excel(name = "设备名称")
 	private String equipmentName;
 
 	/** 设备编码 */
-	@Excel(name = "设备编码")
 	private String equipmentCode;
 
 	/** 循环周期 */
@@ -65,7 +62,6 @@ public class EquPlan extends BaseEntity {
 	private Date planLoopEnd;
 
 	/** 巡检人员 */
-	@Excel(name = "巡检人员")
 	private String planPerson;
 
 	/** 计划状态 */
@@ -77,11 +73,9 @@ public class EquPlan extends BaseEntity {
 	private String planRestrict;
 
 	/** 维护类型 */
-	@Excel(name = "维护类型")
 	private String planType;
 
 	/** 是否委外 */
-	@Excel(name = "是否委外")
 	private String planOutsource;
 
 	/** 委外工单编码 */
@@ -93,19 +87,15 @@ public class EquPlan extends BaseEntity {
 	private String factoryCode;
 
 	/** 备用字段1 */
-	@Excel(name = "备用字段1")
 	private String attr1;
 
 	/** 备用字段2 */
-	@Excel(name = "备用字段2")
 	private String attr2;
 
 	/** 备用字段3 */
-	@Excel(name = "备用字段3")
 	private String attr3;
 
 	/** 删除标志 */
-	@Excel(name = "删除标志")
 	private String delFlag;
 
 	// 创建日期范围list
@@ -136,12 +126,14 @@ public class EquPlan extends BaseEntity {
 	private String workCenterName;
 
 	// 保养类型
+	@Excel(name = "保养类型")
 	private String upkeep;
 
 	// 计划保养时间计算规则
 	private String calculationRule;
 
 	// 是否停机保养
+	@Excel(name = "是否停机保养")
 	private String shutDown;
 	private String planEquId;
 
@@ -157,12 +149,16 @@ public class EquPlan extends BaseEntity {
 
 	private Date getLoopEndArrayEnd;
 
+	@Excel(name = "委外人员")
 	private String workPerson;
 
+	@Excel(name = "委外单位")
 	private String workOutsourcingUnit;
 
+	@Excel(name = "联系方式")
 	private String workConnection;
 
+	@Excel(name = "委外原因")
 	private String workReason;
 
 	public String getWorkOutsourcingUnit() {

op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java

@@ -139,6 +139,9 @@ public class EquRepairWorkOrder extends BaseEntity {
 	/** 联系方式 */
 	private String workConnection;
 
+	/** 设备状态描述 */
+	private String equipmentStatusDescription;
+
     //	设备
 	/** 设备名称 */
 	@Excel(name = "设备名称")
@@ -722,6 +725,14 @@ public class EquRepairWorkOrder extends BaseEntity {
 		this.faultType = faultType;
 	}
 
+	//设备状态描述
+	public String getEquipmentStatusDescription() {
+		return equipmentStatusDescription;
+	}
+	public void setEquipmentStatusDescription(String equipmentStatusDescription) {
+		this.equipmentStatusDescription = equipmentStatusDescription;
+	}
+
 	@Override
 	public String toString() {
 		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml

@@ -74,7 +74,7 @@
 			<if test="planLoopStart != null "> and plan_loop_start = #{planLoopStart}</if>
 			<if test="planLoopEnd != null "> and plan_loop_end = #{planLoopEnd}</if>
 			<if test="orderStart != null "> and order_start = #{orderStart}</if>
-			<if test="orderEnd != null "> and order_end = #{orderEnd}</if>
+			<if test="orderEnd != null "> and order_end = #{ord5erEnd}</if>
 			<if test="orderStatus != null  and orderStatus != ''"> and order_status = #{orderStatus}</if>
 			<if test="orderCost != null "> and order_cost = #{orderCost}</if>
 			<if test="planPerson != null  and planPerson != ''"> and plan_person like concat('%', #{planPerson}, '%')</if>

op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml

@@ -41,6 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="delFlag"	column="del_flag"	/>
 		<result property="factoryCode"	column="factory_code"	/>
 		<result property="faultType"	column="fault_type"	/>
+		<result property="equipmentStatusDescription"	column="equipment_status_description"	/>
+
          <!--设备-->
 		<result property="equipmentName"	column="equipment_name"	/>
 		<result property="equipmentSpec"	column="equipment_spec"	/>
@@ -85,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</sql>
 
 	<sql id="selectEquRepairWorkOrderVo">
-		select work_id, order_id, order_code, work_code,work_handle, work_plan_time, work_plan_down_time, order_relevance, work_person, work_team, work_outsource, work_down_machine, equipment_code, work_reason, work_fault_desc, work_start_time,work_end_time,work_cost_time, work_cost, work_status,out_work_id, out_work_code, attr1, attr2, attr3, create_by, create_time, update_time, update_by, del_flag, factory_code ,fault_type from equ_repair_work_order
+		select work_id, order_id, order_code, work_code,work_handle, work_plan_time, work_plan_down_time, order_relevance, work_person, work_team, work_outsource, work_down_machine, equipment_code, work_reason, work_fault_desc, work_start_time,work_end_time,work_cost_time, work_cost, work_status,out_work_id, out_work_code, attr1, attr2, attr3, create_by, create_time, update_time, update_by, del_flag, factory_code ,fault_type,equipment_status_description from equ_repair_work_order
 	</sql>
 
 	<select id="selectEquRepairWorkOrderList" parameterType="EquRepairWorkOrder" resultMap="EquRepairWorkOrderResult">
@@ -125,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			erwo.del_flag,
 			erwo.factory_code,
 			erwo.fault_type,
+		    erwo.equipment_status_description,
 		    be.equipment_name,
 		    et.team_name,
 		    et.team_person
@@ -204,6 +207,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		erwo.del_flag,
 		erwo.factory_code,
 		erwo.fault_type,
+	    erwo.equipment_status_description,
 		be.equipment_name,
 		et.team_name,
 		et.team_person
@@ -252,6 +256,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			erwo.update_by,
 			erwo.factory_code,
 		    erwo.fault_type,
+		    erwo.equipment_status_description,
 		    be.equipment_name,
 			be.equipment_spec,
 			be.equipment_type_name,
@@ -316,6 +321,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="delFlag != null">del_flag,</if>
 			<if test="factoryCode != null">factory_code,</if>
 			<if test="faultType != null">fault_type,</if>
+			<if test="equipmentStatusDescription != null">equipment_status_description,</if>
 		 </trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="workId != null">#{workId},</if>
@@ -353,6 +359,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="delFlag != null">#{delFlag},</if>
 			<if test="factoryCode != null">#{factoryCode},</if>
 			<if test="faultType != null">#{fault_type},</if>
+			<if test="equipmentStatusDescription != null">equipment_status_description,</if>
 		 </trim>
 	</insert>
 
@@ -393,6 +400,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="delFlag != null">del_flag = #{delFlag},</if>
 			<if test="factoryCode != null">factory_code = #{factoryCode},</if>
 			<if test="faultType != null">fault_type = #{faultType},</if>
+			<if test="equipmentStatusDescription != null">equipment_status_description = #{equipmentStatusDescription},</if>
 		</trim>
 		where work_id = #{workId}
 		and del_flag = '0'

op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java

@@ -211,6 +211,10 @@ public class BaseEquipment extends BaseEntity {
 	@Excel(name = "设备状态")
 	private String equipmentStatus;
 
+	/** 设备类别 */
+	@Excel(name = "设备类别")
+	private String equipmentCategory;
+
 	private String imageFileList;
 
 	private String barCodeFileList;
@@ -651,6 +655,14 @@ public class BaseEquipment extends BaseEntity {
 		return equipmentStatus;
 	}
 
+	//设备类别
+	public void setEquipmentCategory(String equipmentCategory) {
+		this.equipmentCategory = equipmentCategory;
+	}
+	public String getEquipmentCategory() {
+		return equipmentCategory;
+	}
+
 	@Override
 	public String toString() {
 		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml

@@ -48,6 +48,7 @@
 		<result property="equipmentHead"	column="equipment_head"	/>
 		<result property="factoryCode"	column="factory_code"	/>
 		<result property="equipmentStatus"	column="equipment_status"	/>
+		<result property="equipmentCategory"	column="equipment_category"	/>
 	</resultMap>
 
 	<resultMap type="WmsSparePartsLedger" id="WmsSparePartsLedgerResult">
@@ -162,7 +163,8 @@
 			department,
 			equipment_head,
 			factory_code,
-			equipment_status
+			equipment_status,
+			equipment_category
 			from base_equipment
 	</sql>
 
@@ -205,6 +207,7 @@
 			<if test="sapAsset != null  and sapAsset != ''"> and sap_asset = #{sapAsset}</if>
 			<if test="factoryCode != null  and factoryCode != ''"> and factory_code = #{factoryCode}</if>
 			<if test="equipmentStatus != null  and equipmentStatus != ''"> and equipment_status = #{equipmentStatus}</if>
+			<if test="equipmentCategory != null  and equipmentCategory != ''"> and equipment_category = #{equipmentCategory}</if>
 			and del_flag ='0'
 		</where>
 	</select>
@@ -259,6 +262,7 @@
 			<if test="equipmentHead != null">equipment_head,</if>
 			<if test="factoryCode != null">factory_code,</if>
 			<if test="equipmentStatus != null">equipment_status,</if>
+			<if test="equipmentCategory != null">equipment_category,</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="equipmentCode != null and equipmentCode != ''">#{equipmentCode},</if>
@@ -302,6 +306,7 @@
 			<if test="equipmentHead != null">#{equipmentHead},</if>
 			<if test="factoryCode != null">#{factoryCode},</if>
 			<if test="equipmentStatus != null">equipmentStatus,</if>
+			<if test="equipmentCategory != null">equipmentCategory,</if>
 		</trim>
 	</insert>
 
@@ -349,6 +354,7 @@
 			<if test="equipmentHead != null">equipment_head = #{equipmentHead},</if>
 			<if test="factoryCode != null">factory_code = #{factoryCode},</if>
 			<if test="equipmentStatus != null">equipment_status = #{equipmentStatus},</if>
+			<if test="equipmentCategory != null">equipment_category = #{equipmentCategory},</if>
 		</trim>
 		where equipment_id = #{equipmentId}
 	</update>