From 47ab1c46b5141f572381a2a27613f728e3bf96c5 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期一, 20 五月 2024 14:18:16 +0800 Subject: [PATCH] 1、卧式理片笼对接过程中bug修复 2、上片机协议修改 3、临时解决json文件打包后读取不到文件问题 4、上片新增接口修改上片机联动请求 --- hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java index aedecb4..93ba7fb 100644 --- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java +++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java @@ -11,7 +11,7 @@ public interface LoadGlassMapper extends BaseMapper<UpWorkstation> { //鍒ゆ柇浼樺厛宸ヤ綅鍚哥墖 @Select("select b.layout_sequence,a.number from up_workstation a left join up_patten_usage b " + - "on a.pattern_width=b.width and a.pattern_heigth=b.width " + + "on a.pattern_width=b.width and a.pattern_height=b.height " + "and a.pattern_thickness=b.thickness where a.workstation_id=#{id}") Map<String, Object> selectPriority(int id); -- Gitblit v1.8.0