From 65ae6084f552c035eb5640afbd8f73e6054e3b6c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 16 七月 2024 21:15:53 +0800
Subject: [PATCH] 1、大理片：fixbug:大理片出片逻辑修改，钢化版图是否到齐：sql逻辑问题，包含人工出片任务，造成钢化版图是否到齐需要获取已出片的玻璃，造成已出笼的玻璃会重复计算并准备生成钢化任务，但获取的玻璃信息为空，造成插入钢化表异常。且排除已出笼的钢化版图较复杂（暂不关联钢化小片表），目前解决方案：把所有到齐的钢化版图数据查出来，排除笼内玻璃为空的 2、移除已配置完mapperscan已扫描仍有@Mapper注解的
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/mapper/UpWorkstationMapper.xml | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/mapper/UpWorkstationMapper.xml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/mapper/UpWorkstationMapper.xml
index 2dce130..ceba9a6 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/mapper/UpWorkstationMapper.xml
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/mapper/UpWorkstationMapper.xml
@@ -3,20 +3,19 @@
<mapper namespace="com.mes.workstation.mapper.UpWorkstationMapper">
<resultMap id="sequenceMap" type="com.mes.workstation.entity.UpWorkSequence">
- <id property="sequence" column="layout_sequence"/>
- <result property="number" column="number"/>
+ <id property="workId" column="workstation_id"/>
+<!-- <result property="number" column="number"/>-->
</resultMap>
<select id="selectPriority" resultMap="sequenceMap">
SELECT
- b.layout_sequence,a."number"
+ b.workstation_id
FROM
- up_workstation a
- LEFT JOIN up_patten_usage b ON a.pattern_width = b.width
- AND a.pattern_heigth = b.width
- AND a.pattern_thickness = b.thickness
- WHERE
- a.workstation_id = #{id}
+ ( SELECT * FROM up_patten_usage a WHERE state = 1 ORDER BY a.layout_sequence LIMIT 1 )as a
+ LEFT JOIN up_workstation b ON a.width =b.pattern_width
+ AND a.height = b.pattern_heigth
+ AND a.thickness = b.pattern_thickness
+ AND a.films_id = b.films_id
</select>
--
Gitblit v1.8.0