From 40c8f926742ac885981e1791291b77b8fd662163 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 23 五月 2025 14:55:10 +0800
Subject: [PATCH] 1、编辑打包方式，避免生成的jar过大在升级过程耗费大量时间 将target下的config、lib和jar 统一放在同一目录下，修改服务启动命令 后续升级在不修改依赖、配置文件的情况下替换jar即可 涉及依赖、配置文件仅需在lib、config下新增/替换相关文件即可
---
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