-打印bug修改

admin

2024-10-15 6d313a4a6f9f9d7ea65ec50ab0d4491e595edb97

 jcdm-main/src/main/resources/mapper/da/passingStationCollection/DaPassingStationCollectionMapper.xml

@@ -19,8 +19,8 @@
        <result property="outRsSign"    column="out_rs_sign"    />
        <result property="outMsgSign"    column="out_msg_sign"    />
        <result property="collectionTime"    column="collection_time"    />
        <result property="spareField1"    column="spare_field_1"    />
        <result property="spareField2"    column="spare_field_2"    />
        <result property="spareField1"    column="spare_field1"    />
        <result property="spareField2"    column="spare_field2"    />
        <result property="createUser"    column="create_user"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateUser"    column="update_user"    />
@@ -29,7 +29,7 @@
    </resultMap>

    <sql id="selectDaPassingStationCollectionVo">
        select id, work_order_no, sfc_code, product_code, production_line, location_code, equipment_no, inbound_time, outbound_time, in_rs_sign, in_msg_sign, out_rs_sign, out_msg_sign, collection_time, spare_field_1, spare_field_2, create_user, create_time, update_user, update_time, beat_time from da_passing_station_collection
        select id, work_order_no, sfc_code, product_code, production_line, location_code, equipment_no, inbound_time, outbound_time, in_rs_sign, in_msg_sign, out_rs_sign, out_msg_sign, collection_time, spare_field1, spare_field2, create_user, create_time, update_user, update_time, beat_time from da_passing_station_collection
    </sql>

    <select id="selectDaPassingStationCollectionList" parameterType="DaPassingStationCollection" resultMap="DaPassingStationCollectionResult">
@@ -71,8 +71,8 @@
            <if test="outRsSign != null">out_rs_sign,</if>
            <if test="outMsgSign != null">out_msg_sign,</if>
            <if test="collectionTime != null">collection_time,</if>
            <if test="spareField1 != null">spare_field_1,</if>
            <if test="spareField2 != null">spare_field_2,</if>
            <if test="spareField1 != null">spare_field1,</if>
            <if test="spareField2 != null">spare_field2,</if>
            <if test="createUser != null">create_user,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateUser != null">update_user,</if>
@@ -104,6 +104,17 @@
         </trim>
    </insert>

    <update id="updateDaPassingStationCollectionBySfcCodeAndLocationCode" parameterType="DaPassingStationCollection">
        UPDATE da_passing_station_collection
        <trim prefix="SET" suffixOverrides=",">
            <if test="outboundTime != null">outbound_time = #{outboundTime},</if>
            <if test="outRsSign != null">out_rs_sign = #{outRsSign},</if>
        </trim>
        WHERE
            sfc_code = #{sfcCode}
          AND location_code = #{locationCode}
    </update>

    <update id="updateDaPassingStationCollection" parameterType="DaPassingStationCollection">
        update da_passing_station_collection
        <trim prefix="SET" suffixOverrides=",">