From 6bd50183e0f287030ae0063f034e31dad888f4cc Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 七月 2024 13:26:44 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 52 +++++++++++++++-
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java | 29 +++++++++
hangzhoumesParent/gateway/src/main/resources/application.yml | 8 ++
UI-Project/src/views/GlassStorage/MaterialRackManagement.vue | 22 +++++++
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java | 1
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml | 2
hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java | 55 ++++++++++++++++++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java | 5 +
8 files changed, 166 insertions(+), 8 deletions(-)
diff --git a/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue b/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
index e1b6d88..421e064 100644
--- a/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
+++ b/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
@@ -64,8 +64,17 @@
<!-- <el-button type="success" size="mini" @click="addglass()">娣诲姞鍘熺墖</el-button> -->
</template>
</el-table-column>
- </el-table>
+
+ </el-table>
+ <el-pagination
+ v-if="totalItems > 0"
+ background
+ layout="prev, pager, next"
+ :total="totalItems"
+ :page-size="pageSize"
+ @current-change="handleCurrentChange"
+ ></el-pagination>
</el-dialog>
@@ -257,6 +266,17 @@
const Hidden = ref(false)
+
+ const totalItems = ref(0);
+ totalItems.value = 10;
+ const pageSize = 10;
+ let currentPage = ref(1);
+ const handleCurrentChange = (val) => {
+
+ currentPage.value = val;
+
+ };
+
const getTagType2 =(status) => {
switch (status) {
case 'completed':
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 640d82f..e99f53e 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -156,6 +156,45 @@
console.log("鍏抽棴浜�")
closeWebSocket();
});
+
+
+const getTagType =(status) => {
+ return status === 1 ? 'success' : 'danger';
+ // 鏍规嵁鐘舵�佸�煎喅瀹氭爣绛剧被鍨嬶紝杩欓噷鍋囪鐘舵�佷负1鏃朵负鎴愬姛锛堢豢鑹诧級锛屽惁鍒欎负澶辫触锛堢孩鑹诧級
+ }
+
+ const toggleStatus = (row) => {
+ // 鍒囨崲鏂欐灦鐘舵�佺殑閫昏緫
+ row.enableState = 1 - row.enableState; // Toggle between 0 and 1
+ // 姝ゅ鍙互娣诲姞淇濆瓨鐘舵�佺殑閫昏緫锛屾瘮濡傝皟鐢� API 鏇存柊鏁版嵁
+ updateRowStatus(row);
+ };
+
+ const updateRowStatus = async (row) => {
+ try {
+ // 鍋囪浣犵殑鍚庣 API 鎺ユ敹 PUT 璇锋眰锛屽苟涓旈渶瑕佷紶閫� row.id 鍜� row.enableState 鍙傛暟
+
+
+ const response = await request.post('unLoadGlass/downWorkStation/updateDownWorkstation', {
+ enableState: row.enableState,
+ id: row.id
+
+
+ });
+ console.log('Updated row status:', response.data);
+ // 鍙互鏍规嵁鍚庣杩斿洖鐨勬暟鎹繘琛岃繘涓�姝ュ鐞嗭紝姣斿鏇存柊鏈湴鐘舵�佺瓑
+ } catch (error) {
+ console.error('Error updating row status:', error);
+ // 澶勭悊閿欒鎯呭喌锛屾瘮濡傛彁绀虹敤鎴锋洿鏂板け璐�
+ }
+};
+
+
+
+
+
+
+
// beforeUnmount(() => {
// closeWebSocket();
// });
@@ -172,11 +211,11 @@
<el-table-column prop="workstationId" align="center" :label="$t('reportWork.lowerbit')" min-width="80" />
<el-table-column prop="workstationId" align="center" :label="$t('reportWork.shelfnumber')" min-width="120" />
<el-table-column prop="flowCardId" align="center" :label="$t('reportWork.cardnumber')" min-width="150" />
- <el-table-column prop="totalquantity" align="center" :label="$t('reportWork.totalquantity')" min-width="120" />
- <el-table-column prop="racksnumber" align="center" :label="$t('reportWork.beendropped')" min-width="120" />
+ <el-table-column prop="totalQuantity" align="center" :label="$t('reportWork.totalquantity')" min-width="120" />
+ <el-table-column prop="racksNumber" align="center" :label="$t('reportWork.beendropped')" min-width="120" />
<el-table-column prop="layer" align="center" label="灞傛暟" min-width="120" />
- <el-table-column prop="artificialnumber" align="center" label="浜哄伐涓嬬墖鏁�" min-width="120" />
- <el-table-column prop="work_state" align="center" :label="$t('reportWork.state')" min-width="120" />
+ <el-table-column prop="otherNumber" align="center" label="浜哄伐涓嬬墖鏁�" min-width="120" />
+ <!-- <el-table-column prop="work_state" align="center" :label="$t('reportWork.state')" min-width="120" /> -->
<el-table-column prop="deviceId" align="center" :label="$t('reportWork.devicenumber')" min-width="120" />
<el-table-column
align="center"
@@ -185,7 +224,10 @@
prop="enableState"
>
<template #default="scope">
- <el-tag type="success" >{{ scope.row.enableState==1? $t('reportWork.enable') : $t('reportWork.unenable')}}</el-tag>
+
+ <el-tag :type="getTagType(scope.row.enableState)" @click="toggleStatus(scope.row)">
+ {{ scope.row.enableState === 1 ? $t('reportWork.enable') : $t('reportWork.unenable') }}
+ </el-tag>
</template>
</el-table-column>
<el-table-column fixed="right" :label="$t('reportWork.operate')" align="center" width="200">
diff --git a/hangzhoumesParent/gateway/src/main/resources/application.yml b/hangzhoumesParent/gateway/src/main/resources/application.yml
index 3ddd26b..a369150 100644
--- a/hangzhoumesParent/gateway/src/main/resources/application.yml
+++ b/hangzhoumesParent/gateway/src/main/resources/application.yml
@@ -47,6 +47,14 @@
filters:
- StripPrefix=2
+
+ - id: glassStorage
+ uri: lb://glassStorage
+ predicates:
+ - Path=/api/glassStorage/**
+ filters:
+ - StripPrefix=2
+
# - id: unLoadGlass
# uri: lb://unLoadGlass
# predicates:
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java
index e774319..0af86b2 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java
@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
/**
* @author system
* @since 2024-07-09 14:51:27
@@ -12,5 +15,5 @@
List<StorageTask> findList(StorageTask params);
-
+ Map<String, Optional<StorageTask>> findLatestTasks();
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java
index 8709da5..e9506e9 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java
@@ -6,15 +6,21 @@
import com.mes.storagetask.mapper.StorageTaskMapper;
import com.mes.storagetask.entity.StorageTask;
import com.mes.storagetask.service.StorageTaskService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.Optional;
/**
* @author system
* @since 2024-07-09 14:51:27
*/
@Service
+@Slf4j
public class StorageTaskServiceImpl extends ServiceImpl<StorageTaskMapper, StorageTask> implements StorageTaskService {
@Autowired
@@ -27,5 +33,28 @@
}
+ public Map<String, Optional<StorageTask>> findLatestTasks() {
+ Map<String, Optional<StorageTask>> latestTasks = new HashMap<>();
+
+ // 鏌ヨ鏈�鏂扮殑宸插畬鎴愪换鍔�
+ LambdaQueryWrapper<StorageTask> completedWrapper = new LambdaQueryWrapper<>();
+ completedWrapper.eq(StorageTask::getTaskType, "宸插畬鎴�")
+ .orderByDesc(StorageTask::getId)
+ .last("LIMIT 1");
+ Optional<StorageTask> latestCompletedTask = Optional.ofNullable(storageTaskMapper.selectOne(completedWrapper));
+ latestTasks.put("宸插畬鎴�", latestCompletedTask);
+
+ // 鏌ヨ鏈�鏂扮殑绛夊緟涓换鍔�
+ LambdaQueryWrapper<StorageTask> pendingWrapper = new LambdaQueryWrapper<>();
+ pendingWrapper.eq(StorageTask::getTaskType, "绛夊緟涓�")
+ .orderByDesc(StorageTask::getId);
+ Optional<StorageTask> latestPendingTask = Optional.ofNullable(storageTaskMapper.selectOne(pendingWrapper));
+ latestTasks.put("绛夊緟涓�", latestPendingTask);
+ log.info(latestTasks+"");
+ return latestTasks;
+ }
+
+
+
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
index 3097382..974323a 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
@@ -17,7 +17,7 @@
cloud:
nacos:
discovery:
- server-addr: 127.0.0.1:8848
+ server-addr: 10.153.19.150:8848
redis:
database: 0
host: 127.0.0.1
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
new file mode 100644
index 0000000..05ec5fe
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
@@ -0,0 +1,55 @@
+package mes;
+
+import com.mes.GlassStorageApplication;
+import com.mes.storagetask.entity.StorageTask;
+import com.mes.storagetask.service.StorageTaskService;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.Arrays;
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/3/27 16:37
+ * @Description:
+ */
+@Slf4j
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = GlassStorageApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+
+public class GlassStorageModuleApplicationTest {
+
+
+
+ @Autowired
+ private StorageTaskService storageTaskService;
+
+
+ @Test
+ public void testFindPath() {
+ log.info("瀹屾暣璺緞锛歿}", Arrays.asList("123"));
+ }
+
+ @Test
+ public void testCacheGlass() {
+ // storageTaskService.getBaseMapper().selectById(1);
+ //StorageTask storageTask=new StorageTask();
+// storageTask.setId(Long.valueOf("1"));
+// storageTask.setTaskState("1");
+// storageTaskService.updateById(storageTask);
+// storageTaskService.getBaseMapper().deleteById(1);
+ // storageTaskService.findList(storageTask);
+ storageTaskService.findLatestTasks();
+ }
+
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
index 6e60501..63f6a49 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
@@ -92,6 +92,7 @@
String currentSlot = plcParameterObject.getPlcParameter("currentCell").getValue();
+
log.info("1銆佽幏鍙栧埌鐨勮姹傚瓧涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{}锛岃幏鍙栧埌鐨勭‘璁ゅ瓧涓猴細{}锛岃幏鍙栧埌鐨勫嚭鐗囩姸鎬佸垎鍒负锛歡06:{}銆乬08:{}銆乬11:{}銆乬13:{},褰撳墠鏍煎瓙鍙蜂负锛歿}",
requestWord, glassIdeValue, confirmationWrodValue, out06Glassstate, out08Glassstate, out11Glassstate, out13Glassstate, currentSlot);
--
Gitblit v1.8.0