From cb4da9b55edfdda5beacca036b99130b33b9449b Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 08 四月 2024 10:58:24 +0800
Subject: [PATCH] 代码更新

---
 LoadGlassModule/src/main/java/com/mes/mapper/LoadGlassMapper.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/LoadGlassModule/src/main/java/com/mes/mapper/LoadGlassMapper.java b/LoadGlassModule/src/main/java/com/mes/mapper/LoadGlassMapper.java
index 9065d58..b054e70 100644
--- a/LoadGlassModule/src/main/java/com/mes/mapper/LoadGlassMapper.java
+++ b/LoadGlassModule/src/main/java/com/mes/mapper/LoadGlassMapper.java
@@ -1,19 +1,24 @@
 package com.mes.mapper;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.entity.OrderTest;
+import java.util.List;
 import org.apache.ibatis.annotations.*;
-
+import com.mes.entity.UpWorkstation;
 @Mapper
 public interface LoadGlassMapper extends BaseMapper<UpWorkstation> {
     //鏄剧ず鐩墠宸ヤ綅鐜荤拑淇℃伅
     @Select("SELECT * FROM up_workstation")
-    UpWorkstation SelectALL();
+    List<UpWorkstation> SelectALL();
     //鍒犻櫎宸ヤ綅鐨勭幓鐠冧俊鎭�
     @Delete("DELETE FROM up_workstation where  workstation_id=#{id}")
-    void DeleteALL(int id );
+    void deleteGlass(int id );
     //澧炲姞涓婄墖淇℃伅
     @Insert ("INSERT INTO up_workstation (pattern_width,pattern_heigth,pattern_thickness)value(#{patternwidth},#{patternheigth},#{patternthickness}where workstation_id=#{workstationid) ")
-    void InsertALL(Double patternwidth,Double patternheigth,Double patternthickness,int workstationid);
+    void insertGlass(Double patternwidth,Double patternheigth,Double patternthickness,int workstationid);
     //鏄惁鍙戣捣鍚哥墖
+    @Select("SELECT * FROM up_workstation where  workstation_id=#{id}")
+    UpWorkstation SelectAdd(int id);
+    //鍒ゆ柇浼樺厛宸ヤ綅鍚哥墖
+    @Select("select b.layout_sequence 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}")
+    int SelectPriority(int id);
+    
 }

--
Gitblit v1.8.0