From 31a6849672a6ccac2289fc3bd8fbacdd13c99634 Mon Sep 17 00:00:00 2001
From: zhangyong <517047165@qq.com>
Date: 星期二, 26 十一月 2024 13:24:43 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
UI-Project/src/App.vue | 18 +-
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java | 11 -
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 24 +++-
UI-Project/index.html | 2
UI-Project/src/lang/zh.js | 1
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 12 +
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml | 11 -
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java | 9 +
UI-Project/src/views/Returns/upreturns.vue | 111 ++++++++++++------
UI-Project/src/views/Returns/upreturns2.vue | 78 +++++++++---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java | 1
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml | 2
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java | 13 ++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java | 9 +
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 10
15 files changed, 209 insertions(+), 103 deletions(-)
diff --git a/UI-Project/index.html b/UI-Project/index.html
index e96cd5a..5008a8e 100644
--- a/UI-Project/index.html
+++ b/UI-Project/index.html
@@ -7,7 +7,7 @@
<title>鍖楃幓</title>
</head>
<body>
- <div id="app"></div>
+ <div id="app" style="width: 100vw;height: 100vh;"></div>
<script type="module" src="/src/main.js"></script>
</body>
</html>
diff --git a/UI-Project/src/App.vue b/UI-Project/src/App.vue
index 98d1a20..fad63a4 100644
--- a/UI-Project/src/App.vue
+++ b/UI-Project/src/App.vue
@@ -6,17 +6,17 @@
import DevicePixelRatio from '@/utils/evicePixelRatio.js';
// 瀹氫箟涓�涓嚱鏁版潵璋冩暣 body 鐨勭缉鏀炬瘮渚�
-function bodyScale() {
- const deviceheight = document.documentElement.clientHeight;
- const scale = deviceheight / 740;
- document.body.style.zoom = scale;
-}
+// function bodyScale() {
+// const deviceheight = document.documentElement.clientHeight;
+// const scale = deviceheight / 740;
+// document.body.style.zoom = scale;
+// }
// 鍦ㄧ粍浠舵寕杞芥椂鎵ц
-onMounted(() => {
- new DevicePixelRatio().init();
- bodyScale();
-});
+// onMounted(() => {
+// new DevicePixelRatio().init();
+// bodyScale();
+// });
</script>
<style scoped>
/* 浣犵殑鏍峰紡鍐呭 */
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 544e3c4..ec0eac4 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -634,6 +634,7 @@
createtime: '鍒涘缓鏃堕棿',
all: '鍏ㄩ��',
removalmethod: '璇烽�夋嫨闄よ啘鏂瑰紡',
+ removalmethodp: '闄よ啘鏂瑰紡',
removalmethoda: '闄よ啘鏂瑰紡锛�',
noremoval: '涓嶉櫎鑶�',
coarselyground: '绮楃（',
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 5f4091a..0c37ace 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -67,7 +67,7 @@
const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/uploadGlass`;
const handleMessage = (data: any) => {
tableDataa.value = data.list[0].slice(0, 2);
- tableDatab.value = data.list[0].slice(2, 4);
+ // tableDatab.value = data.list[0].slice(2, 4);
};
onBeforeUnmount(() => {
closeWebSocket();
@@ -96,7 +96,8 @@
const response = await request.post('/loadGlass/up-patten-usage/selectUpPattenUsage', {
stationCell: 5,
engineerId: selectedProjectNo.value,
- filmRemove: filmRemove.value,
+ // filmRemove: filmRemove.value,
+ filmRemove: parseInt(filmRemove.value, 10),
})
window.localStorage.setItem('engineeringId', selectedProjectNo.value)
window.localStorage.setItem('filmRemove', filmRemove.value)
@@ -121,8 +122,8 @@
let engineeringId = window.localStorage.getItem('engineeringId')
if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
try {
- const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {
- // const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
+ // const response = await request.post('/loadGlass/engineering/engineering/pause', {
+ const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
stationCell: 5,
filmRemove: filmRemove,
engineerId: engineeringId,
@@ -145,11 +146,13 @@
// 鏆傚仠
const handleup = async () => {
try {
+ let filmRemove = window.localStorage.getItem('filmRemove')
let engineeringId = window.localStorage.getItem('engineeringId')
console.log(engineeringId);
if (engineeringId !== '') {
- const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {
+ const response = await request.post('/loadGlass/engineering/engineering/pause', {
stationCell: 5,
+ filmRemove: filmRemove,
engineerId: engineeringId,
state: 0,
})
@@ -236,6 +239,28 @@
ElMessage.error(t('basicData.glassnull'));
}
};
+
+function getStatusType2(filmRemove) {
+ switch (filmRemove) {
+ case 0:
+ return 'success';
+ case 1:
+ return 'info';
+ case 2:
+ return 'warning';
+ }
+}
+
+function getStatusText2(filmRemove) {
+ switch (filmRemove) {
+ case 0:
+ return t('Mounting.noremoval');//瀹屾垚
+ case 1:
+ return t('Mounting.coarselyground');//鏂板缓
+ case 2:
+ return t('Mounting.finegrinding');//鎵ц涓�
+ }
+}
</script>
<template>
<div style="height: 500px;">
@@ -278,47 +303,59 @@
<el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('Mounting.setparameters') }}</el-button>
<el-card style="flex: 1;margin-left: 10px;margin-top: 15px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
- <el-table
- height="350"
- ref="table"
- :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
- :data="tableData"
- >
- <el-table-column prop="layoutSequence" :label="$t('Mounting.project')" width="100" align="center"/>
- <el-table-column prop="engineeringId" :label="$t('Mounting.width')" width="200" align="center"/>
- <el-table-column prop="width" :label="$t('Mounting.height')" align="center"/>
- <el-table-column prop="height" :label="$t('Mounting.thickness')" align="center"/>
- <el-table-column prop="filmsId" :label="$t('Mounting.loadinglinea')" align="center"/>
- <el-table-column :label="$t('Mounting.projectnumber')" align="center">
- <template #default="{ row }">
- <!-- 杩欓噷鎬绘槸鏄剧ず 1 -->
- <span>{{ 1 }}</span>
- </template>
- </el-table-column>
- <el-table-column
- align="center"
- :label="$t('Mounting.state')"
+ <el-table
+ height="350"
+ ref="table"
+ :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
+ :data="tableData"
+ >
+ <el-table-column prop="engineeringId" :label="$t('Mounting.project')" width="100" align="center"/>
+ <el-table-column prop="width" :label="$t('Mounting.width')" width="200" align="center"/>
+ <el-table-column prop="height" :label="$t('Mounting.height')" align="center"/>
+ <el-table-column prop="thickness" :label="$t('Mounting.thickness')" align="center"/>
+ <el-table-column prop="filmsId" :label="$t('Mounting.loadinglinea')" align="center"/>
+ <el-table-column :label="$t('Mounting.projectnumber')" align="center">
+ <template #default="{ row }">
+ <!-- 杩欓噷鎬绘槸鏄剧ず 1 -->
+ <span>{{ 1 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ align="center"
+ :label="$t('Mounting.state')"
min-width="80"
prop="state"
>
- <template #default="scope">
- <el-tag
- :type="scope.row.state === 100 ? 'success' : 'warning'"
- @click="toggleEnableState(scope.row)"
- >
- {{ scope.row.state === 100 ? $t('Mounting.pass') : $t('Mounting.waiting') }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="filmsId" :label="$t('Mounting.createtime')" align="center"/>
- </el-table>
+ <template #default="scope">
+ <el-tag
+ :type="scope.row.state === 100 ? 'success' : 'warning'"
+ @click="toggleEnableState(scope.row)"
+ >
+ {{ scope.row.state === 100 ? $t('Mounting.pass') : $t('Mounting.waiting') }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column prop="filmRemove" :label="$t('Mounting.removalmethodp')" align="center"/> -->
+ <!-- <el-table-column
+ align="center"
+ :label="$t('Mounting.removalmethodp')"
+ prop="filmRemove"
+ >
+ <template #default="scope">
+ <el-tag :type="getStatusType2(scope.row.filmRemove)">
+ {{ getStatusText2(scope.row.filmRemove) }}
+ </el-tag>
+ </template>
+ </el-table-column> -->
+ <!-- <el-table-column prop="stationCell" :label="$t('Mounting.loadinglinea')" align="center"/> -->
+ </el-table>
</div>
</el-card>
<div style="display: flex;">
<div style="width: 49%;float: left;margin-left: 300px;">
<div style="display: flex;">
<img src="../../assets/shangpianji.png" alt=""
- style="max-width: 25%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
+ style="max-width: 20%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
<el-table :data="tableDataa" border style="width: 75%;margin-top: 10%;margin-left: 8%;"
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
>
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index bc4cdb7..afa5811 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -66,8 +66,8 @@
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/uploadGlass`;
const handleMessage = (data: any) => {
- tableDataa.value = data.list[0].slice(0, 2);
- tableDatab.value = data.list[0].slice(2, 4);
+ // tableDataa.value = data.list[0].slice(0, 2);
+ tableDataa.value = data.list[0].slice(2, 4);
};
onBeforeUnmount(() => {
closeWebSocket();
@@ -96,7 +96,8 @@
const response = await request.post('/loadGlass/up-patten-usage/selectUpPattenUsage', {
stationCell: 6,
engineerId: selectedProjectNo.value,
- filmRemove: filmRemove.value,
+ // filmRemove: filmRemove.value,
+ filmRemove: parseInt(filmRemove.value, 10),
})
window.localStorage.setItem('engineeringId', selectedProjectNo.value)
window.localStorage.setItem('filmRemove', filmRemove.value)
@@ -121,10 +122,10 @@
let engineeringId = window.localStorage.getItem('engineeringId')
if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
try {
- const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {
+ const response = await request.post('/loadGlass/engineering/engineering/pause', {
// const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
- stationCell: 6,
- filmRemove: filmRemove,
+ // stationCell: 6,
+ // filmRemove: filmRemove,
engineerId: engineeringId,
state: 1,
})
@@ -148,8 +149,8 @@
let engineeringId = window.localStorage.getItem('engineeringId')
console.log(engineeringId);
if (engineeringId !== '') {
- const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {
- stationCell: 6,
+ const response = await request.post('/loadGlass/engineering/engineering/pause', {
+ // stationCell: 6,
engineerId: engineeringId,
state: 0,
})
@@ -236,6 +237,28 @@
ElMessage.error(t('basicData.glassnull'));
}
};
+
+function getStatusType2(filmRemove) {
+ switch (filmRemove) {
+ case 0:
+ return 'success';
+ case 1:
+ return 'info';
+ case 2:
+ return 'warning';
+ }
+}
+
+function getStatusText2(filmRemove) {
+ switch (filmRemove) {
+ case 0:
+ return t('Mounting.noremoval');//瀹屾垚
+ case 1:
+ return t('Mounting.coarselyground');//鏂板缓
+ case 2:
+ return t('Mounting.finegrinding');//鎵ц涓�
+ }
+}
</script>
<template>
<div style="height: 500px;">
@@ -301,16 +324,29 @@
min-width="80"
prop="state"
>
- <template #default="scope">
- <el-tag
- :type="scope.row.state === 100 ? 'success' : 'warning'"
- @click="toggleEnableState(scope.row)"
- >
- {{ scope.row.state === 100 ? $t('Mounting.pass') : $t('Mounting.waiting') }}
- </el-tag>
- </template>
- </el-table-column>
+ <template #default="scope">
+ <el-tag
+ :type="scope.row.state === 100 ? 'success' : 'warning'"
+ @click="toggleEnableState(scope.row)"
+ >
+ {{ scope.row.state === 100 ? $t('Mounting.pass') : $t('Mounting.waiting') }}
+ </el-tag>
+ </template>
+ </el-table-column>
<el-table-column prop="filmsId" :label="$t('Mounting.createtime')" align="center"/>
+ <!-- <el-table-column prop="filmRemove" :label="$t('Mounting.removalmethodp')" align="center"/> -->
+ <el-table-column
+ align="center"
+ :label="$t('Mounting.removalmethodp')"
+ prop="filmRemove"
+ >
+ <template #default="scope">
+ <el-tag :type="getStatusType2(scope.row.filmRemove)">
+ {{ getStatusText2(scope.row.filmRemove) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="stationCell" :label="$t('Mounting.loadinglinea')" align="center"/>
</el-table>
</div>
</el-card>
@@ -318,7 +354,7 @@
<div style="width: 49%;float: left;margin-left: 300px;">
<div style="display: flex;">
<img src="../../assets/shangpianji.png" alt=""
- style="max-width: 25%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
+ style="max-width: 20%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
<el-table :data="tableDataa" border style="width: 75%;margin-top: 10%;margin-left: 8%;"
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
>
@@ -328,8 +364,8 @@
<el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80"/>
<el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80"/>
</el-table>
- </div>
- </div>
+ </div>
+ </div>
<!-- <div style="width: 48%;float: right;">
<div style="display: flex;">
<img src="../../assets/shangpianji.png" alt="" style="max-width: 25%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
@@ -398,7 +434,7 @@
</div>
</template>
</el-dialog>
- </div>
+ </div>
<el-dialog v-model="dialogFormVisible" top="24vh" width="70%">
<div class="flex-container" style="margin-left: 50px;margin-bottom: 10px;">
<el-form-item :label="$t('Mounting.loadingline')" :required="true">
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java
index ddc80fe..e23597e 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java
@@ -189,6 +189,15 @@
*/
private Date updateTime;
+// /**
+// * 闄よ啘鏂瑰紡
+// */
+// private Integer filmRemove;
+//
+// /**
+// * 璁惧
+// */
+// private Integer stationCell;
/**
* 棰勭暀锛屼娇鐢ㄩ渶娉ㄦ槑
*/
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java
index d0beeb5..821c41b 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java
@@ -62,5 +62,14 @@
*/
private Integer state;
+// /**
+// * 闄よ啘鏂瑰紡
+// */
+// private Integer filmRemove;
+//
+// /**
+// * 璁惧
+// */
+// private Integer stationCell;
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
index a548f00..07ec598 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
@@ -54,11 +54,11 @@
@ResponseBody
public Result <List<UpPattenUsage>> pause(@RequestBody Engineering engineering) {
boolean work=engineeringService.pauseTask(engineering.getEngineerId(),engineering.getState());
- List<UpPattenUsage> glass = upPattenUsageService.prioritylist();String message;
+// List<UpPattenUsage> glass = upPattenUsageService.prioritylist();String message;
if(work){
- return Result.build(200,"鎴愬姛",glass);
+ return Result.build(200, "鎴愬姛", null);
}else {
- return Result.build(100,"鎴愬姛",glass);
+ return Result.build(100, "鎴愬姛", null);
}
}
@@ -69,7 +69,7 @@
log.info("engineeringId:{}", engineering);
UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
if (upPattenUsage != null) {
- boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState(), engineering.getFilmRemove(), engineering.getStationCell());
+ boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState());
List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
return Result.build(200, "宸蹭繚瀛樿繃", work);
@@ -85,7 +85,7 @@
engineeringService.saveEngineering(listEngineering);
log.info("鏇存敼pp琛ㄧ姸鎬佷负宸查鍙�");
//灏唀ngineering琛ㄧ姸鎬佷负姝ｅ湪涓婄墖
- boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState(), engineering.getFilmRemove(), engineering.getStationCell());
+ boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState());
List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
if (work) {
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
index 9300779..c9576ae 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
@@ -107,5 +107,4 @@
*/
private String notes;
-
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
index 2240fc8..64169f1 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
@@ -98,7 +98,8 @@
public Engineering selectInitiate(Integer state) {
//鏌ヨ鏄惁鏈夊紑濮嬩笂鐗囩殑宸ョ▼浠诲姟
QueryWrapper<Engineering> wrapper = new QueryWrapper<>();
- wrapper.eq("state", state);
+ wrapper.eq("state", state)
+ .last("limit 1");
return engineeringMapper.selectOne(wrapper);
}
@@ -119,14 +120,10 @@
public boolean pauseTask(String engineerId, Integer state) {
//鏆傚仠姝ｅ湪杩涜宸ョ▼
LambdaUpdateChainWrapper<Engineering> pauseWrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
- pauseWrapper.set(Engineering::getState, 0);
- pauseWrapper.eq(Engineering::getState, 1);
+ pauseWrapper.set(Engineering::getState, state);
+ pauseWrapper.eq(Engineering::getEngineerId, engineerId);
return pauseWrapper.update();
}
- @Override
- public boolean changeTask(String engineerId, Integer state, Integer filmRemove, Integer stationCell) {
- return false;
- }
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
index 434a8c5..6ea664c 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
@@ -50,17 +50,19 @@
@PostMapping("/selectUpPattenUsage") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
@ResponseBody
public Result<List<UpPattenUsage>> selectUpPattenUsage(@RequestBody Engineering engineering) {
- List<UpPattenUsage> upPattenUsages=null;
+ List<UpPattenUsage> upPattenUsages = null;
UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
- if(upPattenUsage == null){
+ if (upPattenUsage == null) {
+// return Result.build(200, "澶辫触鏃犳暟鎹�", null);
+// upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId(), engineering.getFilmRemove(), engineering.getStationCell());
upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
- }else {
- upPattenUsages= upPattenUsageService.selectUpPattenUsage(upPattenUsage);
+ } else {
+ upPattenUsages = upPattenUsageService.selectUpPattenUsage(upPattenUsage);
}
if (!upPattenUsages.isEmpty()) {
return Result.build(200, "鎴愬姛", upPattenUsages);
- }else {
+ } else {
return Result.build(100, "澶辫触", upPattenUsages);
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
index 377b77e..2c1e2f8 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
@@ -38,13 +38,17 @@
* 鏇存柊涓婄墖琛ㄧ姸鎬�
*/
void updateUpPattenUsageState(UpPattenUsage upPattenUsage, Integer state);
+
/**
* 鍒ゆ柇姝ゅ伐绋嬫槸鍚﹀凡淇濆瓨杩�
+ *
* @return UpPattenUsage
*/
- UpPattenUsage selectedEngineering(String engineeringId);
+ UpPattenUsage selectedTaskEngineering(String engineeringId);
+
/**
* 鏌ヨ姝ｅ湪鎵ц鐨勪笂鐗囦换鍔�
+ *
* @return UpPattenUsage
*/
UpPattenUsage selectOverTask();
@@ -56,10 +60,17 @@
/**
* 鏇存敼涓婄墖鐜荤拑鐘舵��
+ *
* @return UpPattenUsage
*/
Boolean updateGlassState(UpPattenUsage upPattenUsage);
List<Engineering> setRawGlassTaskRequest(Engineering request);
+
+// List<UpPattenUsage> selectSaveUpPattenUsage(String engineerId, Integer filmRemove, Integer stationCell);
+
+// UpPattenUsage selectedEngineering(String engineerId, Integer filmRemove, Integer stationCell);
+
+ UpPattenUsage selectedEngineering(String engineerId);
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
index 5f31161..0cfcb0c 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
@@ -56,7 +56,10 @@
@Override
public List<UpPattenUsage> selectUpPattenUsage(UpPattenUsage upPattenUsage) {
LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(UpPattenUsage::getEngineeringId,upPattenUsage.getEngineeringId());
+ wrapper.eq(UpPattenUsage::getEngineeringId, upPattenUsage.getEngineeringId());
+// .eq(UpPattenUsage::getStationCell, upPattenUsage.getStationCell())
+// .eq(UpPattenUsage::getFilmRemove, upPattenUsage.getFilmRemove());
+
return this.list(wrapper);
}
@@ -104,16 +107,25 @@
@Override
public void updateUpPattenUsageState(UpPattenUsage upPattenUsage, Integer state) {
upPattenUsage.setState(state);
- boolean updateSuccess=this.updateById(upPattenUsage);
- log.info("鏇存柊鐘舵�亄}",updateSuccess);
+ boolean updateSuccess = this.updateById(upPattenUsage);
+ log.info("鏇存柊鐘舵�亄}", updateSuccess);
//鏇存柊鐘舵��
}
@Override
- public UpPattenUsage selectedEngineering(String engineeringId) {
- QueryWrapper<UpPattenUsage>wrapper = new QueryWrapper<>();
- wrapper.eq("engineering_id",engineeringId)
+ public UpPattenUsage selectedTaskEngineering(String engineeringId) {
+ return null;
+ }
+
+ @Override
+ public UpPattenUsage selectedEngineering(String engineerId) {
+ QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
+ wrapper.eq("engineering_id", engineerId)
+// .eq("station_cell", stationCell)
+// .eq("film_remove", filmRemove)
.last("limit 1");
+ log.info("鏌ヨ棰勮鍙傛暟");
+ log.info("鏌ヨ棰勮鍙傛暟{}", this.getOne(wrapper));
return this.getOne(wrapper);
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
index 571c726..214b3b3 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
@@ -5,7 +5,7 @@
strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
datasource:
hangzhoumes:
- url: jdbc:mysql://127.0.0.1:3306/hangzhoumes?serverTimezone=GMT%2b8&allowMultiQueries=true
+ url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml
index 1c8c8b3..abbddf5 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml
@@ -2,7 +2,7 @@
port: 8083
spring:
profiles:
- active: yw
+ active: dev
application:
name: loadGlass
liquibase:
@@ -13,11 +13,4 @@
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
kangaroohy:
milo:
- enabled: false
- primary: default
- config:
- default:
- endpoint: opc.tcp://192.168.0.39:49320
- security-policy: basic256sha256
- username: admin
- password: 1qaz2wsx3edc4rfv
+ enabled: false
\ No newline at end of file
--
Gitblit v1.8.0