From 0477b72d30cfe7d412edeb237aa587b1c5242207 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 09 七月 2024 08:34:31 +0800
Subject: [PATCH] 1、任务新增计时功能，日志打印每次任务执行的周期 2、卧式理片笼更新出片规则：都为禁用（2），笼子不出玻璃；存在一个禁用，07片台可以存玻璃；都非禁用：两片台有玻璃笼子不出片
---
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