From 91d7afedf3ea51ee87ee47d4da2e1b6243f8fb84 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 05 一月 2025 21:50:21 +0800
Subject: [PATCH] 1、大理片笼进片任务新增数量校验，当收到进片请求时，拿电气的玻璃数量与mes接收到的数量作比较，相同继续执行，不相同结束本次任务 2、李赛克文件优化，合中空玻璃每个间隔框的类型可能不同，需要在界面上做选择 3、中空设备号与格子号不匹配bug解决 4、自动报工存在接口调用异常，临时将调用接口回退原版本，待最新接口调用无异常后更新接口 5、fixbug:中空大理片详情界面删除接口异常
---
hangzhoumesParent/common/servicebase/src/main/resources/mapper/UpPattenUsageMapper.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/UpPattenUsageMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/UpPattenUsageMapper.xml
index 951829c..e19a528 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/UpPattenUsageMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/UpPattenUsageMapper.xml
@@ -13,11 +13,10 @@
<result column="state" property="state"/>
<result column="group_number" property="groupNumber"/>
</resultMap>
- <select id="queryRawGlassByEngineeringId" resultType="com.mes.uppattenusage.entity.vo.UpPattenUsageVO">
+ <select id="queryRawGlassByEngineeringId" resultMap="baseMap">
SET @prev_width := NULL;
SET @prev_height := NULL;
SET @counter := 0;
-
SELECT t.*,
@counter := IF(@prev_width = width and @prev_height = height, @counter, @counter + 1) AS group_number,
@prev_width := width,
@@ -27,6 +26,14 @@
and t.state = 0
ORDER BY t.layout_sequence
</select>
+ <select id="queryFinishByEngineering" resultType="java.lang.Integer">
+ SELECT id
+ FROM up_patten_usage
+ WHERE engineering_id IN (SELECT engineer_id FROM engineering WHERE station_cell = #{stationCell} AND state = 1)
+ and state = 0
+ order by id
+ LIMIT ${finishCount}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0