From 95db3e96a9465f137fdf16540e0c5985752894c2 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 09 四月 2024 14:27:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
LoadGlassModule/src/main/java/com/mes/mapper/LoadGlassMapper.java | 18 ++++++++++++------
1 files changed, 12 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 8db4eff..363b7a2 100644
--- a/LoadGlassModule/src/main/java/com/mes/mapper/LoadGlassMapper.java
+++ b/LoadGlassModule/src/main/java/com/mes/mapper/LoadGlassMapper.java
@@ -1,18 +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