UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -193,6 +193,8 @@ }; const handleCurrentChange = async(val: number) => { currentPage.value = val; console.log(currentPage.value); const response = await request.post('/temperingGlass/temperingGlassInfo/selectTemperingGlass', { engineerId: engineerId.value, temperingLayoutId: currentPage.value @@ -232,23 +234,26 @@ } }); adjustedRects.value = adjustedRectsData; currentPage.value = 1; } }; function getRectColor(state: number): string { switch (state) { case -1: return '#CDAF95'; case 0: return '#e1f3d8'; case 100: return '#c8c9cc'; case 110: return '#b3e19d'; case 120: return '#f89898'; return '#7AC5CD'; case 1: return '#95d475'; case 2: return 'lightblue'; case 3: return '#eebe77'; case 4: return '#CD6090'; case 8: return '#911005'; case 9: return '#f3d19e'; return '#4682B4'; } } // 更新矩形状态 UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -115,6 +115,26 @@ closeWebSocket(socket); } }); function getStatusTypeb(state) { switch (state) { case 0: return 'info'; case 1: return 'success'; case 1: return 'danger'; } } function getStatusTextb(state) { switch (state) { case 0: return t('workOrder.nedging'); case 1: return t('workOrder.edging'); case 2: return t('workOrder.finedging'); } } onBeforeUnmount(() => { console.log("关闭了") closeWebSocket(); @@ -127,8 +147,8 @@ <div style="display: flex;"> <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('workOrder.cway')" clearable style="margin-left: 20px;margin-bottom: 10px;"> <el-option :label="$t('workOrder.edgingone')" value="2001"></el-option> <el-option :label="$t('workOrder.edgingtwo')" value="2002"></el-option> <el-option :label="$t('workOrder.edgingone')" value="930"></el-option> <el-option :label="$t('workOrder.edgingtwo')" value="931"></el-option> </el-select> <el-select v-model="selectValuesa[1]" filterable :placeholder="$t('workOrder.cstate')" clearable style="margin-left: 20px;margin-bottom: 10px;"> @@ -154,9 +174,14 @@ <el-table-column prop="thickness" align="center" :label="$t('workOrder.thickness')" min-width="120" /> <el-table-column prop="glassType" align="center" :label="$t('workOrder.glasstype')" min-width="120" /> <el-table-column prop="line" align="center" :label="$t('workOrder.line')" min-width="120" /> <el-table-column prop="status" :label="$t('workOrder.status')" align="center" width="200"> <template #default="scope"> <el-table-column prop="state" :label="$t('workOrder.status')" align="center" width="200"> <!-- <template #default="scope"> {{ scope.row.status==0?"未磨边":scope.row.status==1?"磨边中":"已磨边" }} </template> --> <template #default="scope"> <el-tag :type="getStatusTypeb(scope.row.state)"> {{ getStatusTextb(scope.row.state) }} </el-tag> </template> </el-table-column> <el-table-column fixed="right" :label="$t('workOrder.operate')" align="center" width="200"> hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -75,11 +75,6 @@ if (!"0".equals(workingProcedure)) { damageSelectWrapper.eq(Damage::getWorkingProcedure, workingProcedure); } List<Damage> damageList = baseMapper.selectList(damageSelectWrapper); for (Damage damage : damageList) { damage.setStatus(2); } return baseMapper.selectList(damageSelectWrapper); }
@@ -164,7 +164,7 @@ .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.EDG_GLASS_BEFORE) ); jsonObject.append("edgOneTasks", edgOneTasks); jsonObject.append("edgOneTasks", edgTwoTasks); jsonObject.append("edgTwoTasks", edgTwoTasks); List<Engineering> engineeringOne = engineeringService.list( new LambdaQueryWrapper<Engineering>() .eq(Engineering::getStationCell, 5) hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java
@@ -2,10 +2,14 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.mes.common.config.Const; import com.mes.rawglassdetails.entity.RawGlassStorageDetails; import com.mes.rawglassdetails.service.RawGlassStorageDetailsService; import com.mes.rawglassstation.entity.RawGlassStorageStation; import com.mes.rawglassstation.service.RawGlassStorageStationService; import com.mes.rawglasstask.entity.RawGlassStorageTask; import com.mes.rawglasstask.service.RawGlassStorageTaskService; @@ -54,10 +58,13 @@ public void largenScreen() { log.info("发送任务信息和架子信息"); JSONObject jsonObject = new JSONObject(); List<RawGlassStorageDetails> rawGlassStorageDetailList = rawGlassStorageDetailsService.list( new LambdaUpdateWrapper<RawGlassStorageDetails>() .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN) ); MPJLambdaWrapper<RawGlassStorageDetails> wrapper = new MPJLambdaWrapper<>(); wrapper.select(RawGlassStorageStation::getSlot) .select(RawGlassStorageDetails::getRemainQuantity) .rightJoin(RawGlassStorageStation.class, on -> on.eq(RawGlassStorageStation::getSlot, RawGlassStorageDetails::getSlot) .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)) .orderByAsc(RawGlassStorageStation::getSlot); List<RawGlassStorageDetails> rawGlassStorageDetailList = rawGlassStorageDetailsService.list(wrapper); jsonObject.append("rawGlassStorageDetailList", rawGlassStorageDetailList); List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen"); if (CollectionUtil.isNotEmpty(sendwServer)) { hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
@@ -113,13 +113,13 @@ ); jsonObject.append("temperingTaskType", putGlass); //大屏钢化信息 Integer temperingGlass = temperingAgoService.count( new LambdaUpdateWrapper<TemperingGlassInfo>() List<TemperingGlassInfo> temperingGlassInfoList = temperingAgoService.list( new LambdaQueryWrapper<TemperingGlassInfo>() .select(TemperingGlassInfo::getEngineerId, TemperingGlassInfo::getTemperingLayoutId) // 选择要去重的字段 .eq(TemperingGlassInfo::getState, Const.TEMPERING_START) .groupBy(TemperingGlassInfo::getEngineerId, TemperingGlassInfo::getTemperingLayoutId) .groupBy(TemperingGlassInfo::getEngineerId, TemperingGlassInfo::getTemperingLayoutId) // 按 engineerId 和 temperingLayoutId 分组 ); jsonObject.append("temperingGlass", temperingGlass); jsonObject.append("temperingGlassInfoList", temperingGlassInfoList.size()); ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen"); if (sendwServer != null) { for (WebSocketServer webserver : sendwServer) {
