From d973e1b1509da56217a47fa74d4860fbf854c172 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 29 十一月 2023 11:06:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
index df66987..8eee477 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -7,7 +7,6 @@
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
import com.example.springboot.entity.north_glass_buffer1;
-//import com.example.springboot.entity.north_glass_buffer1_frames;
import com.example.springboot.entity.Out_slice;
import java.util.List;
@@ -99,7 +98,7 @@
void Disabled(short cage, short cell, short disabled);
//鐞嗙墖绗兼柊澧炵幓鐠�
- @Update("update storage_cage set state=1,glass_id=#{glass.barcode},order_id=#{glass.ordernumber},glasswidth=#{glass.glasslengthMm},glassheight=#{glass.glassheightMm} where cage=#{cage} and cell=#{cell} and tier=#{tier}")
+ @Update("update storage_cage set state=1,glass_id=#{glass.barcode},order_id=#{glass.ordernumber},glasswidth=#{glass.glasslengthmm},glassheight=#{glass.glassheightmm} where cage=#{cage} and cell=#{cell} and tier=#{tier}")
void Inglassid(north_glass_buffer1 glass, short cage, short cell, short tier);
//鏌ヨ鐞嗙墖绗间腑鏄惁鏈夋鐜荤拑
@@ -135,7 +134,7 @@
north_glass_buffer1 SelectBoxNo(String glassid);
//鏌ヨ鍑虹墖闃熷垪淇℃伅
- @Select("select * from Out_slice.java where state=0 or state=1")
+ @Select("select * from out_slice where state=0 or state=1")
List<Out_slice> SelectProductionqueue();
//鏍规嵁鐜荤拑id鏌ヨ绗煎唴鐜荤拑淇℃伅
@@ -144,7 +143,7 @@
//鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
- @Select("update Out_slice.java set state=3 where id=#{id}")
+ @Select("update out_slice set state=3 where id=#{id}")
void DeleteProductionQueueGlass(Short id);
//鏍规嵁閾濇id鏌ヨ瀵瑰簲鐜荤拑淇℃伅
@@ -152,7 +151,7 @@
List<north_glass_buffer1> SelectAluminumFrameInfoById(String FrameBarcode);
//鏌ヨ鏍规嵁id鏌ヨ
- @Select("select b.* from storage_cage a inner join Out_slice.java b on a.glass_id=b.glassId where b.glassId=#{glassId}")
+ @Select("select b.* from storage_cage a inner join out_slice b on a.glass_id=b.glassId where b.glassId=#{glassId}")
List<Out_slice> SelectOutSliceById(String glassId);
//鏌ヨ鐜荤拑id鏄惁
@@ -160,11 +159,11 @@
String SelectFlipByFrameBarcode(String frameBarcode);
//鏌ヨ鐜荤拑鏄惁宸插瓨鍦ㄤ簬鍑虹墖闃熷垪
- @Select("select * from Out_slice.java where glassid=#{getbarcode} and (state=0 or state=1)")
+ @Select("select * from out_slice where glassid=#{getbarcode} and (state=0 or state=1)")
Out_slice SelectQueueByglassid(String getbarcode);
//鏌ヨ鐜荤拑鏄惁宸插瓨鍦ㄤ簬鍑虹墖闃熷垪
- @Select("INSERT INTO Out_slice.java( `glassId`, `barcode`, `glasswidth`, `glassheight`, `state`, `flip`) VALUES ( #{glassid}, #{FrameNo}, #{glasslengthMm}, #{glassheightMm}, 0, #{flip});")
+ @Select("INSERT INTO out_slice( `glassId`, `barcode`, `glasswidth`, `glassheight`, `state`, `flip`) VALUES ( #{glassid}, #{FrameNo}, #{glasslengthMm}, #{glassheightMm}, 0, #{flip});")
void AddOutSliceS(String glassid, String flip, String FrameNo, String glasslengthMm, String glassheightMm);
}
--
Gitblit v1.8.0