From d3784e22324ba6ae25fffc0e19874a07dd0d12ae Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 23 四月 2024 23:22:52 +0800
Subject: [PATCH] 修改IP进行打包，修改进片方法参数
---
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 10 ++++++++--
CanadaMes-ui/src/views/home/index.vue | 4 ++--
CanadaMes-ui/src/lang/locales/en-US.json | 2 +-
CanadaMes-ui/src/lang/locales/zh-CN.json | 2 +-
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 19d8a6b..14c13ff 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -1,6 +1,6 @@
{
"Clear":"Clear",
- "ip":"localhost",
+ "ip":"10.168.10.21",
"systemTitle": "Login System",
"usernamePlaceholder": "Please enter username",
"passwordPlaceholder": "Please enter password",
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 1a93fd5..fed94a3 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -1,6 +1,6 @@
{
"Clear":"娓呴櫎",
- "ip":"localhost",
+ "ip":"10.168.10.21",
"systemTitle": "鐧诲綍绯荤粺",
"usernamePlaceholder": "璇疯緭鍏ョ敤鎴峰悕",
"passwordPlaceholder": "璇疯緭鍏ュ瘑鐮�",
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 7f1f491..c53ef06 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -632,8 +632,8 @@
{{ this.isConfirm == true ? $t('Not Allow') : $t('Allow') }}</el-button>
</el-form-item>
<el-form-item>
- {{ $t('Current State') }}:{{ this.Scanningmethod == false ? $t('Automatic') : $t('Hand
- Movement') }}
+ {{ $t('Current State') }}:{{ this.Scanningmethod == false ? $t('Automatic') :
+ $t('Hand Movement') }}
<el-button type="primary" @click="SwitchScanMethod()">{{ $t('Switch')
}}</el-button>
</el-form-item>
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
index df711b9..87b0feb 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
@@ -1,5 +1,6 @@
package com.example.springboot.service;
+import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -14,6 +15,7 @@
import com.example.springboot.entity.Queue;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.StorageTask;
+import com.example.springboot.entity.north_glass_buffer1;
import com.example.springboot.mapper.HomeMapper;
@Service
@@ -26,6 +28,9 @@
@Autowired
private SpianService spianService;
+
+ @Autowired
+ private JdbcConnections jdbcConnections;
public void EndTask(int types) {
String A01glassid1 = spianService.queGlassid("DB103.128", 14).toString();
@@ -179,7 +184,7 @@
return Result.success(map);
}
- public Result InsertQueueGlassId(Short id, Queue queue) {
+ public Result InsertQueueGlassId(Short id, Queue queue) throws SQLException {
Map<String, Object> map = new HashMap<>();
Short zhi = 200;
@@ -189,7 +194,8 @@
} else {
if (id == 1) {
// 璋冪敤浼嶅瓨鍌ㄨ繃绋�
- zhi = spianService.selectAll(queue.getglassId());
+ north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(queue.getglassId(), "", "");
+ zhi = spianService.selectAll(north_glass_buffer1);
if (zhi == 200) {
homeMapper.InsertQueueGlassId(queue, id);
}
--
Gitblit v1.8.0