pms-Sv.git - Gitblit

			@@ -62,6 +62,43 @@
			ORDER BY t.id DESC
			</select>

			<select id="selectProductLog" resultMap="joinResultMap">
			select
			t.* ,p.`name` plan_name,s.`name` station_name,u.`name` update_user_name
			FROM
			(
			select <include refid="Base_Column_List" /> from sta_device_production_log_past
			<where>
			<if test="deviceNo != null and deviceNo !=''">
			and device_no = #{deviceNo,jdbcType=VARCHAR}
			</if>
			<if test="startTime != null">
			and out_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
			</if>
			<if test="endTime != null">
			and out_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
			</if>
			</where>
			union
			select <include refid="Base_Column_List" /> from sta_device_production_log
			<where>
			<if test="deviceNo != null and deviceNo !=''">
			and device_no = #{deviceNo,jdbcType=VARCHAR}
			</if>
			<if test="startTime != null">
			and out_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
			</if>
			<if test="endTime != null">
			and out_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
			</if>
			</where>
			) t
			left join pr_assembly_plan p on t.plan_id=p.id
			left join plt_station s on s.id = t.station_id
			left JOIN ba_user u on u.id=t.updated_by
			ORDER BY t.id DESC
			</select>

			<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
			delete from sta_device_production_log
			where id = #{id,jdbcType=BIGINT}
			@@ -87,49 +124,49 @@
			insert into sta_device_production_log
			<trim prefix="(" suffix=")" suffixOverrides=",">
			<if test="id != null">id,</if>
			<if test="deviceNo != null">device_no,</if>
			<if test="deviceNo != null and deviceNo !=''">device_no,</if>
			<if test="workId != null">work_id,</if>
			<if test="repairId != null">repair_id,</if>
			<if test="planId != null">plan_id,</if>
			<if test="stationId != null">station_id,</if>
			<if test="currNode != null">curr_node,</if>
			<if test="nodeContent != null">node_content,</if>
			<if test="deviceCycleContent != null">device_cycle_content,</if>
			<if test="nodeContent != null and nodeContent !=''">node_content,</if>
			<if test="deviceCycleContent != null and deviceCycleContent !=''">device_cycle_content,</if>
			<if test="status != null">status,</if>
			<if test="result != null">result,</if>
			<if test="errorMsg != null">error_msg,</if>
			<if test="assistants != null">assistants,</if>
			<if test="errorMsg != null and errorMsg !=''">error_msg,</if>
			<if test="assistants != null and assistants !=''">assistants,</if>
			<if test="inTime != null">in_time,</if>
			<if test="outTime != null">out_time,</if>
			<if test="updatedBy != null">updated_by,</if>
			<if test="memo != null">memo,</if>
			<if test="memo != null and memo !=''">memo,</if>
			<if test="number != null">number,</if>
			</trim>
			<trim prefix="values (" suffix=")" suffixOverrides=",">
			<if test="id != null">#{id,jdbcType=BIGINT},</if>
			<if test="deviceNo != null">#{deviceNo,jdbcType=VARCHAR},</if>
			<if test="deviceNo != null and deviceNo !=''">#{deviceNo,jdbcType=VARCHAR},</if>
			<if test="workId != null">#{workId,jdbcType=BIGINT},</if>
			<if test="repairId != null">#{repairId,jdbcType=BIGINT},</if>
			<if test="planId != null">#{planId,jdbcType=BIGINT},</if>
			<if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
			<if test="currNode != null">#{currNode,jdbcType=BIGINT},</if>
			<if test="nodeContent != null">#{nodeContent,jdbcType=VARCHAR},</if>
			<if test="deviceCycleContent != null">#{deviceCycleContent,jdbcType=VARCHAR},</if>
			<if test="nodeContent != null and nodeContent !=''">#{nodeContent,jdbcType=VARCHAR},</if>
			<if test="deviceCycleContent != null and deviceCycleContent !=''">#{deviceCycleContent,jdbcType=VARCHAR},</if>
			<if test="status != null">#{status,jdbcType=TINYINT},</if>
			<if test="result != null">#{result,jdbcType=TINYINT},</if>
			<if test="errorMsg != null">#{errorMsg,jdbcType=VARCHAR},</if>
			<if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
			<if test="errorMsg != null and errorMsg !=''">#{errorMsg,jdbcType=VARCHAR},</if>
			<if test="assistants != null and assistants !=''">#{assistants,jdbcType=VARCHAR},</if>
			<if test="inTime != null">#{inTime,jdbcType=TIMESTAMP},</if>
			<if test="outTime != null">#{outTime,jdbcType=TIMESTAMP},</if>
			<if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
			<if test="memo != null">#{memo,jdbcType=VARCHAR},</if>
			<if test="memo != null and memo !=''">#{memo,jdbcType=VARCHAR},</if>
			<if test="number != null">#{number,jdbcType=INTEGER},</if>
			</trim>
			</insert>
			<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog">
			update sta_device_production_log
			<set>
			<if test="deviceNo != null">
			<if test="deviceNo != null and deviceNo !=''">
			device_no = #{deviceNo,jdbcType=VARCHAR},
			</if>
			<if test="workId != null">
			@@ -147,10 +184,10 @@
			<if test="currNode != null">
			curr_node = #{currNode,jdbcType=BIGINT},
			</if>
			<if test="nodeContent != null">
			<if test="nodeContent != null and nodeContent !=''">
			node_content = #{nodeContent,jdbcType=VARCHAR},
			</if>
			<if test="deviceCycleContent != null">
			<if test="deviceCycleContent != null and deviceCycleContent !=''">
			device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
			</if>
			<if test="status != null">
			@@ -159,10 +196,10 @@
			<if test="result != null">
			result = #{result,jdbcType=TINYINT},
			</if>
			<if test="errorMsg != null">
			<if test="errorMsg != null and errorMsg !=''">
			error_msg = #{errorMsg,jdbcType=VARCHAR},
			</if>
			<if test="assistants != null">
			<if test="assistants != null and assistants !=''">
			assistants = #{assistants,jdbcType=VARCHAR},
			</if>
			<if test="inTime != null">
			@@ -174,7 +211,7 @@
			<if test="updatedBy != null">
			updated_by = #{updatedBy,jdbcType=BIGINT},
			</if>
			<if test="memo != null">
			<if test="memo != null and memo !=''">
			memo = #{memo,jdbcType=VARCHAR},
			</if>
			<if test="number != null">