Jcdm041-Mes.git

			@@ -1,9 +1,9 @@
			<?xml version="1.0" encoding="UTF-8" ?>
			<!DOCTYPE mapper
			PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
			PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
			<mapper namespace="com.jcdm.main.bs.orderScheduling.mapper.BsOrderSchedulingMapper">


			<resultMap type="BsOrderScheduling" id="BsOrderSchedulingResult">
			<result property="id" column="id" />
			<result property="orderNo" column="order_no" />
			@@ -32,16 +32,72 @@
			<result property="updateTime" column="update_time" />
			<result property="remarks" column="remarks" />
			<result property="report30" column="report_30" />
			<result property="boxClosingOnlineTime" column="box_closing_online_time" />
			<result property="closingBoxOfflineTime" column="closing_box_offline_time" />
			<result property="finalAssemblyLaunchTime" column="final_assembly_launch_time" />
			<result property="finalAssemblyOfflineTime" column="final_assembly_offline_time" />
			<result property="cvtLaunchTime" column="cvt_launch_time" />
			<result property="cvtOfflineTime" column="cvt_offline_time" />

			</resultMap>

			<sql id="selectBsOrderSchedulingVo">
			select id, order_no, engine_no, product_type, model, production_status, working_hours, current_workstation, quality_status, whether_or_print, report_10, report_20, combined_box_time, final_assembly_time, operator, operate_time, status, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks, report_30 from bs_order_scheduling
			select id, order_no, engine_no, product_type, model, production_status, working_hours, current_workstation, quality_status, whether_or_print, report_10, report_20, combined_box_time, final_assembly_time, operator, operate_time, status, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks, report_30, box_closing_online_time, closing_box_offline_time, final_assembly_launch_time, final_assembly_offline_time, cvt_launch_time, cvt_offline_time from bs_order_scheduling
			</sql>

			<select id="selectBsOrderSchedulingList" parameterType="BsOrderScheduling" resultMap="BsOrderSchedulingResult">
			<include refid="selectBsOrderSchedulingVo"/>
			<where>
			<where>
			<if test="orderNo != null and orderNo != ''"> and order_no = #{orderNo}</if>
			<if test="engineNo != null and engineNo != ''"> and engine_no = #{engineNo}</if>
			<if test="productType != null and productType != ''"> and product_type = #{productType}</if>
			<if test="model != null and model != ''"> and model = #{model}</if>
			<if test="productionStatus != null and productionStatus != ''"> and production_status = #{productionStatus}</if>
			<if test="workingHours != null and workingHours != ''"> and working_hours = #{workingHours}</if>
			<if test="currentWorkstation != null and currentWorkstation != ''"> and current_workstation = #{currentWorkstation}</if>
			<if test="qualityStatus != null and qualityStatus != ''"> and quality_status = #{qualityStatus}</if>
			<if test="whetherOrPrint != null and whetherOrPrint != ''"> and whether_or_print = #{whetherOrPrint}</if>
			<if test="report10 != null and report10 != ''"> and report_10 = #{report10}</if>
			<if test="report20 != null and report20 != ''"> and report_20 = #{report20}</if>
			<if test="combinedBoxTime != null and combinedBoxTime != ''"> and combined_box_time = #{combinedBoxTime}</if>
			<if test="finalAssemblyTime != null and finalAssemblyTime != ''"> and final_assembly_time = #{finalAssemblyTime}</if>
			<if test="operator != null and operator != ''"> and operator = #{operator}</if>
			<if test="operateTime != null and operateTime != ''"> and operate_time = #{operateTime}</if>
			<if test="status != null and status != ''"> and status = #{status}</if>
			<if test="spareField1 != null and spareField1 != ''"> and isnull(spare_field_1,'') != #{spareField1}</if>
			<if test="spareField2 != null and spareField2 != ''"> and isnull(spare_field_2,'') != #{spareField2}</if>
			<if test="spareField3 != null and spareField3 != ''"> and spare_field_3 = #{spareField3}</if>
			<if test="spareField4 != null and spareField4 != ''"> and spare_field_4 = #{spareField4}</if>
			<if test="createUser != null and createUser != ''"> and create_user = #{createUser}</if>
			<if test="updateUser != null and updateUser != ''"> and update_user = #{updateUser}</if>
			<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
			<if test="report30 != null and report30 != ''"> and report_30 = #{report30}</if>
			<if test="dateConditions != null and dateConditions != ''"> and operate_time BETWEEN #{startTime} AND #{endTime}</if>
			<if test="boxClosingOnlineTime != null and boxClosingOnlineTime != ''"> and box_closing_online_time = #{boxClosingOnlineTime}</if>
			<if test="closingBoxOfflineTime != null and closingBoxOfflineTime != ''"> and closing_box_offline_time = #{closingBoxOfflineTime}</if>
			<if test="finalAssemblyLaunchTime != null and finalAssemblyLaunchTime != ''"> and final_assembly_launch_time = #{finalAssemblyLaunchTime}</if>
			<if test="finalAssemblyOfflineTime != null and finalAssemblyOfflineTime != ''"> and final_assembly_offline_time = #{finalAssemblyOfflineTime}</if>
			<if test="cvtLaunchTime != null and cvtLaunchTime != ''"> and cvt_launch_time = #{cvtLaunchTime}</if>
			<if test="cvtOfflineTime != null and cvtOfflineTime != ''"> and cvt_offline_time = #{cvtOfflineTime}</if>
			<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> and final_assembly_offline_time between #{startTime} and #{endTime}</if>
			<if test="engineNoList != null and engineNoList.size() > 0">
			and engine_no in
			<foreach collection="engineNoList" open="(" close=")" separator="," item="engine">
			#{engine}
			</foreach>
			</if>
			<if test="engineNoListExcel != null and engineNoListExcel.size() > 0">
			and engine_no in
			<foreach collection="engineNoListExcel" open="(" close=")" separator="," item="engine">
			#{engine} order by order_no,engine_no
			</foreach>
			</if>
			</where>
			</select>

			<select id="selectBsOrderSchedulingPage" parameterType="BsOrderScheduling" resultMap="BsOrderSchedulingResult">
			<include refid="selectBsOrderSchedulingVo"/>
			<where>
			<if test="orderNo != null and orderNo != ''"> and order_no = #{orderNo}</if>
			<if test="engineNo != null and engineNo != ''"> and engine_no = #{engineNo}</if>
			<if test="productType != null and productType != ''"> and product_type = #{productType}</if>
			@@ -66,15 +122,58 @@
			<if test="updateUser != null and updateUser != ''"> and update_user = #{updateUser}</if>
			<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
			<if test="report30 != null and report30 != ''"> and report_30 = #{report30}</if>

			<if test="dateConditions != null and dateConditions != ''"> and operate_time BETWEEN #{startTime} AND #{endTime}</if>
			<if test="boxClosingOnlineTime != null and boxClosingOnlineTime != ''"> and box_closing_online_time = #{boxClosingOnlineTime}</if>
			<if test="closingBoxOfflineTime != null and closingBoxOfflineTime != ''"> and closing_box_offline_time = #{closingBoxOfflineTime}</if>
			<if test="finalAssemblyLaunchTime != null and finalAssemblyLaunchTime != ''"> and final_assembly_launch_time = #{finalAssemblyLaunchTime}</if>
			<if test="finalAssemblyOfflineTime != null and finalAssemblyOfflineTime != ''"> and final_assembly_offline_time = #{finalAssemblyOfflineTime}</if>
			<if test="cvtLaunchTime != null and cvtLaunchTime != ''"> and cvt_launch_time = #{cvtLaunchTime}</if>
			<if test="cvtOfflineTime != null and cvtOfflineTime != ''"> and cvt_offline_time = #{cvtOfflineTime}</if>
			<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> and cvt_offline_time between #{startTime} and #{endTime}</if>
			<if test="engineNoList != null and engineNoList.size() > 0">
			and engine_no in
			<foreach collection="engineNoList" open="(" close=")" separator="," item="engine">
			#{engine}
			</foreach>
			</if>
			<if test="engineNoListExcel != null and engineNoListExcel.size() > 0">
			and engine_no in
			<foreach collection="engineNoListExcel" open="(" close=")" separator="," item="engine">
			#{engine}
			</foreach>
			</if>
			and (production_status = '2' or production_status = '3')
			</where>
			order by create_time DESC
			</select>


			<select id="selectBsOrderSchedulingById" parameterType="Long" resultMap="BsOrderSchedulingResult">
			<include refid="selectBsOrderSchedulingVo"/>
			where id = #{id}
			</select>


			<select id="selectBsOrderSchedulingSNCode" parameterType="String" resultMap="BsOrderSchedulingResult">
			<include refid="selectBsOrderSchedulingVo"/>
			where engine_no = #{sncode}
			</select>

			<select id="getPrepareOnlineList" resultType="com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling">
			select bos.* from bs_order_scheduling bos
			<where>
			<if test="prepareOnlineQuery.orderNo != null and prepareOnlineQuery.orderNo != '' ">
			and bos.order_no = #{prepareOnlineQuery.orderNo}
			</if>
			<if test="prepareOnlineQuery.engineNo != null and prepareOnlineQuery.engineNo != '' ">
			and bos.engine_no = #{prepareOnlineQuery.engineNo}
			</if>
			</where>
			</select>
			<select id="getProduceNumToday" resultType="java.lang.Integer">
			select count(*) from bs_order_scheduling
			where ${queryField} BETWEEN #{startTime} AND #{endTime}
			</select>


			<insert id="insertBsOrderScheduling" parameterType="BsOrderScheduling" useGeneratedKeys="true" keyProperty="id">
			insert into bs_order_scheduling
			<trim prefix="(" suffix=")" suffixOverrides=",">
			@@ -104,7 +203,13 @@
			<if test="updateTime != null">update_time,</if>
			<if test="remarks != null">remarks,</if>
			<if test="report30 != null">report_30,</if>
			</trim>
			<if test="boxClosingOnlineTime != null">box_closing_online_time,</if>
			<if test="closingBoxOfflineTime != null">closing_box_offline_time,</if>
			<if test="finalAssemblyLaunchTime != null">final_assembly_launch_time,</if>
			<if test="finalAssemblyOfflineTime != null">final_assembly_offline_time,</if>
			<if test="cvtLaunchTime != null">cvt_launch_time,</if>
			<if test="cvtOfflineTime != null">cvt_offline_time,</if>
			</trim>
			<trim prefix="values (" suffix=")" suffixOverrides=",">
			<if test="orderNo != null">#{orderNo},</if>
			<if test="engineNo != null">#{engineNo},</if>
			@@ -132,6 +237,12 @@
			<if test="updateTime != null">#{updateTime},</if>
			<if test="remarks != null">#{remarks},</if>
			<if test="report30 != null">#{report30},</if>
			<if test="boxClosingOnlineTime != null">#{boxClosingOnlineTime},</if>
			<if test="closingBoxOfflineTime != null">#{closingBoxOfflineTime},</if>
			<if test="finalAssemblyLaunchTime != null">#{finalAssemblyLaunchTime},</if>
			<if test="finalAssemblyOfflineTime != null">#{finalAssemblyOfflineTime},</if>
			<if test="cvtLaunchTime != null">#{cvtLaunchTime},</if>
			<if test="cvtOfflineTime != null">#{cvtOfflineTime},</if>

			</trim>
			</insert>
			@@ -165,6 +276,12 @@
			<if test="updateTime != null">update_time = #{updateTime},</if>
			<if test="remarks != null">remarks = #{remarks},</if>
			<if test="report30 != null">report_30 = #{report30},</if>
			<if test="boxClosingOnlineTime != null">box_closing_online_time = #{boxClosingOnlineTime},</if>
			<if test="closingBoxOfflineTime != null">closing_box_offline_time = #{closingBoxOfflineTime},</if>
			<if test="finalAssemblyLaunchTime != null">final_assembly_launch_time = #{finalAssemblyLaunchTime},</if>
			<if test="finalAssemblyOfflineTime != null">final_assembly_offline_time = #{finalAssemblyOfflineTime},</if>
			<if test="cvtLaunchTime != null">cvt_launch_time = #{cvtLaunchTime},</if>
			<if test="cvtOfflineTime != null">cvt_offline_time = #{cvtOfflineTime},</if>

			</trim>
			where id = #{id}
			@@ -175,7 +292,7 @@
			</delete>

			<delete id="deleteBsOrderSchedulingByIds" parameterType="String">
			delete from bs_order_scheduling where id in
			delete from bs_order_scheduling where id in
			<foreach item="id" collection="array" open="(" separator="," close=")">
			#{id}
			</foreach>