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;"> 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; } 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(); 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); }
@@ -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); } 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); }
@@ -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));
