UI-Project/src/lang/zh.js
@@ -237,6 +237,7 @@ takemessage:'是否拿走该条信息？', breakage:'破损', takeout:'拿走', glasstype:'玻璃类型', }, processCard:{ intofurnace:'进炉中', UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -20,20 +20,20 @@ const requestData = { line: 2001 }; request.post("/cacheGlass/taskCache/selectEdgTask",{ ...requestData, // request.post("/cacheGlass/taskCache/selectEdgTask",{ // ...requestData, }).then((res) => { if (res.code == 200) { // }).then((res) => { // if (res.code == 200) { console.log(res.data); tableData.value = res.data console.log(res.data[0].slot); } else { ElMessage.warning(res.msg) // console.log(res.data); // tableData.value = res.data // console.log(res.data[0].slot); // } else { // ElMessage.warning(res.msg) } }); // } // }); // 破损 const open = async(row) => { try { @@ -49,7 +49,7 @@ if (confirmResult === 'confirm') { // 用户点击了“是”，现在调用删除接口 const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", { glassId: row.GlassId, glassId: row.glass_id, controlsId: 300, line: 2001, machine: '冷加工', @@ -82,7 +82,7 @@ if (confirmResult === 'confirm') { // 用户点击了“是”，现在调用删除接口 const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", { glassId: row.GlassId, glassId: row.glass_id, controlsId: 301, line: 2001, machine: '冷加工', @@ -127,13 +127,11 @@ <el-table height="240" ref="table" @selection-change="handleSelectionChange" :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"> <el-table-column prop="GlassId" align="center" :label="$t('workOrder.glassID')" min-width="180" /> <el-table-column prop="Height" align="center" :label="$t('workOrder.height')" min-width="80" /> <el-table-column prop="Width" align="center" :label="$t('workOrder.width')" min-width="120" /> <el-table-column prop="Thickness" align="center" :label="$t('workOrder.thickness')" min-width="120" /> <el-table-column prop="FilmsId" align="center" :label="$t('workOrder.coatingtypes')" min-width="120" /> <el-table-column prop="SerialNumber" align="center" :label="$t('workOrder.productionsequence')" min-width="120" /> <el-table-column prop="FlowCardId" align="center" :label="$t('workOrder.cardnumber')" min-width="120" /> <el-table-column prop="glass_id" align="center" :label="$t('workOrder.glassID')" min-width="180" /> <el-table-column prop="width" align="center" :label="$t('workOrder.width')" min-width="120" /> <el-table-column prop="height" align="center" :label="$t('workOrder.height')" min-width="80" /> <el-table-column prop="thickness" align="center" :label="$t('workOrder.thickness')" min-width="120" /> <el-table-column prop="glass_type" align="center" :label="$t('workOrder.glasstype')" min-width="120" /> <el-table-column fixed="right" :label="$t('workOrder.operate')" align="center" width="200"> <template #default="scope"> <el-button size="mini" type="text" plain @click="open(scope.row)">{{ $t('workOrder.breakage') }}</el-button> UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue
@@ -20,20 +20,20 @@ const requestData = { line: 2002 }; request.post("/cacheGlass/taskCache/selectEdgTask",{ ...requestData, // request.post("/cacheGlass/taskCache/selectEdgTask",{ // ...requestData, }).then((res) => { if (res.code == 200) { // }).then((res) => { // if (res.code == 200) { console.log(res.data); tableData.value = res.data console.log(res.data[0].slot); } else { ElMessage.warning(res.msg) // console.log(res.data); // tableData.value = res.data // console.log(res.data[0].slot); // } else { // ElMessage.warning(res.msg) } }); // } // }); // 破损 const open = async(row) => { try { @@ -49,7 +49,7 @@ if (confirmResult === 'confirm') { // 用户点击了“是”，现在调用删除接口 const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", { glassId: row.GlassId, glassId: row.glass_id, controlsId: 300, line: 2002, machine: '冷加工', @@ -82,7 +82,7 @@ if (confirmResult === 'confirm') { // 用户点击了“是”，现在调用删除接口 const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", { glassId: row.GlassId, glassId: row.glass_id, controlsId: 301, line: 2002, machine: '冷加工', @@ -128,13 +128,11 @@ <el-table height="240" ref="table" @selection-change="handleSelectionChange" :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"> <el-table-column prop="GlassId" align="center" :label="$t('workOrder.glassID')" min-width="180" /> <el-table-column prop="Height" align="center" :label="$t('workOrder.height')" min-width="80" /> <el-table-column prop="Width" align="center" :label="$t('workOrder.width')" min-width="120" /> <el-table-column prop="Thickness" align="center" :label="$t('workOrder.thickness')" min-width="120" /> <el-table-column prop="FilmsId" align="center" :label="$t('workOrder.coatingtypes')" min-width="120" /> <el-table-column prop="SerialNumber" align="center" :label="$t('workOrder.productionsequence')" min-width="120" /> <el-table-column prop="FlowCardId" align="center" :label="$t('workOrder.cardnumber')" min-width="120" /> <el-table-column prop="glass_id" align="center" :label="$t('workOrder.glassID')" min-width="180" /> <el-table-column prop="width" align="center" :label="$t('workOrder.width')" min-width="120" /> <el-table-column prop="height" align="center" :label="$t('workOrder.height')" min-width="80" /> <el-table-column prop="thickness" align="center" :label="$t('workOrder.thickness')" min-width="120" /> <el-table-column prop="glass_type" align="center" :label="$t('workOrder.glasstype')" min-width="120" /> <el-table-column fixed="right" :label="$t('workOrder.operate')" align="center" width="200"> <template #default="scope"> <el-button size="mini" type="text" plain @click="open(scope.row)">{{ $t('workOrder.breakage') }}</el-button> hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/EdgGlassTaskInfoService.java
@@ -3,9 +3,12 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.mes.edgglasstask.entity.EdgGlassTaskInfo; import java.util.List; import java.util.Map; /** * <p> * 服务类 * 服务类 * </p> * * @author wu @@ -13,4 +16,5 @@ */ public interface EdgGlassTaskInfoService extends IService<EdgGlassTaskInfo> { List<Map<String, Object>> selectEdgInfo(String line); } hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java
@@ -1,14 +1,18 @@ package com.mes.edgglasstask.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mes.edgglasstask.entity.EdgGlassTaskInfo; import com.mes.edgglasstask.mapper.EdgGlassTaskInfoMapper; import com.mes.edgglasstask.service.EdgGlassTaskInfoService; import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; /** * <p> * 服务实现类 * 服务实现类 * </p> * * @author wu @@ -17,4 +21,13 @@ @Service public class EdgGlassTaskInfoServiceImpl extends ServiceImpl<EdgGlassTaskInfoMapper, EdgGlassTaskInfo> implements EdgGlassTaskInfoService { @Override public List<Map<String, Object>> selectEdgInfo(String line) { LambdaQueryWrapper<EdgGlassTaskInfo> edgGlassWrapper = new LambdaQueryWrapper<>(); edgGlassWrapper .eq(EdgGlassTaskInfo::getLine, line) .eq(EdgGlassTaskInfo::getStatus, "1") .orderByDesc(EdgGlassTaskInfo::getTime); return baseMapper.selectMaps(edgGlassWrapper); } } hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -718,8 +718,8 @@ jsonObject.append("currentCutTerritory", currentCutTerritorys); //log.info("本次识别版图{},++++{}",engineerId,currentCutTerritorys); //磨边信息 List<Map<String, Object>> EdgTasks1 = taskCacheService.selectEdgInfo("2001"); List<Map<String, Object>> EdgTasks2 = taskCacheService.selectEdgInfo("2002"); List<Map<String, Object>> EdgTasks1 = edgGlassTaskInfoService.selectEdgInfo("2001"); List<Map<String, Object>> EdgTasks2 = edgGlassTaskInfoService.selectEdgInfo("2002"); jsonObject.append("EdgTasks1", EdgTasks1); jsonObject.append("EdgTasks2", EdgTasks2);
@@ -1,5 +1,6 @@ package com.mes.taskcache.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.base.MPJBaseServiceImpl; @@ -7,6 +8,7 @@ import com.mes.common.config.Const; import com.mes.damage.entity.Damage; import com.mes.damage.service.DamageService; import com.mes.edgglasstask.entity.EdgGlassTaskInfo; import com.mes.edgstoragecage.entity.EdgStorageCage; import com.mes.edgstoragecage.entity.EdgStorageCageDetails; import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper; @@ -23,7 +25,7 @@ /** * <p> * 服务实现类 * 服务实现类 * </p> * * @author zhoush @@ -44,57 +46,59 @@ /** * 添加理片笼任务 * * @param taskCache * @return */ @Override public boolean insertTaskCache(TaskCache taskCache){ public boolean insertTaskCache(TaskCache taskCache) { baseMapper.insert(taskCache); return true; } /** * 查询磨边任务 * * @param line * @return */ @Override public List<Map<String,Object>> selectEdgInfo(String line) { List<TaskCache> taskCache=baseMapper.selectList(new MPJLambdaWrapper<TaskCache>() public List<Map<String, Object>> selectEdgInfo(String line) { List<TaskCache> taskCache = baseMapper.selectList(new MPJLambdaWrapper<TaskCache>() .selectAll(TaskCache.class) .eq(TaskCache::getEndCell, line) .eq(TaskCache::getTaskStatus,1) .eq(TaskCache::getTaskStatus, 1) .orderByAsc(TaskCache::getCreateTime)); List<Map<String,Object>> result=new ArrayList<>(); int serialNumber=1; for(TaskCache taskCache1:taskCache){ Map<String,Object> map=new HashMap<>(); List<Map<String, Object>> result = new ArrayList<>(); int serialNumber = 1; for (TaskCache taskCache1 : taskCache) { Map<String, Object> map = new HashMap<>(); // GlassInfo glassInfo=glassInfoMapper.selectOne(new MPJLambdaWrapper<GlassInfo>() // .selectAll(GlassInfo.class) // .eq(GlassInfo::getGlassId,taskCache1.getGlassId())); List<GlassInfo> glassInfos=glassInfoMapper.selectJoinList(GlassInfo.class, new MPJLambdaWrapper<GlassInfo>() List<GlassInfo> glassInfos = glassInfoMapper.selectJoinList(GlassInfo.class, new MPJLambdaWrapper<GlassInfo>() .selectAll(GlassInfo.class) .innerJoin(EdgStorageCageDetails.class, on -> on .eq(EdgStorageCageDetails::getGlassId, GlassInfo::getGlassId) .eq(EdgStorageCageDetails::getEngineerId, GlassInfo::getEngineerId)) .eq(GlassInfo::getGlassId,taskCache1.getGlassId()) .eq(EdgStorageCageDetails::getState,Const.GLASS_STATE_OUT) .eq(GlassInfo::getGlassId, taskCache1.getGlassId()) .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_OUT) ); if(glassInfos.size()==1){ GlassInfo glassInfo=glassInfos.get(0); map.put("Line",line);//线路 2001 1线， 2002 2线 map.put("Width",glassInfo.getWidth());//宽 map.put("Height",glassInfo.getHeight());//高 map.put("Thickness",glassInfo.getThickness());//厚 map.put("GlassId",glassInfo.getGlassId());//玻璃ID map.put("FlowCardId",glassInfo.getFlowCardId());//流程卡号 map.put("TemperingLayoutId",glassInfo.getTemperingLayoutId());// 暂不显示 钢化版图ID map.put("TemperingFeedSequence",glassInfo.getTemperingFeedSequence());// 暂不显示 钢化版图ID内的序号 map.put("FilmsId",glassInfo.getFilmsid());//膜系 map.put("SerialNumber",serialNumber);//出片顺序 if (glassInfos.size() == 1) { GlassInfo glassInfo = glassInfos.get(0); map.put("Line", line);//线路 2001 1线， 2002 2线 map.put("Width", glassInfo.getWidth());//宽 map.put("Height", glassInfo.getHeight());//高 map.put("Thickness", glassInfo.getThickness());//厚 map.put("GlassId", glassInfo.getGlassId());//玻璃ID map.put("FlowCardId", glassInfo.getFlowCardId());//流程卡号 map.put("TemperingLayoutId", glassInfo.getTemperingLayoutId());// 暂不显示 钢化版图ID map.put("TemperingFeedSequence", glassInfo.getTemperingFeedSequence());// 暂不显示 钢化版图ID内的序号 map.put("FilmsId", glassInfo.getFilmsid());//膜系 map.put("SerialNumber", serialNumber);//出片顺序 result.add(map); }else if(glassInfos.size()>1){ log.info("数据不符合逻辑--磨边队列glassId重复:",glassInfos); } else if (glassInfos.size() > 1) { log.info("数据不符合逻辑--磨边队列glassId重复:", glassInfos); return new ArrayList<>(); } serialNumber++; @@ -111,16 +115,18 @@ /** * 查询待理片工作的任务 * * @return */ @Override public List<TaskCache> selectCacheInfo(){ return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus,0)); public List<TaskCache> selectCacheInfo() { return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus, 0)); // return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0)); } /** * 查询全部任务 * * @return */ @Override @@ -130,54 +136,60 @@ /** * 查询待进片任务 * * @return */ @Override public List<TaskCache> selectInputTaskCache(){ return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus,0).eq(TaskCache::getTaskType,1)); public List<TaskCache> selectInputTaskCache() { return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus, 0).eq(TaskCache::getTaskType, 1)); // return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0).eq("task_type",1)); } /** * 查询待出片任务 * * @return */ @Override public List<TaskCache> selectOutTaskCache(){ return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus,0).eq(TaskCache::getTaskType,2)); public List<TaskCache> selectOutTaskCache() { return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus, 0).eq(TaskCache::getTaskType, 2)); // return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0).eq("task_type",2)); } /** * 查询 A09 或 A10 最新的一片 出片任务 * * @param line * @return */ @Override public List<TaskCache> selectLastOutCacheInfos(int line){ return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell,line).eq(TaskCache::getTaskStatus,1).orderByDesc(TaskCache::getCreateTime)); public List<TaskCache> selectLastOutCacheInfos(int line) { return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell, line).eq(TaskCache::getTaskStatus, 1).orderByDesc(TaskCache::getCreateTime)); // return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("end_cell",line).eq("task_status",1).orderByDesc("ID")); } /** * 查询 A09 或 A10 最新的一片 出片任务 * * @param line * @return */ @Override public TaskCache selectLastOutCacheInfo(int line){ return baseMapper.selectOne(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell,line).eq(TaskCache::getTaskStatus,1).orderByDesc(TaskCache::getCreateTime)); public TaskCache selectLastOutCacheInfo(int line) { return baseMapper.selectOne(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell, line).eq(TaskCache::getTaskStatus, 1).orderByDesc(TaskCache::getCreateTime)); } /** * 查询判断磨边线是否有玻璃运行 * * @param * @return */ @Override public List<TaskCache> selectTaskCacheIsRun() { List<TaskCache> taskCaches=null; taskCaches=taskCacheMapper.selectJoinList(TaskCache.class, new MPJLambdaWrapper<TaskCache>() List<TaskCache> taskCaches = null; taskCaches = taskCacheMapper.selectJoinList(TaskCache.class, new MPJLambdaWrapper<TaskCache>() .select("top 4 t.end_cell,ISNULL(b.glass_id, 0)as glass_id") .leftJoin("big_storage_cage_feed_task as b on t.glass_id=b.glass_id ") .groupBy("t.end_cell,b.glass_id,t.create_time")
