From c8c96e57476968a164ad1889c9d7167fe320982e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 19 三月 2024 08:38:38 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/ModuleA.java | 2 +-
CanadaMes-ui/src/views/home/index.vue | 14 +++-----------
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 6 +++---
springboot-vue3/src/main/resources/application.properties | 4 ----
springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java | 19 ++++++++++++-------
CanadaMes-ui/src/lang/locales/en-US.json | 1 +
springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java | 2 +-
springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java | 4 ----
CanadaMes-ui/src/lang/locales/zh-CN.json | 1 +
9 files changed, 22 insertions(+), 31 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 5b515be..19d8a6b 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -361,6 +361,7 @@
"Please enter the correct glassID":"Please enter the correct glassID",
"Switch":"Switch",
"This frame has glass that is currently outing":"This frame has glass that is currently outing",
+ "The slot is disabled":"The slot is disabled",
"ServoManualone": {
"A01 鎵�鍦ㄦ牸瀛�": "A01 Current Grid",
"鏁伴噺": "Quantity",
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index ecfb17a..1a93fd5 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -354,6 +354,7 @@
"Please enter the correct glassID":"璇疯緭鍏ユ纭殑鐜荤拑ID",
"Switch":"鍒囨崲",
"This frame has glass that is currently outing":"姝ら摑妗嗘湁姝ｅ湪鍑虹墖鐨勭幓鐠�",
+ "The slot is disabled":"鏍煎瓙琚鐢�",
"langparameter": {
"conveyor Velocity(Auto FAST)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄥ揩閫�",
"conveyor Velocity(Auto SLOW)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄦ參閫�",
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 857ea53..2de9353 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -743,17 +743,9 @@
<el-button type="primary" @click="isAllowQueueState()" :disabled="!this.isAllowReordering">{{ this.isAllowQueue
== true ? $t('Stop') : $t('Start')
}}</el-button>
- <!-- {{ $t('Sorting State') }}:
- {{
- this.isAllowReordering == true ? $t('Not Allow') : $t('Allow')
- }}
- <el-button type="primary" @click="isAllowReorderings()" :disabled="this.isAllowQueue">{{
- this.isAllowReordering == true ? $t('Allow') : $t('Not Allow')
- }}</el-button> -->
- <!-- <el-input style="width:15%;" :placeholder="$t('Enter the Frame No')" v-model="framebarcode"></el-input> -->
<el-button type="primary" @click="showform7()">{{ $t('Add') }}</el-button>
<label style="background-color:yellow;font-size: 23px;" for="">
- {{ isQueueWarning == true ? $t('The cage is disabled') : "" }}
+ {{ isQueueWarning == true ? $t('The slot is disabled') : "" }}
</label>
<div style="display:flex;">
<div style="width:70%;">
@@ -1025,7 +1017,7 @@
const specialChars = /[^\w\s]/g;
this.CurrrentGlassId = obj.CurrrentGlassId[0].replace(specialChars, "");
}
-
+
//鏌ヨ褰撳墠閾濇淇℃伅
this.CurrentFrame = obj.CurrentFrame;
@@ -1051,7 +1043,6 @@
this.InsertQueueGlass(1);
}
}
-
// if (obj.alarmmg[0].length > 0) {
@@ -1517,6 +1508,7 @@
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
this.dialogFormVisible = false;
+ this.glassid="";
}
else if (res.data.message == 400) {
this.$message.error(this.$t('The glass size is not within the range'));
diff --git a/springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java b/springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java
index 313f463..f51e7d3 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java
@@ -1,14 +1,10 @@
package com.example.springboot;
-import com.example.springboot.common.MessageSender;
-import org.springframework.amqp.rabbit.annotation.EnableRabbit;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.ConfigurableApplicationContext;
import com.example.springboot.component.*;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/ModuleA.java b/springboot-vue3/src/main/java/com/example/springboot/component/ModuleA.java
index 3f2bca3..5a3d2f9 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/ModuleA.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/ModuleA.java
@@ -8,7 +8,7 @@
public static void main(String[] argv) throws Exception {
// 鍒涘缓杩炴帴宸ュ巶
ConnectionFactory factory = new ConnectionFactory();
- factory.setHost("10.153.19.150");
+ factory.setHost("localhost");
try (Connection connection = factory.newConnection();
//channel 鏄�氳繃 connection 鍒涘缓鐨勪竴涓� AMQP 淇￠亾瀵硅薄
diff --git a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index e3d0611..b62dec8 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -17,10 +17,10 @@
//
System.out.println("鍚姩瀹屾垚");
- // new PlcHold().start();
- // new PLCAutoMes().start();
+ // new PlcHoldNew().start();
+ // new PLCAutoMes().start();
- // new Plchome().start();
+ // new Plchome().start();
// new PlcLayout().start();
// new Plcalarm().start();
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java b/springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java
index ed78fe2..4ebe6e8 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java
@@ -92,7 +92,7 @@
public void DeleteByGlassIDs(String glassid) {
List<StorageCage> glassinfor = homeMapper.SelectStorageInfoByGlassId(glassid);
for (StorageCage storageCage : glassinfor) {
- if (storageCage.getState().equals("2")) {
+ if (storageCage.getState().equals("2")||storageCage.getState().equals("1")) {
homeMapper.UpdataCageWidth(storageCage.getGlassWidth(), storageCage.getCage(), storageCage.getCell());
}
}
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 9a47ea2..a584239 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
@@ -20,15 +20,13 @@
public class SpianServiceNew {
@Autowired
private SpianMapper spianMapper;
-
+
// @GetMapping("/all")
public Short selectAll(String glassid) {
-
- //璇诲彇DB105鍖烘枃浠�
- PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- //璇�106
- PlcParameterObject plcread=PLCAutoMes.PlcReadObject;
-
+ //璇诲彇DB105鍖烘枃浠�
+ PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
+ //璇�106
+ PlcParameterObject plcread=PLCAutoMes.PlcReadObject;
int cage1 = 0;
int cells;
int ids;
@@ -132,6 +130,11 @@
}
public Short selectout2(String glassid) {
+ //璇诲彇DB105鍖烘枃浠�
+ PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
+ //璇�106
+ PlcParameterObject plcread=PLCAutoMes.PlcReadObject;
+
char[] a = glassid.toCharArray();
List<Short> datas = new ArrayList<>();
// 鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
@@ -257,6 +260,8 @@
// 娲惧彂浠诲姟鐜荤拑id
public void outmesid(String glassid, String address) {
+ //璇诲彇DB105鍖烘枃浠�
+ PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
// System.out.println("outmesid:" + glassid);
List<Byte> glassidlist = new ArrayList();
char ds[] = glassid.toCharArray();
diff --git a/springboot-vue3/src/main/resources/application.properties b/springboot-vue3/src/main/resources/application.properties
index 663e822..bde875f 100644
--- a/springboot-vue3/src/main/resources/application.properties
+++ b/springboot-vue3/src/main/resources/application.properties
@@ -23,9 +23,5 @@
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone=GMT+8
-spring.rabbitmq.host=10.153.19.150
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=guest
-spring.rabbitmq.password=guest
--
Gitblit v1.8.0