From 06a852184f2711e72ae06650a793e52334bdefe0 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 22 五月 2024 10:19:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 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