From 03c894b105bff46879625b67cdebc8c2d947d29f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 22 八月 2024 11:31:24 +0800
Subject: [PATCH] 修改流程卡打印样式，根据线路添加在磨边队列查不到时查所有线队列数据
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
index 38bf52e..0cc97af 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
@@ -6,11 +6,14 @@
import com.mes.common.config.Const;
import com.mes.common.utils.RedisUtil;
import com.mes.downglassinfo.entity.DownGlassInfo;
+import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downglassinfo.entity.request.DownGlassInfoRequest;
import com.mes.downglassinfo.service.DownGlassInfoService;
+import com.mes.downglassinfo.service.DownGlassTaskService;
import com.mes.downstorage.service.DownStorageCageService;
import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.service.DownWorkstationService;
+import com.mes.tools.DateUtil;
import com.mes.tools.WebSocketServer;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -33,6 +36,8 @@
private DownStorageCageService downStorageCageService;
@Autowired
private DownGlassInfoService downGlassInfoService;
+ @Autowired
+ private DownGlassTaskService downGlassTaskService;
@Autowired
private RedisUtil redisUtil;
@@ -113,6 +118,10 @@
if (null == request) {
request = new DownGlassInfoRequest();
}
+ if (request.getBeginDate() == null) {
+ request.setBeginDate(DateUtil.getBeginDate());
+ request.setEndDate(DateUtil.getEndDate());
+ }
log.info("鍙戦�佸綋鍓嶆鍦ㄦ墽琛屽伐绋嬪凡钀芥灦鐨勭幓鐠冧俊鎭�");
LambdaQueryWrapper<DownGlassInfo> wrapper = new LambdaQueryWrapper<DownGlassInfo>()
.between(null != request.getBeginDate(), DownGlassInfo::getGmtCreate, request.getBeginDate(), request.getEndDate())
@@ -123,11 +132,11 @@
wrapper.eq(DownGlassInfo::getWorkStationId, request.getWorkStationId());
}
List<DownGlassInfo> downGlassInfos = downGlassInfoService.list(wrapper);
- Map<Integer, List<DownGlassInfo>> listMap = downGlassInfos.stream().collect(Collectors.groupingBy(DownGlassInfo::getWorkStationId));
+// Map<Integer, List<DownGlassInfo>> listMap = downGlassInfos.stream().collect(Collectors.groupingBy(DownGlassInfo::getWorkStationId));
List<Object> engineerIdListTemp = downGlassInfoService.listObjs(new QueryWrapper<DownGlassInfo>().select("distinct engineer_id"));
List<String> engineerIdList = engineerIdListTemp.stream().map(String::valueOf).collect(Collectors.toList());
JSONObject jsonObject4 = new JSONObject();
- jsonObject4.append("downGlassInfos", listMap);
+ jsonObject4.append("downGlassInfos", downGlassInfos);
jsonObject4.append("engineerIdList", engineerIdList);
//閽㈠寲寮�鍏�
@@ -138,6 +147,14 @@
autoPrint = redisUtil.getCacheObject("autoPrint");
}
jsonObject4.append("autoPrint", autoPrint);
+ //浜哄伐涓嬬墖浣嶇疆鏈�鍚庝竴鐗�
+// DownGlassTask downGlassTask=downGlassTaskService.getOne(
+// new LambdaQueryWrapper<DownGlassTask>()
+// .eq(DownGlassTask::getEndCell,Const.G13_WORK_STATION)
+// .orderByDesc(DownGlassTask::getGlassId)
+// .first("top 1")
+// );
+// jsonObject4.append("downGlassTask", downGlassTask);
ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("unloadglass");
if (sendwServer4 != null) {
--
Gitblit v1.8.0