From d6543f14bd9b7d24d95c7206411397a6f29894a7 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 14 八月 2024 17:41:14 +0800
Subject: [PATCH] 1、fixbug 2、关闭向plc发送出片请求
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java | 64 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java
index c1af805..022cb19 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java
@@ -1,7 +1,9 @@
package com.mes.downglassinfo.service.impl;
import cn.smallbun.screw.core.util.CollectionUtils;
+import com.alibaba.fastjson.JSONObject;
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.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,12 +20,15 @@
import com.mes.downworkstation.service.DownWorkstationService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.job.DownLoadCacheGlassTask;
+import com.mes.pp.service.FlowCardService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
@Service
@@ -41,6 +46,9 @@
@Autowired
RedisUtil redisUtil;
+
+ @Autowired
+ FlowCardService flowCardService;
/**
* 鏍规嵁娴佺▼鍗″彿鏌ヨ鏈�澶у簭鍙�
@@ -97,6 +105,7 @@
BeanUtils.copyProperties(details, downGlassInfo);
//鑾峰彇褰撳墠娴佺▼鍗℃渶澶х墖搴�
downGlassInfo.setSequence(this.getMaxSequenceByFlowCardId(details.getFlowCardId(), details.getLayer()) + 1);
+ downGlassInfo.setWorkStationId(Const.G13_WORK_STATION);
this.save(downGlassInfo);
//鐢熸垚浠诲姟淇℃伅 骞跺悜plc鍙戦�佸嚭鐗囦换鍔�
GlassInfo glassInfo = new GlassInfo();
@@ -113,7 +122,6 @@
}
return "success";
}
-
@Override
public List<DownWorkstation> queryWorkStationIsFull() {
//鏌ヨ鍙互钀芥灦鐨勭幓鐠冧俊鎭笖宸茬粦瀹氭祦绋嬪崱鐨勫伐浣嶄俊鎭�
@@ -130,11 +138,57 @@
//鍙互钀芥灦鐨勭幓鐠冧俊鎭笖宸茬粦瀹氭祦绋嬪崱鐨勬墍鏈夌殑宸ヤ綅 - 鐜荤拑鏈弧娴佺▼鍗″強灞傛暟鐨勫伐浣� = 宸叉弧宸ヤ綅
workstationFull = list.stream().filter(item -> !flowCardIdList.contains(item.getFlowCardId() + ":" + item.getLayer())).collect(Collectors.toList());
//鏄惁闇�瑕佸皢宸叉弧鐨勫伐浣嶇疆涓轰笉鍙惤鏋�
- List<Integer> workstationIds = workstationFull.stream().map(DownWorkstation::getWorkstationId).collect(Collectors.toList());
- downWorkstationService.update(new LambdaUpdateWrapper<DownWorkstation>().set(DownWorkstation::getEnableState, Const.SLOT_OFF)
- .in(DownWorkstation::getWorkstationId, workstationIds));
-
+ if (CollectionUtils.isNotEmpty(workstationFull)) {
+ List<Integer> workstationIds = workstationFull.stream().map(DownWorkstation::getWorkstationId).collect(Collectors.toList());
+ downWorkstationService.update(new LambdaUpdateWrapper<DownWorkstation>().set(DownWorkstation::getEnableState, Const.SLOT_OFF)
+ .in(DownWorkstation::getWorkstationId, workstationIds));
+ }
}
return workstationFull;
+ }@Override
+ public List<Map<String, List<Map<String, Object>>>> downGlassPrint(DownGlassInfo downGlassInfo){
+ QueryWrapper<DownGlassInfo> queryWrapper = Wrappers.query();
+ queryWrapper.eq("flow_card_id", "NG24080012A001")
+ .eq("layer", 1)
+ .select("flow_card_id", "layer", "width", "height", "filmsid", "thickness","glass_type","COUNT(*) AS quantity")
+ .groupBy("flow_card_id", "layer", "width", "height", "filmsid", "thickness");
+ List<Map<String, Object>> resultList = baseMapper.selectMaps(queryWrapper);
+
+
+ List<Map<String, Object>> projectInfo=flowCardService.selectProject(downGlassInfo.getFlowCardId(),downGlassInfo.getLayer());
+ List<Map<String, Object>> flowCardInfo=flowCardService.selectFlowCard(downGlassInfo.getFlowCardId(),downGlassInfo.getLayer());
+
+ for (Map<String, Object> row : flowCardInfo) {
+ int order_number = (int) row.get("order_number");
+ int technology_number = (int) row.get("technology_number");
+
+ for (Map<String, Object> row1 : resultList) {
+ int glass_type = (int) row1.get("glass_type");
+ int layer = (int) row1.get("layer");
+ Long quantity=(Long) row1.get("quantity");
+
+ if(order_number==glass_type&&technology_number==layer){
+ row.put("quantity1",quantity);
+ }
+ }
+ }
+ List<Map<String, List<Map<String, Object>>>> listMap=new ArrayList<>();
+ Map<String, List<Map<String, Object>>> result = new HashMap<>();
+ result.put("detail", projectInfo);
+ result.put("detailList", flowCardInfo);
+ for (Map<String, Object> row : projectInfo) {
+ String order_number = (String) row.get("process");
+ String[] processes=order_number.split("->");
+ List<Map<String, Object>> processList = new ArrayList<>();
+ for (int i = 0; i < processes.length; i++) {
+ Map<String, Object> processMap = new JSONObject();
+ processMap.put("process", processes[i]);
+ processMap.put("id", i);
+ processList.add(processMap);
+ }
+ result.put("processList", processList);
+ }
+ listMap.add(result);
+ return listMap;
}
}
--
Gitblit v1.8.0