From 6920d66c836f0b227e5e2c26aeff776994cb3d27 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 15 八月 2024 09:12:31 +0800
Subject: [PATCH] 修改流程卡打印边距
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 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 022cb19..53c53f8 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
@@ -21,6 +21,7 @@
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.job.DownLoadCacheGlassTask;
import com.mes.pp.service.FlowCardService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -31,6 +32,7 @@
import java.util.Map;
import java.util.stream.Collectors;
+@Slf4j
@Service
public class DownGlassInfoServiceImpl extends ServiceImpl<DownGlassInfoMapper, DownGlassInfo> implements DownGlassInfoService {
@@ -122,6 +124,7 @@
}
return "success";
}
+
@Override
public List<DownWorkstation> queryWorkStationIsFull() {
//鏌ヨ鍙互钀芥灦鐨勭幓鐠冧俊鎭笖宸茬粦瀹氭祦绋嬪崱鐨勫伐浣嶄俊鎭�
@@ -145,19 +148,23 @@
}
}
return workstationFull;
- }@Override
- public List<Map<String, List<Map<String, Object>>>> downGlassPrint(DownGlassInfo downGlassInfo){
+ }
+
+ @Override
+ public List<Map<String, List<Map<String, Object>>>> downGlassPrint(DownGlassInfo downGlassInfo) {
+ log.info("鎵撳嵃鍙傛暟:{}", 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")
+ queryWrapper.eq("flow_card_id", downGlassInfo.getFlowCardId())
+ .eq("layer", downGlassInfo.getLayer())
+ .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);
+ log.info("MES钀芥灦鏁版嵁:{}", resultList);
-
- List<Map<String, Object>> projectInfo=flowCardService.selectProject(downGlassInfo.getFlowCardId(),downGlassInfo.getLayer());
- List<Map<String, Object>> flowCardInfo=flowCardService.selectFlowCard(downGlassInfo.getFlowCardId(),downGlassInfo.getLayer());
-
+ List<Map<String, Object>> projectInfo = flowCardService.selectProject(downGlassInfo.getFlowCardId(), downGlassInfo.getLayer());
+ log.info("娴佺▼鍗″ご閮ㄦ暟鎹�:{}", projectInfo);
+ List<Map<String, Object>> flowCardInfo = flowCardService.selectFlowCard(downGlassInfo.getFlowCardId(), downGlassInfo.getLayer());
+ log.info("娴佺▼鍗＄幓鐠冩暟鎹�:{}", flowCardInfo);
for (Map<String, Object> row : flowCardInfo) {
int order_number = (int) row.get("order_number");
int technology_number = (int) row.get("technology_number");
@@ -165,20 +172,21 @@
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");
+ Long quantity = (Long) row1.get("quantity");
- if(order_number==glass_type&&technology_number==layer){
- row.put("quantity1",quantity);
+ if (order_number == glass_type && technology_number == layer) {
+ row.put("quantity1", quantity);
}
}
}
- List<Map<String, List<Map<String, Object>>>> listMap=new ArrayList<>();
+ log.info("娴佺▼鍗＄幓鐠冩暟鎹�2:{}", flowCardInfo);
+ 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("->");
+ 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();
--
Gitblit v1.8.0