-打印bug修改

admin

2024-10-15 6d313a4a6f9f9d7ea65ec50ab0d4491e595edb97

 jcdm-main/src/main/resources/mapper/om/productionOrde/OmProductionOrdeInfoMapper.xml

@@ -36,23 +36,29 @@
        <result property="remarks"    column="remarks"    />
        <result property="streamNumber"    column="stream_number"    />
        <result property="custom"    column="custom"    />
        <result property="marketAreaCode"    column="market_area_code"    />
        <result property="materialCode"    column="material_code"    />
        <result property="softwareVersionCode"    column="software_version_code"    />
        <result property="productCompanyCode"    column="product_company_code"    />
        <result property="spareField1"    column="spare_field_1"    />
        <result property="spareField2"    column="spare_field_2"    />
        <result property="spareField3"    column="spare_field_3"    />
        <result property="spareField4"    column="spare_field_4"    />
        <result property="trolleyYard"    column="trolley_yard"    />
        <result property="spareField2"    column="spare_field2"    />
        <result property="spareField3"    column="spare_field3"    />
        <result property="spareField4"    column="spare_field4"    />
        <result property="siteCode"    column="site_code"    />
        <result property="productNum"    column="product_num"    />
        <result property="stationCode"    column="station_code"    />
        <result property="resultCode"    column="result_code"    />
        <result property="resultText"    column="result_text"    />
        <result property="sfResult"    column="sf_result"    />
        <result property="productModel"    column="product_model"    />
        <result property="automaticNgFlag"    column="automatic_ng_flag"    />
        <result property="automaticNgStation"    column="automatic_ng_station"    />
        <result property="automaticNgScrewNumber"    column="automatic_ng_screw_number"    />
        <result property="artificialNgFlag"    column="artificial_ng_flag"    />

    </resultMap>

    <sql id="selectOmProductionOrdeInfoVo">
        select id,site_code,product_num,station_code,result_code,result_text,sf_result ,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,site_code,product_num,station_code, product_model,result_code,result_text,sf_result ,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, material_code, software_version_code, product_company_code, trolley_yard, spare_field2, spare_field3, spare_field4, automatic_ng_flag, automatic_ng_station, automatic_ng_screw_number, artificial_ng_flag from om_production_orde_info
    </sql>

    <select id="selectOmProductionOrdeInfoList" parameterType="OmProductionOrdeInfo" resultMap="OmProductionOrdeInfoResult">
@@ -70,7 +76,7 @@
            <if test="recipeCode != null  and recipeCode != ''"> and recipe_code like concat('%', #{recipeCode}, '%')</if>
            <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="materialCode != null  and materialCode != ''"> and material_code like concat('%', #{materialCode}, '%')</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="siteCode != null  and siteCode != ''"> and site_code = #{siteCode}</if>
@@ -79,6 +85,8 @@
            <if test="resultText != null  and resultText != ''"> and result_text = #{resultText}</if>
            <if test="resultCode != null  and resultCode != ''"> and result_code = #{resultCode}</if>
            <if test="sfResult != null  and sfResult != ''"> and sf_result = #{sfResult}</if>
            <if test="onlineCompletionMark != null  and sfResult != ''"> and online_completion_mark = #{onlineCompletionMark}</if>

        </where>
        ORDER BY stream_number DESC
    </select>
@@ -122,10 +130,10 @@
            <if test="remarks != null">remarks,</if>
            <if test="streamNumber != null">stream_number,</if>
            <if test="custom != null">custom,</if>
            <if test="marketAreaCode != null">market_area_code,</if>
            <if test="materialCode != null">material_code,</if>
            <if test="softwareVersionCode != null">software_version_code,</if>
            <if test="productCompanyCode != null">product_company_code,</if>
            <if test="spareField1 != null">spare_field_1,</if>
            <if test="trolleyYard != null">trolley_yard,</if>
            <if test="spareField2 != null">spare_field_2,</if>
            <if test="spareField3 != null">spare_field_3,</if>
            <if test="spareField4 != null">spare_field_4,</if>
@@ -135,7 +143,13 @@
            <if test="resultText != null">result_text,</if>
            <if test="resultCode != null">result_code,</if>
            <if test="sfResult != null">sf_result,</if>
         </trim>
            <if test="productModel != null">product_model,</if>
            <if test="automaticNgFlag != null">automatic_ng_flag,</if>
            <if test="automaticNgStation != null">automatic_ng_station,</if>
            <if test="automaticNgScrewNumber != null">automatic_ng_screw_number,</if>
            <if test="artificialNgFlag != null">artificial_ng_flag,</if>

        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="workOrderNo != null">#{workOrderNo},</if>
@@ -168,10 +182,10 @@
            <if test="remarks != null">#{remarks},</if>
            <if test="streamNumber != null">#{streamNumber},</if>
            <if test="custom != null">#{custom},</if>
            <if test="marketAreaCode != null">#{marketAreaCode},</if>
            <if test="materialCode != null">#{materialCode},</if>
            <if test="softwareVersionCode != null">#{softwareVersionCode},</if>
            <if test="productCompanyCode != null">#{productCompanyCode},</if>
            <if test="spareField1 != null">#{spareField1},</if>
            <if test="trolleyYard != null">#{trolleyYard},</if>
            <if test="spareField2 != null">#{spareField2},</if>
            <if test="spareField3 != null">#{spareField3},</if>
            <if test="spareField4 != null">#{spareField4},</if>
@@ -181,7 +195,13 @@
            <if test="resultText != null">#{resultText},</if>
            <if test="resultCode != null">#{resultCode},</if>
            <if test="sfResult != null">#{sfResult},</if>
         </trim>
            <if test="productModel != null">#{productModel},</if>
            <if test="automaticNgFlag != null">#{automaticNgFlag},</if>
            <if test="automaticNgStation != null">#{automaticNgStation},</if>
            <if test="automaticNgScrewNumber != null">#{automaticNgScrewNumber},</if>
            <if test="artificialNgFlag != null">#{artificialNgFlag},</if>

        </trim>
    </insert>

    <update id="updateOmProductionOrdeInfo" parameterType="OmProductionOrdeInfo">
@@ -217,10 +237,10 @@
            <if test="remarks != null">remarks = #{remarks},</if>
            <if test="streamNumber != null">stream_number = #{streamNumber},</if>
            <if test="custom != null">custom = #{custom},</if>
            <if test="marketAreaCode != null">market_area_code = #{marketAreaCode},</if>
            <if test="materialCode != null">material_code = #{materialCode},</if>
            <if test="softwareVersionCode != null">software_version_code = #{softwareVersionCode},</if>
            <if test="productCompanyCode != null">product_company_code = #{productCompanyCode},</if>
            <if test="spareField1 != null">spare_field_1 = #{spareField1},</if>
            <if test="trolleyYard != null">trolley_yard = #{trolleyYard},</if>
            <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>
@@ -230,6 +250,11 @@
            <if test="resultText != null">result_text = #{resultText},</if>
            <if test="resultCode != null">result_code = #{resultCode},</if>
            <if test="sfResult != null">sf_result = #{sfResult},</if>
            <if test="productModel != null">product_model = #{productModel},</if>
            <if test="automaticNgFlag != null">automatic_ng_flag = #{automaticNgFlag},</if>
            <if test="automaticNgStation != null">automatic_ng_station = #{automaticNgStation},</if>
            <if test="automaticNgScrewNumber != null">automatic_ng_screw_number = #{automaticNgScrewNumber},</if>
            <if test="artificialNgFlag != null">artificial_ng_flag = #{artificialNgFlag},</if>
        </trim>
        where id = #{id}
    </update>