Jcdm041-Mes.git

			@@ -43,10 +43,13 @@
			<result property="spareField2" column="spare_field_2" />
			<result property="spareField3" column="spare_field_3" />
			<result property="spareField4" column="spare_field_4" />
			<result property="typeZ" column="type_z" />
			<result property="productionNotice" column="production_notice" />

			</resultMap>

			<sql id="selectOmProductionOrdeInfoVo">
			select id, work_order_no, sales_order_code, product_code, product_name, workshop_code, line_code, route_code, bom_code, recipe_code, plan_qty, actual_qty, bad_qty, scrap_qty, repair_qty, actual_online_qty, online_completion_mark, demand_date, plan_start_time, plan_end_time, actual_start_time, actual_end_time, serial_number, order_status, create_time, update_time, create_user, update_user, remarks, stream_number, custom, market_area_code, software_version_code, product_company_code, spare_field_1, spare_field_2, spare_field_3, spare_field_4 from om_production_orde_info
			select id, work_order_no, sales_order_code,type_z,product_code, product_name, workshop_code, line_code, route_code, bom_code, recipe_code, plan_qty, actual_qty, bad_qty, scrap_qty, repair_qty, actual_online_qty, online_completion_mark, demand_date, plan_start_time, plan_end_time, actual_start_time, actual_end_time, serial_number, order_status, create_time, update_time, create_user, update_user, remarks, stream_number, custom, market_area_code, software_version_code, product_company_code, spare_field_1, spare_field_2, spare_field_3, spare_field_4, production_notice from om_production_orde_info
			</sql>

			<select id="selectOmProductionOrdeInfoList" parameterType="OmProductionOrdeInfo" resultMap="OmProductionOrdeInfoResult">
			@@ -65,8 +68,12 @@
			<if test="orderStatus != null and orderStatus != ''"> and order_status = #{orderStatus}</if>
			<if test="custom != null and custom != ''"> and custom like concat('%', #{custom}, '%')</if>
			<if test="marketAreaCode != null and marketAreaCode != ''"> and market_area_code like concat('%', #{marketAreaCode}, '%')</if>
			<if test="typeZ != null and typeZ != ''"> and type_z like concat('%', #{typeZ}, '%')</if>
			<if test="softwareVersionCode != null and softwareVersionCode != ''"> and software_version_code like concat('%', #{softwareVersionCode}, '%')</if>
			<if test="productCompanyCode != null and productCompanyCode != ''"> and product_company_code like concat('%', #{productCompanyCode}, '%')</if>
			<if test="productionNotice != null and productionNotice != ''"> and production_notice like concat('%', #{productionNotice}, '%')</if>
			<if test="dateConditions != null and dateConditions != ''"> and create_time BETWEEN #{startTime} AND #{endTime}</if>

			</where>
			ORDER BY stream_number DESC
			</select>
			@@ -81,6 +88,7 @@
			<trim prefix="(" suffix=")" suffixOverrides=",">
			<if test="id != null">id,</if>
			<if test="workOrderNo != null">work_order_no,</if>
			<if test="typeZ != null">type_z,</if>
			<if test="salesOrderCode != null">sales_order_code,</if>
			<if test="productCode != null">product_code,</if>
			<if test="productName != null">product_name,</if>
			@@ -117,10 +125,13 @@
			<if test="spareField2 != null">spare_field_2,</if>
			<if test="spareField3 != null">spare_field_3,</if>
			<if test="spareField4 != null">spare_field_4,</if>
			</trim>
			<if test="productionNotice != null">production_notice,</if>

			</trim>
			<trim prefix="values (" suffix=")" suffixOverrides=",">
			<if test="id != null">#{id},</if>
			<if test="workOrderNo != null">#{workOrderNo},</if>
			<if test="typeZ != null">#{typeZ},</if>
			<if test="salesOrderCode != null">#{salesOrderCode},</if>
			<if test="productCode != null">#{productCode},</if>
			<if test="productName != null">#{productName},</if>
			@@ -157,7 +168,9 @@
			<if test="spareField2 != null">#{spareField2},</if>
			<if test="spareField3 != null">#{spareField3},</if>
			<if test="spareField4 != null">#{spareField4},</if>
			</trim>
			<if test="productionNotice != null">#{productionNotice},</if>

			</trim>
			</insert>

			<update id="updateOmProductionOrdeInfo" parameterType="OmProductionOrdeInfo">
			@@ -166,6 +179,7 @@
			<if test="workOrderNo != null">work_order_no = #{workOrderNo},</if>
			<if test="salesOrderCode != null">sales_order_code = #{salesOrderCode},</if>
			<if test="productCode != null">product_code = #{productCode},</if>
			<if test="typeZ != null">type_z = #{typeZ},</if>
			<if test="productName != null">product_name = #{productName},</if>
			<if test="workshopCode != null">workshop_code = #{workshopCode},</if>
			<if test="lineCode != null">line_code = #{lineCode},</if>
			@@ -200,6 +214,8 @@
			<if test="spareField2 != null">spare_field_2 = #{spareField2},</if>
			<if test="spareField3 != null">spare_field_3 = #{spareField3},</if>
			<if test="spareField4 != null">spare_field_4 = #{spareField4},</if>
			<if test="productionNotice != null">production_notice = #{productionNotice},</if>

			</trim>
			where id = #{id}
			</update>