From 3e0136494253e17019801f0d2c07fc7c65acaeb5 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 22 十一月 2024 14:18:47 +0800
Subject: [PATCH] 预览成功删除线路与除膜状态，更改开始上片逻辑，页面样式更改
---
UI-Project/src/views/Returns/upreturns.vue | 81 +++++++++++++-------------
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java | 3
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 15 ++--
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 8 +-
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java | 6 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java | 18 +++---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 2
7 files changed, 68 insertions(+), 65 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 27a1d77..6d07843 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -122,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/pause', {
- // const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
- // stationCell: 5,
- // filmRemove: filmRemove,
+ // const response = await request.post('/loadGlass/engineering/engineering/pause', {
+ const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
+ stationCell: 5,
+ filmRemove: filmRemove,
engineerId: engineeringId,
state: 1,
})
@@ -146,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/pause', {
- // stationCell: 5,
+ stationCell: 5,
+ filmRemove: filmRemove,
engineerId: engineeringId,
state: 0,
})
@@ -301,26 +303,26 @@
<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"
>
@@ -333,21 +335,20 @@
</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>
+ <!-- <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;">
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 52fa1bc..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,14 +62,14 @@
*/
private Integer state;
- /**
- * 闄よ啘鏂瑰紡
- */
- private Integer filmRemove;
-
- /**
- * 璁惧
- */
- private Integer stationCell;
+// /**
+// * 闄よ啘鏂瑰紡
+// */
+// 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 26cd5c3..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
@@ -67,7 +67,7 @@
@ResponseBody
public Result <Boolean> changeTask(@RequestBody Engineering engineering) {
log.info("engineeringId:{}", engineering);
- UpPattenUsage upPattenUsage = upPattenUsageService.selectedTaskEngineering(engineering.getEngineerId());
+ UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
if (upPattenUsage != null) {
boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState());
List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
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 459f616..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);
}
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 e05b9da..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
@@ -51,11 +51,11 @@
@ResponseBody
public Result<List<UpPattenUsage>> selectUpPattenUsage(@RequestBody Engineering engineering) {
List<UpPattenUsage> upPattenUsages = null;
- UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId(), engineering.getFilmRemove(), engineering.getStationCell()
- );
+ UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
if (upPattenUsage == null) {
- return Result.build(200, "澶辫触鏃犳暟鎹�", null);
- //upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId(), engineering.getFilmRemove(), engineering.getStationCell());
+// return Result.build(200, "澶辫触鏃犳暟鎹�", null);
+// upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId(), engineering.getFilmRemove(), engineering.getStationCell());
+ upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
} else {
upPattenUsages = upPattenUsageService.selectUpPattenUsage(upPattenUsage);
}
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 8f183a6..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
@@ -67,8 +67,10 @@
List<Engineering> setRawGlassTaskRequest(Engineering request);
- List<UpPattenUsage> selectSaveUpPattenUsage(String engineerId, Integer filmRemove, Integer stationCell);
+// List<UpPattenUsage> selectSaveUpPattenUsage(String engineerId, Integer filmRemove, Integer stationCell);
- UpPattenUsage selectedEngineering(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 c1f9b24..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,16 +56,15 @@
@Override
public List<UpPattenUsage> selectUpPattenUsage(UpPattenUsage upPattenUsage) {
LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(UpPattenUsage::getEngineeringId, upPattenUsage.getEngineeringId())
- .eq(UpPattenUsage::getStationCell, upPattenUsage.getStationCell())
- .eq(UpPattenUsage::getFilmRemove, upPattenUsage.getFilmRemove());
+ wrapper.eq(UpPattenUsage::getEngineeringId, upPattenUsage.getEngineeringId());
+// .eq(UpPattenUsage::getStationCell, upPattenUsage.getStationCell())
+// .eq(UpPattenUsage::getFilmRemove, upPattenUsage.getFilmRemove());
return this.list(wrapper);
- //浣�
}
@Override
- @DS("pp") //閫欒！鍙偝浜嗗伐绋嬭櫉
+ @DS("pp")
public List<UpPattenUsage> selectSaveUpPattenUsage(String engineeringId) {
List<OptimizeUpPattenUsage> upPattenUsageList = null;
@@ -119,11 +118,11 @@
}
@Override
- public UpPattenUsage selectedEngineering(String engineerId, Integer filmRemove, Integer stationCell) {
+ public UpPattenUsage selectedEngineering(String engineerId) {
QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
wrapper.eq("engineering_id", engineerId)
- .eq("station_cell", stationCell)
- .eq("film_remove", filmRemove)
+// .eq("station_cell", stationCell)
+// .eq("film_remove", filmRemove)
.last("limit 1");
log.info("鏌ヨ棰勮鍙傛暟");
log.info("鏌ヨ棰勮鍙傛暟{}", this.getOne(wrapper));
--
Gitblit v1.8.0