From e893f60d1dfdf911657861df40754704d1a5bac7 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 10 四月 2024 09:08:45 +0800
Subject: [PATCH] 修改进片新增字段
---
springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java | 4 ++--
springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java | 2 +-
springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java | 3 ---
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
index 28a0b49..49863c4 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
@@ -51,15 +51,12 @@
//涓�鍙风嚎璇锋眰
if(ExportTOMES1!=null&&MESToPLC!=null){
if (ExportTOMES1.equals("1") == true&&MESToPLC.equals("0")==true) {
- //灏嗚繍杈撹溅鐘舵�佹敼涓哄繖纰�
spianService.selectout(1);
}
}
// //浜岀嚎鍙疯姹傛椂
if(ExportToMES2!=null &&MESToPLC!=null){
if (ExportToMES2.equals("1") == true&&MESToPLC.equals("0")==true) {
- //灏嗚繍杈撹溅鐘舵�佹敼涓哄繖纰�
-
spianService.selectout(2);
}
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java
index ac95341..2af94de 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java
@@ -27,8 +27,8 @@
@Insert("INSERT INTO `albania`.`storage_task`(`task_type`, `task_state`, `shelf_rack`, `load_rack`,start_time,glass_id,glasstype,flowcard,mateid,tier) VALUES (#{tasktype},#{taskstate},#{shelfrack},#{loadrack},now(),#{glassid},#{glasstype},#{flowcard},#{mateid},#{tier});")
void Inserttask(int tasktype, int taskstate, int shelfrack, int loadrack, String glassid, int glasstype,String flowcard,int mateid,int tier);
//鏂板涓�鏉＄瀛愭暟鎹�
- @Update("UPDATE `albania`.`storage_cage` SET `glass_id` =#{glassid}, `width` =width-#{glasswidth}, `glasswidth` =#{glasswidth}, `glassheight` =#{glassheight}, `glasswidthmm` =#{glasswidthmm}, `glassheightmm` = #{glassheightmm}, `state` = #{state}, `glasstype` = #{glasstype}, `number` = #{number} WHERE `id` =#{id};")
- void AddCage(int id,String glassid,Double glasswidth,Double glassheight,Double glasswidthmm,Double glassheightmm,int state,String glasstype,int number);
+ @Update("UPDATE `albania`.`storage_cage` SET `glass_id` =#{glassid}, `width` =width-#{glasswidth}, `glasswidth` =#{glasswidth}, `glassheight` =#{glassheight}, `glasswidthmm` =#{glasswidth}, `glassheightmm` = #{glassheight}, `state` = #{state}, `glasstype` = #{glasstype}, `number` = #{number} WHERE `id` =#{id};")
+ void AddCage(int id,String glassid,Double glasswidth,Double glassheight,int state,String glasstype,int number);
//鑾峰彇杩涚墖鏁版嵁
@Select("select glassid,flowcard,glasswidth as width,glassheight as height,glasswidthmm,glassheightmm,glasstype,thickness from queue where state=1 limit 1")
GlassInfo SelectGlass();
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
index 8ebfe3d..b0e8782 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
@@ -48,7 +48,7 @@
}
//褰撹繑鍥炵殑鏍煎瓙鍙蜂负绌烘椂,杩斿洖400绗煎瓙宸叉弧
if(cage!=null){
- albaniaMapper.AddCage(cage.getId(), glassid,width, height, cage.getGlassWidthMm(), cage.getGlassHeightMm(), 1, cage.getGlasstype(), 0);
+ albaniaMapper.AddCage(cage.getId(), glassid,width, height, 1, cage.getGlasstype(), 0);
Mestast(glassid,1001,cage.getId(),1,"MESID1",1);
albaniaMapper.UpdateStorage(width,height,cage.getId());
albaniaMapper.UpdateQueueState(glassid);
--
Gitblit v1.8.0