1、报工查询代码补充

ZengTao

2025-11-17 161f793a51e09acffd3ecd2cbed4be23f93057dd

1、报工查询代码补充

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/dto/DamageDTO.java

New file
@@ -0,0 +1,29 @@
package com.mes.damage.entity.dto;

import com.mes.damage.entity.Damage;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * <p>
 *
 * </p>
 *
 * @author wu
 * @since 2024-06-25
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class DamageDTO extends Damage {

    /**
     * 宽
     */
    private Integer width;

    /**
     * 宽
     */
    private Integer height;

}

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/ProcessCardReport.java

New file
@@ -0,0 +1,89 @@
package com.mes.order.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;

/**
 * <p>
 * 
 * </p>
 *
 * @author wu
 * @since 2024-06-17
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class ProcessCardReport implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * <订单表>
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    /**
     * 订单Id
     */
    private String orderId;

    /**
     * 流程卡号
     */
    private String processId;

    /**
     * 订单序号
     */
    private Integer orderNumber;

    /**
     * 层号
     */
    private Integer technologyNumber;

    /**
     * 工艺
     */
    private String process;

    /**
     * 累计报工数
     */
    private Integer reportWorkNumCount;

    /**
     * 报工数
     */
    private Integer reportWorkNum;

    /**
     * 破损数量
     */
    private Integer brokenNum;

    /**
     * 创建时间
     */
    private Data createTime;

    /**
     * 最后一次报工时间
     */
    private Data updateTime;

    /**
     * 流程卡数量
     */
    private Integer quantity;

    /**
     * 缺片数量
     */
    private Integer lackQuantity;
}

 hangzhoumesParent/common/servicebase/src/main/resources/mapper/DamageMapper.xml

New file
@@ -0,0 +1,48 @@
<?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">
<mapper namespace="com.mes.damage.mapper.DamageMapper">

    <select id="queryUnTempByFlowCardId" resultType="com.mes.damage.entity.Damage">
        SELECT glass_id,
               order_number,
               technology_number,
               working_procedure
        FROM (
                 SELECT glass_id,
                        order_number,
                        technology_number,
                        working_procedure,
                        ROW_NUMBER() OVER (
      PARTITION BY glass_id
      ORDER BY damage_time DESC
    ) AS rn
                 FROM damage
                 WHERE process_id = #{flowCardId}
                   AND glass_id NOT IN (
                     SELECT DISTINCT glass_id
                     FROM damage
                     WHERE process_id = #{flowCardId}
                       AND working_procedure = "钢化"
                 )
             ) t
        WHERE rn = 1;
    </select>
    <select id="selectDamageList" resultType="com.mes.damage.entity.dto.DamageDTO">
        SELECT
        t.*,t1.width,t1.height
        FROM
        damage t left join glass_info t1 on t.glass_id=t1.glass_id
        <where>
            damage_time BETWEEN #{startTime} AND #{endTime}
            <if test="type != null and type != 0">
                AND t.type = #{type}
            </if>
            <if test="status != null and status != 0">
                AND t.status = #{status}
            </if>
            <if test="workingProcedure != null">
                AND t.working_procedure = #{workingProcedure}
            </if>
        </where>
    </select>
</mapper>