From 161f793a51e09acffd3ecd2cbed4be23f93057dd Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 17 十一月 2025 08:52:46 +0800
Subject: [PATCH] 1、报工查询代码补充
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/dto/DamageDTO.java | 29 +++++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/ProcessCardReport.java | 89 +++++++++++++++++++++++++++++
hangzhoumesParent/common/servicebase/src/main/resources/mapper/DamageMapper.xml | 48 ++++++++++++++++
3 files changed, 166 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/dto/DamageDTO.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/dto/DamageDTO.java
new file mode 100644
index 0000000..d60dc2d
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/dto/DamageDTO.java
@@ -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;
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/ProcessCardReport.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/ProcessCardReport.java
new file mode 100644
index 0000000..bcf5441
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/ProcessCardReport.java
@@ -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;
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/DamageMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/DamageMapper.xml
new file mode 100644
index 0000000..223b6c4
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/DamageMapper.xml
@@ -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>
--
Gitblit v1.8.0