Merge remote-tracking branch 'origin/master'

op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/ProRfidProcessDetail.java

@@ -87,6 +87,61 @@ public class ProRfidProcessDetail extends BaseEntity {
 	private String productCode;
 	private String productModel;
 
+	/** 现在工序编码 */
+	@Excel(name = "现在工序编码")
+	private String nowProcessCode;
+
+	/** 现在工序名称 */
+	@Excel(name = "现在工序名称")
+	private String nowProcessName;
+
+	/** 下一步工序编码 */
+	@Excel(name = "下一步工序编码")
+	private String nextProcessCode;
+
+	/** 下一步工序名称 */
+	@Excel(name = "下一步工序名称")
+	private String nextProcessName;
+
+	/** 订单号 */
+	@Excel(name = "订单号")
+	private String orderCode;
+
+	public String getOrderCode() {
+		return orderCode;
+	}
+	public void setOrderCode(String orderCode) {
+		this.orderCode = orderCode;
+	}
+
+	public String getNextProcessName() {
+		return nextProcessName;
+	}
+	public void setNextProcessName(String nextProcessName) {
+		this.nextProcessName = nextProcessName;
+	}
+
+	public String getNextProcessCode() {
+		return nextProcessCode;
+	}
+	public void setNextProcessCode(String nextProcessCode) {
+		this.nextProcessCode = nextProcessCode;
+	}
+
+	public String getNowProcessName() {
+		return nowProcessName;
+	}
+	public void setNowProcessName(String nowProcessName) {
+		this.nowProcessName = nowProcessName;
+	}
+
+	public String getNowProcessCode() {
+		return nowProcessCode;
+	}
+	public void setNowProcessCode(String nowProcessCode) {
+		this.nowProcessCode = nowProcessCode;
+	}
+
 	public String getProdLineCode() {
 		return prodLineCode;
 	}

op-modules/op-mes/src/main/resources/mapper/mes/ProRfidProcessDetailMapper.xml

@@ -36,13 +36,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from pro_rfid_process_detail
 	</sql>
 
-	<select id="selectProRfidProcessDetailList" parameterType="ProRfidProcessDetail" resultMap="ProRfidProcessDetailResult">
-		<include refid="selectProRfidProcessDetailVo"/>
+	<select id="selectProRfidProcessDetailList" parameterType="ProRfidProcessDetail" resultType="com.op.system.api.domain.mes.ProRfidProcessDetail">
+		select
+			ppd.record_id as recordId,
+		    ppd.workorder_code as workorderCode,
+			ppd.rfid,
+			ppd.factory_code as factoryCode,
+			ppd.machine_code as machineCode,
+			ppd.now_process_id as nowProcessId,
+			ppd.next_process_id as nextProcessId,
+			ppd.order_num as orderNum,
+			ppd.in_time as inTime,
+			ppd.out_time as outTime,
+			ppd.status,
+			ppd.remark,
+			ppd.attr1,
+			ppd.attr2,
+			ppd.attr3,
+			ppd.attr4,
+			ppd.create_by as createBy,
+			ppd.create_time as createTime,
+			ppd.update_by as updateBy,
+			ppd.update_time as updateTime,
+			ppd.work_batch_code as workBatchCode,
+			ppd.bind_status as bindStatus,
+			pp.process_code as nowProcessCode,
+			pp.process_name as nowProcessName,
+			ppp.process_code as nextProcessCode,
+		    ppp.process_name as nextProcessName,
+		    pow.order_code as orderCode
+		from pro_rfid_process_detail ppd
+		left join pro_process pp on pp.process_id = ppd.next_process_id
+		left join pro_process ppp on ppp.process_id = ppd.now_process_id
+		left join pro_order_workorder pow on pow.workorder_code = ppd.workorder_code
 		<where>
-			<if test="workorderCode != null  and workorderCode != ''"> and workorder_code = #{workorderCode}</if>
-			<if test="rfid != null  and rfid != ''"> and rfid = #{rfid}</if>
+			<if test="workorderCode != null  and workorderCode != ''"> and ppd.workorder_code like concat('%', #{workorderCode}, '%')</if>
+			<if test="rfid != null  and rfid != ''"> and rfid like concat('%', #{rfid}, '%')</if>
 			<if test="factoryCode != null  and factoryCode != ''"> and factory_code = #{factoryCode}</if>
-			<if test="machineCode != null  and machineCode != ''"> and machine_code = #{machineCode}</if>
+			<if test="machineCode != null  and machineCode != ''"> and machine_code like concat('%', #{machineCode}, '%')</if>
 			<if test="nowProcessId != null  and nowProcessId != ''"> and now_process_id = #{nowProcessId}</if>
 			<if test="nextProcessId != null  and nextProcessId != ''"> and next_process_id = #{nextProcessId}</if>
 			<if test="orderNum != null "> and order_num = #{orderNum}</if>