From f68d3c71819feb59e7a227a5d992b059b900916c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 28 三月 2025 08:28:26 +0800
Subject: [PATCH] 修改报表，界面添加查询流程卡个数，调整推送数据到前端的间隔
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
index 258c367..65738ad 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
@@ -1,6 +1,8 @@
package com.mes.downworkstation.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
@@ -10,6 +12,7 @@
import com.mes.device.PlcParameterObject;
import com.mes.downglassinfo.entity.DownGlassInfo;
import com.mes.downglassinfo.mapper.DownGlassInfoMapper;
+import com.mes.downglassinfo.service.DownGlassInfoService;
import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.entity.DownWorkstationTask;
import com.mes.downworkstation.entity.DownWorkstionAndDownGlassinfo;
@@ -17,6 +20,7 @@
import com.mes.downworkstation.mapper.DownWorkstationTaskMapper;
import com.mes.downworkstation.service.DownWorkstationService;
import com.mes.downworkstation.service.DownWorkstationTaskService;
+import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
@@ -40,6 +44,8 @@
private DownWorkstationTaskMapper downWorkstationTaskMapper;
@Autowired
private DownGlassInfoMapper downGlassInfoMapper;
+ @Autowired
+ private DownGlassInfoService downGlassInfoService;
@Autowired
private GlassInfoService glassInfoService;
@Autowired
@@ -147,16 +153,37 @@
@Override
public void updateFlowCardIdAndCount(String flowCardId, int workstationId, int layer) {
- int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId, layer);
+ GlassInfo glassInfo = glassInfoService.getOne(
+ new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getFlowCardId, flowCardId)
+ .last("limit 1")
+ );
QueryWrapper<Damage> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("process_id", flowCardId);
- queryWrapper.eq("technology_number", layer);
- int otherNumber = damageservice.count(queryWrapper);
+
+ LambdaQueryWrapper<DownGlassInfo> wrapper = new LambdaQueryWrapper();
+ wrapper.eq(DownGlassInfo::getFlowCardId, flowCardId);
+ wrapper.lt(DownGlassInfo::getWorkStationId, 7);
+
UpdateWrapper<DownWorkstation> updateWrapper = new UpdateWrapper<>();
+ int glassInfoCount = 0;
+ if (glassInfo.getCombine() == 0) {
+ glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId, layer);
+ queryWrapper.eq("technology_number", layer);
+ wrapper.eq(DownGlassInfo::getLayer, layer);
+ updateWrapper.set("layer", layer);
+ } else {
+ glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId, 0);
+ updateWrapper.set("layer", 0);
+ }
+ int otherNumber = damageservice.count(queryWrapper);
+ int racksNumber = downGlassInfoService.count(wrapper);
+
updateWrapper.set("total_quantity", glassInfoCount)
.set("flow_card_id", flowCardId)
- .set("layer", layer)
+
.set("other_number", otherNumber)
+ .set("racks_number", racksNumber)
.eq("workstation_id", workstationId);
// .eq("id", workstationId);
this.update(updateWrapper);
--
Gitblit v1.8.0