deviceNo get product

Fancy

2024-07-20 5541562a51ddec2c25fcd6cd3febbc4765a2190d

deviceNo get product

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrAssemblyPlanMapper.java

@@ -35,6 +35,8 @@

    boolean exists(String name, Long id);

    PrAssemblyPlan selectByDeviceNo(String proCode, String batchNumber);

    List<PrAssemblyPlan> selectAssyPlanList(PrAssemblyPlan params);

    List<PrAssemblyPlan> selectAssyPlanSimplify(PrAssemblyPlan params);

 pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml

@@ -21,15 +21,16 @@
        <result property="inputNumber" column="input_number" jdbcType="INTEGER"/>
        <result property="outputNumber" column="output_number" jdbcType="INTEGER"/>
        <association property="proName" column="pro_id" javaType="java.lang.Long"
            select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProNameById" fetchType="eager" />
                     select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProNameById" fetchType="eager"/>
        <association property="creatorName" column="creator" javaType="java.lang.Long"
            select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectNameByUserId" fetchType="eager" />
                     select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectNameByUserId" fetchType="eager"/>
        <association property="batchNo" column="batch_id" javaType="java.lang.Long"
            select="com.dy.pmsGlobal.daoPr.PrBatchNumberMapper.selectBatchNoById" fetchType="eager" />
                     select="com.dy.pmsGlobal.daoPr.PrBatchNumberMapper.selectBatchNoById" fetchType="eager"/>
        <association property="processName" column="process_id" javaType="java.lang.Long"
            select="com.dy.pmsGlobal.daoPr.PrProductionProcessMapper.selectProcessNameById" fetchType="eager" />
                     select="com.dy.pmsGlobal.daoPr.PrProductionProcessMapper.selectProcessNameById" fetchType="eager"/>
        <collection property="process" ofType="com.dy.pmsGlobal.pojoPr.PrProductionProcess"
                    select="com.dy.pmsGlobal.daoPr.PrProductionProcessMapper.selectByPrimaryKey" fetchType="eager" column="process_id" />
                    select="com.dy.pmsGlobal.daoPr.PrProductionProcessMapper.selectByPrimaryKey" fetchType="eager"
                    column="process_id"/>
    </resultMap>

    <resultMap id="PlanResultMap" type="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan">
@@ -49,47 +50,81 @@
        <result property="inputNumber" column="input_number" jdbcType="INTEGER"/>
        <result property="outputNumber" column="output_number" jdbcType="INTEGER"/>
        <collection property="process" ofType="com.dy.pmsGlobal.pojoPr.PrProductionProcess"
                    select="com.dy.pmsGlobal.daoPr.PrProductionProcessMapper.selectByProcessId" fetchType="eager" column="process_id" />
                    select="com.dy.pmsGlobal.daoPr.PrProductionProcessMapper.selectByProcessId" fetchType="eager"
                    column="process_id"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,pro_id,batch_id,
        id
        ,pro_id,batch_id,
        process_id,name,number,
        status,creator,
        dt,start_date,end_date,
        deleted,content,input_number,output_number
    </sql>

    <select id="selectPlanNamesByProcessId" resultType="java.lang.String" >
    <sql id="part_Column_List">
        ${alias}.id,
        ${alias}.pro_id,
        ${alias}.batch_id,
        ${alias}.process_id,
        ${alias}.name,
        ${alias}.number,
        ${alias}.status,
        ${alias}.creator,
        ${alias}.dt,
        ${alias}.start_date,
        ${alias}.end_date,
        ${alias}.deleted,
        ${alias}.content,
        ${alias}.input_number,
        ${alias}.output_number
    </sql>
    <select id="selectPlanNamesByProcessId" resultType="java.lang.String">
        select GROUP_CONCAT(name SEPARATOR ',')
        from pr_assembly_plan
        where process_id = #{processId} and deleted = 0
        where process_id = #{processId}
          and deleted = 0
    </select>
    <select id="processIsQuote" resultType="java.lang.Boolean" parameterType="java.lang.Long">
        select count(1)
        from pr_assembly_plan
        where  deleted = 0
        where deleted = 0
        <if test="id != null">
            and process_id = #{id}
        </if>
    </select>
    <select id="selectNameByPlanId" parameterType="java.lang.Long" resultType="String">
        select name from pr_assembly_plan where id = #{id}
        select name
        from pr_assembly_plan
        where id = #{id}
    </select>
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        <include refid="Base_Column_List"/>
        from pr_assembly_plan
        where  id = #{id,jdbcType=BIGINT} 
        where id = #{id,jdbcType=BIGINT}
    </select>
    <select id="selectByProcess" resultMap="com.dy.pmsGlobal.daoPr.PrProductionNodeMapper.BaseResultMap">
        select *
        from pr_production_node
        where process_id = #{processId,jdbcType=BIGINT}
    </select>
    <select id="selectAssyPlanSimplify" resultMap="PlanResultMap" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan">

    <select id="selectByDeviceNo" parameterType="java.lang.String" resultMap="PlanResultMap">
        select
        <include refid="Base_Column_List" />
        <include refid="part_Column_List">
            <property name="alias" value="p"/>
        </include>
        from pr_assembly_plan p,plt_product pp,pr_batch_number b
        where p.pro_id = pp.id  and p.batch_id = b.id
          and pp.code = #{proCode,jdbcType=VARCHAR}
          and b.batch_number = #{batchNumber,jdbcType=VARCHAR}
    </select>

    <select id="selectAssyPlanSimplify" resultMap="PlanResultMap"
            parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan">
        select
        <include refid="Base_Column_List"/>
        from pr_assembly_plan
        <trim prefix="where" suffixOverrides="and">
            <if test="proId != null">
@@ -133,7 +168,7 @@
    </select>
    <select id="selectAssyPlanList" resultMap="BaseResultMap" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan">
        select
        <include refid="Base_Column_List" />
        <include refid="Base_Column_List"/>
        from pr_assembly_plan
        <trim prefix="where" suffixOverrides="and">
            <if test="proId != null">
@@ -177,57 +212,61 @@
    </select>

    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
        delete from pr_assembly_plan
        where  id = #{id,jdbcType=BIGINT} 
        delete
        from pr_assembly_plan
        where id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan" useGeneratedKeys="true">
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan"
            useGeneratedKeys="true">
        insert into pr_assembly_plan
        ( id,pro_id,batch_id
        ,process_id,name,number
        ,status,creator
        ,dt,start_date,end_date
        ,deleted,content,input_number,output_number)
        values (#{id,jdbcType=BIGINT},#{proId,jdbcType=BIGINT},#{batchId,jdbcType=BIGINT}
        ,#{processId,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{number,jdbcType=INTEGER}
        ,#{status,jdbcType=TINYINT},#{creator,jdbcType=VARCHAR}
        ,#{dt,jdbcType=TIMESTAMP},#{startDate,jdbcType=VARCHAR},#{endDate,jdbcType=VARCHAR}
        ,#{deleted,jdbcType=TINYINT},#{content,jdbcType=VARCHAR},#{inputNumber,jdbcType=INTEGER},#{outputNumber,jdbcType=INTEGER})
        ( id, pro_id, batch_id
        , process_id, name, number
        , status, creator
        , dt, start_date, end_date
        , deleted, content, input_number, output_number)
        values ( #{id,jdbcType=BIGINT}, #{proId,jdbcType=BIGINT}, #{batchId,jdbcType=BIGINT}
               , #{processId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{number,jdbcType=INTEGER}
               , #{status,jdbcType=TINYINT}, #{creator,jdbcType=VARCHAR}
               , #{dt,jdbcType=TIMESTAMP}, #{startDate,jdbcType=VARCHAR}, #{endDate,jdbcType=VARCHAR}
               , #{deleted,jdbcType=TINYINT}, #{content,jdbcType=VARCHAR}, #{inputNumber,jdbcType=INTEGER}
               , #{outputNumber,jdbcType=INTEGER})
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan" useGeneratedKeys="true">
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan"
            useGeneratedKeys="true">
        insert into pr_assembly_plan
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>
                <if test="proId != null">pro_id,</if>
                <if test="batchId != null">batch_id,</if>
                <if test="processId != null">process_id,</if>
                <if test="name != null">name,</if>
                <if test="number != null">number,</if>
                <if test="status != null">status,</if>
                <if test="creator != null">creator,</if>
                <if test="dt != null">dt,</if>
                <if test="startDate != null">start_date,</if>
                <if test="endDate != null">end_date,</if>
                <if test="deleted != null">deleted,</if>
                <if test="content != null">content,</if>
                <if test="inputNumber != null">input_number,</if>
                <if test="outputNumber != null">output_number,</if>
            <if test="id != null">id,</if>
            <if test="proId != null">pro_id,</if>
            <if test="batchId != null">batch_id,</if>
            <if test="processId != null">process_id,</if>
            <if test="name != null">name,</if>
            <if test="number != null">number,</if>
            <if test="status != null">status,</if>
            <if test="creator != null">creator,</if>
            <if test="dt != null">dt,</if>
            <if test="startDate != null">start_date,</if>
            <if test="endDate != null">end_date,</if>
            <if test="deleted != null">deleted,</if>
            <if test="content != null">content,</if>
            <if test="inputNumber != null">input_number,</if>
            <if test="outputNumber != null">output_number,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
                <if test="batchId != null">#{batchId,jdbcType=BIGINT},</if>
                <if test="processId != null">#{processId,jdbcType=BIGINT},</if>
                <if test="name != null">#{name,jdbcType=VARCHAR},</if>
                <if test="number != null">#{number,jdbcType=INTEGER},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
                <if test="creator != null">#{creator,jdbcType=VARCHAR},</if>
                <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
                <if test="startDate != null">#{startDate,jdbcType=VARCHAR},</if>
                <if test="endDate != null">#{endDate,jdbcType=VARCHAR},</if>
                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
                <if test="content != null">#{content,jdbcType=VARCHAR},</if>
                <if test="inputNumber != null">#{intputNumber,jdbcType=INTEGER},</if>
                <if test="outputNumber != null">#{outputNumber,jdbcType=INTEGER},</if>
            <if test="id != null">#{id,jdbcType=BIGINT},</if>
            <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
            <if test="batchId != null">#{batchId,jdbcType=BIGINT},</if>
            <if test="processId != null">#{processId,jdbcType=BIGINT},</if>
            <if test="name != null">#{name,jdbcType=VARCHAR},</if>
            <if test="number != null">#{number,jdbcType=INTEGER},</if>
            <if test="status != null">#{status,jdbcType=TINYINT},</if>
            <if test="creator != null">#{creator,jdbcType=VARCHAR},</if>
            <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
            <if test="startDate != null">#{startDate,jdbcType=VARCHAR},</if>
            <if test="endDate != null">#{endDate,jdbcType=VARCHAR},</if>
            <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
            <if test="content != null">#{content,jdbcType=VARCHAR},</if>
            <if test="inputNumber != null">#{intputNumber,jdbcType=INTEGER},</if>
            <if test="outputNumber != null">#{outputNumber,jdbcType=INTEGER},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan">
@@ -276,31 +315,30 @@
                output_number = #{outputNumber,jdbcType=INTEGER},
            </if>
        </set>
        where   id = #{id,jdbcType=BIGINT} 
        where id = #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan">
        update pr_assembly_plan
        set 
            pro_id =  #{proId,jdbcType=BIGINT},
            batch_id =  #{batchId,jdbcType=BIGINT},
            process_id =  #{processId,jdbcType=BIGINT},
            name =  #{name,jdbcType=VARCHAR},
            number =  #{number,jdbcType=INTEGER},
            status =  #{status,jdbcType=TINYINT},
            creator =  #{creator,jdbcType=VARCHAR},
            dt =  #{dt,jdbcType=TIMESTAMP},
            start_date =  #{startDate,jdbcType=VARCHAR},
            end_date =  #{endDate,jdbcType=VARCHAR},
            deleted =  #{deleted,jdbcType=TINYINT},
            content =  #{content,jdbcType=VARCHAR},
            input_number = #{inputNumber,jdbcType=INTEGER},
        set pro_id        = #{proId,jdbcType=BIGINT},
            batch_id      = #{batchId,jdbcType=BIGINT},
            process_id    = #{processId,jdbcType=BIGINT},
            name          = #{name,jdbcType=VARCHAR},
            number        = #{number,jdbcType=INTEGER},
            status        = #{status,jdbcType=TINYINT},
            creator       = #{creator,jdbcType=VARCHAR},
            dt            = #{dt,jdbcType=TIMESTAMP},
            start_date    = #{startDate,jdbcType=VARCHAR},
            end_date      = #{endDate,jdbcType=VARCHAR},
            deleted       = #{deleted,jdbcType=TINYINT},
            content       = #{content,jdbcType=VARCHAR},
            input_number  = #{inputNumber,jdbcType=INTEGER},
            output_number = #{outputNumber,jdbcType=INTEGER}
        where   id = #{id,jdbcType=BIGINT} 
        where id = #{id,jdbcType=BIGINT}
    </update>

    <select id="selectSome" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        <include refid="Base_Column_List"/>
        from pr_assembly_plan
        <trim prefix="where" suffixOverrides="and">
            <if test="proId != null">
@@ -314,7 +352,7 @@
            </if>
        </trim>
        order by id desc
        <trim prefix="limit " >
        <trim prefix="limit ">
            <if test="start != null and count != null">
                #{start}, #{count}
            </if>
@@ -346,7 +384,8 @@
    </select>

    <update id="deleteLogicById" parameterType="java.lang.Long">
        update pr_assembly_plan set deleted = 1
        update pr_assembly_plan
        set deleted = 1
        where id = #{id}
    </update>
</mapper>

 pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml

@@ -5,25 +5,25 @@
<mapper namespace="com.dy.pmsGlobal.daoSta.StaDeviceLastMapper">

    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceLast">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="deviceNo" column="device_no" jdbcType="VARCHAR"/>
            <result property="workId" column="work_id" jdbcType="BIGINT"/>
            <result property="repairId" column="repair_id" jdbcType="BIGINT"/>
            <result property="planId" column="plan_id" jdbcType="BIGINT"/>
            <result property="stationId" column="station_id" jdbcType="BIGINT"/>
            <result property="currNode" column="curr_node" jdbcType="BIGINT"/>
            <result property="nodeContent" column="node_content" jdbcType="VARCHAR"/>
            <result property="deviceCycleContent" column="device_cycle_content" jdbcType="VARCHAR"/>
            <result property="status" column="status" jdbcType="TINYINT"/>
            <result property="result" column="result" jdbcType="TINYINT"/>
            <result property="errorMsg" column="error_msg" jdbcType="VARCHAR"/>
            <result property="assistants" column="assistants" jdbcType="VARCHAR"/>
            <result property="updatedBy" column="updated_by" jdbcType="BIGINT"/>
            <result property="inTime" column="in_time" jdbcType="TIMESTAMP"/>
            <result property="outTime" column="out_time" jdbcType="TIMESTAMP"/>
            <result property="inLineTime" column="in_line_time" jdbcType="TIMESTAMP"/>
            <result property="outLineTime" column="out_line_time" jdbcType="TIMESTAMP"/>
            <result property="memo" column="memo" jdbcType="VARCHAR"/>
        <id property="id" column="id" jdbcType="BIGINT"/>
        <result property="deviceNo" column="device_no" jdbcType="VARCHAR"/>
        <result property="workId" column="work_id" jdbcType="BIGINT"/>
        <result property="repairId" column="repair_id" jdbcType="BIGINT"/>
        <result property="planId" column="plan_id" jdbcType="BIGINT"/>
        <result property="stationId" column="station_id" jdbcType="BIGINT"/>
        <result property="currNode" column="curr_node" jdbcType="BIGINT"/>
        <result property="nodeContent" column="node_content" jdbcType="VARCHAR"/>
        <result property="deviceCycleContent" column="device_cycle_content" jdbcType="VARCHAR"/>
        <result property="status" column="status" jdbcType="TINYINT"/>
        <result property="result" column="result" jdbcType="TINYINT"/>
        <result property="errorMsg" column="error_msg" jdbcType="VARCHAR"/>
        <result property="assistants" column="assistants" jdbcType="VARCHAR"/>
        <result property="updatedBy" column="updated_by" jdbcType="BIGINT"/>
        <result property="inTime" column="in_time" jdbcType="TIMESTAMP"/>
        <result property="outTime" column="out_time" jdbcType="TIMESTAMP"/>
        <result property="inLineTime" column="in_line_time" jdbcType="TIMESTAMP"/>
        <result property="outLineTime" column="out_line_time" jdbcType="TIMESTAMP"/>
        <result property="memo" column="memo" jdbcType="VARCHAR"/>
    </resultMap>
    <resultMap id="joinResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceLast" extends="BaseResultMap">
        <result property="planName" column="plan_name" jdbcType="VARCHAR"/>
@@ -58,12 +58,12 @@
        select
        <include refid="Base_Column_List" />
        from sta_device_last
        where  id = #{id,jdbcType=BIGINT} 
        where  id = #{id,jdbcType=BIGINT}
    </select>

    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
        delete from sta_device_last
        where  id = #{id,jdbcType=BIGINT} 
        where  id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast" useGeneratedKeys="true">
        insert into sta_device_last
@@ -75,122 +75,122 @@
        ,updated_by,in_time,out_time
        ,memo)
        values (#{id,jdbcType=BIGINT},#{deviceNo,jdbcType=VARCHAR},#{workId,jdbcType=BIGINT}
        ,#{repairId,jdbcType=BIGINT},#{planId,jdbcType=BIGINT},#{stationId,jdbcType=BIGINT}
        ,#{currNode,jdbcType=BIGINT},#{nodeContent,jdbcType=VARCHAR},#{deviceCycleContent,jdbcType=VARCHAR}
        ,#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT}
        ,#{errorMsg,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR}
        ,#{updatedBy,jdbcType=BIGINT},#{inTime,jdbcType=TIMESTAMP},#{outTime,jdbcType=TIMESTAMP}
        ,#{inLineTime,jdbcType=TIMESTAMP},#{outLineTime,jdbcType=TIMESTAMP}
        ,#{memo,jdbcType=VARCHAR})
               ,#{repairId,jdbcType=BIGINT},#{planId,jdbcType=BIGINT},#{stationId,jdbcType=BIGINT}
               ,#{currNode,jdbcType=BIGINT},#{nodeContent,jdbcType=VARCHAR},#{deviceCycleContent,jdbcType=VARCHAR}
               ,#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT}
               ,#{errorMsg,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR}
               ,#{updatedBy,jdbcType=BIGINT},#{inTime,jdbcType=TIMESTAMP},#{outTime,jdbcType=TIMESTAMP}
               ,#{inLineTime,jdbcType=TIMESTAMP},#{outLineTime,jdbcType=TIMESTAMP}
               ,#{memo,jdbcType=VARCHAR})
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast" useGeneratedKeys="true">
        insert into sta_device_last
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>
                <if test="deviceNo != null">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="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="updatedBy != null">updated_by,</if>
                <if test="inTime != null">in_time,</if>
                <if test="outTime != null">out_time,</if>
                <if test="inLineTime != null">in_line_time,</if>
                <if test="outLineTime != null">out_line_time,</if>
                <if test="memo != null">memo,</if>
            <if test="id != null">id,</if>
            <if test="deviceNo != null">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="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="updatedBy != null">updated_by,</if>
            <if test="inTime != null">in_time,</if>
            <if test="outTime != null">out_time,</if>
            <if test="inLineTime != null">in_line_time,</if>
            <if test="outLineTime != null">out_line_time,</if>
            <if test="memo != null">memo,</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="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="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="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
                <if test="inTime != null">#{inTime,jdbcType=TIMESTAMP},</if>
                <if test="outTime != null">#{outTime,jdbcType=TIMESTAMP},</if>
                <if test="inLineTime != null">#{inLineTime,jdbcType=TIMESTAMP},</if>
                <if test="outLineTime != null">#{outLineTime,jdbcType=TIMESTAMP},</if>
                <if test="memo != null">#{memo,jdbcType=VARCHAR},</if>
            <if test="id != null">#{id,jdbcType=BIGINT},</if>
            <if test="deviceNo != null">#{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="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="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
            <if test="inTime != null">#{inTime,jdbcType=TIMESTAMP},</if>
            <if test="outTime != null">#{outTime,jdbcType=TIMESTAMP},</if>
            <if test="inLineTime != null">#{inLineTime,jdbcType=TIMESTAMP},</if>
            <if test="outLineTime != null">#{outLineTime,jdbcType=TIMESTAMP},</if>
            <if test="memo != null">#{memo,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast">
        update sta_device_last
        <set>
                <if test="deviceNo != null">
                    device_no = #{deviceNo,jdbcType=VARCHAR},
                </if>
                <if test="workId != null">
                    work_id = #{workId,jdbcType=BIGINT},
                </if>
                <if test="repairId != null">
                    repair_id = #{repairId,jdbcType=BIGINT},
                </if>
                <if test="planId != null">
                    plan_id = #{planId,jdbcType=BIGINT},
                </if>
                <if test="stationId != null">
                    station_id = #{stationId,jdbcType=BIGINT},
                </if>
                <if test="currNode != null">
                    curr_node = #{currNode,jdbcType=BIGINT},
                </if>
                <if test="nodeContent != null">
                    node_content = #{nodeContent,jdbcType=VARCHAR},
                </if>
                <if test="deviceCycleContent != null">
                    device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
                </if>
                <if test="status != null">
                    status = #{status,jdbcType=TINYINT},
                </if>
                <if test="result != null">
                    result = #{result,jdbcType=TINYINT},
                </if>
                <if test="errorMsg != null">
                    error_msg = #{errorMsg,jdbcType=VARCHAR},
                </if>
                <if test="assistants != null">
                    assistants = #{assistants,jdbcType=VARCHAR},
                </if>
                <if test="updatedBy != null">
                    updated_by = #{updatedBy,jdbcType=BIGINT},
                </if>
                <if test="inTime != null">
                    in_time = #{inTime,jdbcType=TIMESTAMP},
                </if>
                <if test="outTime != null">
                    out_time = #{outTime,jdbcType=TIMESTAMP},
                </if>
                <if test="inLineTime != null">
                    in_line_time = #{inLineTime,jdbcType=TIMESTAMP},
                </if>
                <if test="outLineTime != null">
                    out_line_time = #{outLineTime,jdbcType=TIMESTAMP},
                </if>
                <if test="memo != null">
                    memo = #{memo,jdbcType=VARCHAR},
                </if>
            <if test="deviceNo != null">
                device_no = #{deviceNo,jdbcType=VARCHAR},
            </if>
            <if test="workId != null">
                work_id = #{workId,jdbcType=BIGINT},
            </if>
            <if test="repairId != null">
                repair_id = #{repairId,jdbcType=BIGINT},
            </if>
            <if test="planId != null">
                plan_id = #{planId,jdbcType=BIGINT},
            </if>
            <if test="stationId != null">
                station_id = #{stationId,jdbcType=BIGINT},
            </if>
            <if test="currNode != null">
                curr_node = #{currNode,jdbcType=BIGINT},
            </if>
            <if test="nodeContent != null">
                node_content = #{nodeContent,jdbcType=VARCHAR},
            </if>
            <if test="deviceCycleContent != null">
                device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
            </if>
            <if test="status != null">
                status = #{status,jdbcType=TINYINT},
            </if>
            <if test="result != null">
                result = #{result,jdbcType=TINYINT},
            </if>
            <if test="errorMsg != null">
                error_msg = #{errorMsg,jdbcType=VARCHAR},
            </if>
            <if test="assistants != null">
                assistants = #{assistants,jdbcType=VARCHAR},
            </if>
            <if test="updatedBy != null">
                updated_by = #{updatedBy,jdbcType=BIGINT},
            </if>
            <if test="inTime != null">
                in_time = #{inTime,jdbcType=TIMESTAMP},
            </if>
            <if test="outTime != null">
                out_time = #{outTime,jdbcType=TIMESTAMP},
            </if>
            <if test="inLineTime != null">
                in_line_time = #{inLineTime,jdbcType=TIMESTAMP},
            </if>
            <if test="outLineTime != null">
                out_line_time = #{outLineTime,jdbcType=TIMESTAMP},
            </if>
            <if test="memo != null">
                memo = #{memo,jdbcType=VARCHAR},
            </if>
        </set>
        where   id = #{id,jdbcType=BIGINT} 
        where   id = #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast">
        update sta_device_last
        set 
        set
            device_no =  #{deviceNo,jdbcType=VARCHAR},
            work_id =  #{workId,jdbcType=BIGINT},
            repair_id =  #{repairId,jdbcType=BIGINT},
@@ -209,6 +209,6 @@
            in_line_time =  #{inLineTime,jdbcType=TIMESTAMP},
            out_line_time =  #{outLineTime,jdbcType=TIMESTAMP},
            memo =  #{memo,jdbcType=VARCHAR}
        where   id = #{id,jdbcType=BIGINT} 
        where   id = #{id,jdbcType=BIGINT}
    </update>
</mapper>
</mapper>

 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java

@@ -7,6 +7,7 @@
import com.dy.pmsGlobal.pojoPlt.PltProductParams;
import com.dy.pmsGlobal.pojoPlt.PltProductQualityInspectionItems;
import com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import com.dy.pmsGlobal.pojoPr.PrProductionNode;
import com.dy.pmsGlobal.pojoSta.StaDeviceLife;
import com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog;
@@ -147,4 +148,11 @@
        List<StaDeviceProductionLog> result = sv.queryLogByDeviceNo(deviceNo);
        return BaseResponseUtils.buildSuccess(result);
    }
    @GetMapping(path = "queryPlanByDeviceNo")
    public BaseResponse<PrAssemblyPlan> queryPlanByDeviceNo(String deviceNo) {
        log.info("AssemblyStepCtrl.queryLogByDeviceNo():" + deviceNo);
        PrAssemblyPlan result = sv.queryPlanByDeviceNo(deviceNo);
        return BaseResponseUtils.buildSuccess(result);
    }

}

 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java

@@ -504,37 +504,20 @@
        }
        return map;
    }

   /* public PrAssemblyPlan queryPlanByDeviceNo(String deviceNo) {
    //查询产品所在的任务
    public PrAssemblyPlan queryPlanByDeviceNo(String deviceNo) {
        String proCode = "";
        String lotCode = "";
        if (StringUtils.isNotEmpty(deviceNo) && deviceNo.length() == 22) {
            proCode = deviceNo.substring(3,6);
            lotCode = deviceNo.substring(6,15);
        }
        Map<String, String> map = new HashMap<>();
        map.put("deviceNo", deviceNo);
        map.put("proName", "");
        map.put("proType", "");
        map.put("proId", "");
        map.put("proCode", "");
        //判断是不是是本厂物料
        if(CollectionUtils.isEmpty(productList)){
            productList = productDao.selectAll(null);
        PrAssemblyPlan plan = assemblyPlanDao.selectByDeviceNo(proCode,lotCode);
        if(plan != null){
            plan.setBatchNo(lotCode);
        }
        PltProduct product = null;

        if (product != null) {
            map.put("deviceNo", deviceNo);
            map.put("proName", product.getName());
            map.put("proType", product.getType());
            BigInteger proId = BigInteger.valueOf(product.getId());
            map.put("proId", proId.toString());
            map.put("proCode",product.getCode());
        }
        return map;
        return plan;
    }
*/
    public List<StaDeviceLife> queryLifeByDeviceNo(String deviceNo) {
        return deviceLifeDao.selectByDeviceNo(deviceNo);
    }