From d1f7ca24bfba95331f81f0b7a0d48739e6850262 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 20 九月 2024 15:49:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java | 172 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 99 insertions(+), 73 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 3ebd084..cca0371 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
@@ -128,6 +128,7 @@
@Override
public List<DownWorkstation> queryWorkStationIsFull() {
+
//鏌ヨ鍙互钀芥灦鐨勭幓鐠冧俊鎭笖宸茬粦瀹氭祦绋嬪崱鐨勫伐浣嶄俊鎭�
List<DownWorkstation> list = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>().eq(DownWorkstation::getEnableState, Const.SLOT_ON)
.isNotNull(DownWorkstation::getFlowCardId).ne(DownWorkstation::getFlowCardId, ""));
@@ -142,11 +143,11 @@
//鍙互钀芥灦鐨勭幓鐠冧俊鎭笖宸茬粦瀹氭祦绋嬪崱鐨勬墍鏈夌殑宸ヤ綅 - 鐜荤拑鏈弧娴佺▼鍗″強灞傛暟鐨勫伐浣� = 宸叉弧宸ヤ綅
workstationFull = list.stream().filter(item -> !flowCardIdList.contains(item.getFlowCardId() + ":" + item.getLayer())).collect(Collectors.toList());
//鏄惁闇�瑕佸皢宸叉弧鐨勫伐浣嶇疆涓轰笉鍙惤鏋�
- 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));
- }
+// 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;
}
@@ -156,47 +157,40 @@
log.info("鎵撳嵃鍙傛暟:{}", downGlassInfo);
QueryWrapper<DownGlassInfo> queryWrapper = Wrappers.query();
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", "glass_type", "id")
.orderByAsc("id");
+ int printLayer = 1;
+ if (downGlassInfo.getLayer() != 0) {
+ queryWrapper.select("flow_card_id", "layer", "width", "height", "filmsid", "thickness", "glass_type", "COUNT(*) AS quantity");
+ queryWrapper.groupBy("flow_card_id", "layer", "width", "height", "filmsid", "thickness", "glass_type", "id");
+ queryWrapper.eq("layer", downGlassInfo.getLayer());
+ printLayer = downGlassInfo.getLayer();
+ } else {
+ queryWrapper.select("flow_card_id", "width", "height", "filmsid", "thickness", "glass_type", "COUNT(*) AS quantity");
+ queryWrapper.groupBy("flow_card_id", "width", "height", "filmsid", "thickness", "glass_type", "id");
+ }
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>> projectInfo = flowCardService.selectProject(downGlassInfo.getFlowCardId(), printLayer);
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");
+
int quantity1 = 0;
for (Map<String, Object> row1 : resultList) {
int glass_type = (int) row1.get("glass_type");
- int layer = (int) row1.get("layer");
-// String child_width = (String) row1.get("child_width");
-// Long quantity = (Long) row1.get("quantity");
-// BigDecimal total_area = (BigDecimal) row1.get("total_area");
-// String separation = (String) row1.get("separation");
-// String perimeter = (String) row1.get("perimeter");
-// BigDecimal width = (BigDecimal) row1.get("width");
-// String other_columns = (String) row1.get("other_columns");
-// String remarks = (String) row1.get("remarks");
-// BigDecimal height = (BigDecimal) row1.get("height");
- if (order_number == glass_type && technology_number == layer) {
- quantity1 += 1;
-// row.put("quantity", quantity);
-// row.put("order_number", order_number);
-// row.put("technology_number", technology_number);
-// row.put("child_width", child_width);
-// row.put("total_area", total_area);
-// row.put("separation", separation);
-// row.put("perimeter", perimeter);
-// row.put("width", width);
-// row.put("other_columns", other_columns);
-// row.put("remarks", remarks);
-// row.put("height", height);
+ if (downGlassInfo.getLayer() != 0) {
+ int layer = (int) row1.get("layer");
+ int technology_number = (int) row.get("technology_number");
+ if (order_number == glass_type && technology_number == layer) {
+ quantity1 += 1;
+ }
+ } else {
+ if (order_number == glass_type) {
+ quantity1 += 1;
+ }
}
}
row.put("quantity1", quantity1);
@@ -225,19 +219,16 @@
@Override
public List<Map<String, Object>> downGlassLabelPrint(DownGlassInfo downGlassInfo) {
- //鑾峰彇涓嬬墖鐜荤拑鐨勯『搴�
-// QueryWrapper<DownGlassInfo> queryWrapper = Wrappers.query();
-// 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", "glass_type", "id")
-// .orderByAsc("id");
-// List<Map<String, Object>> resultList = baseMapper.selectMaps(queryWrapper);
+
List<Map<String, Object>> resultList = baseMapper.downGlassLabelPrint(downGlassInfo.getFlowCardId(), downGlassInfo.getLayer());
log.info("MES钀芥灦鏁版嵁:{}", resultList);
//鑾峰彇ERP鏍囩鎵�闇�鐨勪俊鎭�
- List<Map<String, Object>> labelInfo = flowCardService.selectLabel(downGlassInfo.getFlowCardId(), downGlassInfo.getLayer());
+ List<Map<String, Object>> labelInfo;
+ if (downGlassInfo.getLayer() != 0) {
+ labelInfo = flowCardService.selectLabel(downGlassInfo.getFlowCardId(), downGlassInfo.getLayer());
+ } else {
+ labelInfo = flowCardService.selectLabel(downGlassInfo.getFlowCardId(), 1);
+ }
log.info("鏍囩鏁版嵁:{}", labelInfo);
for (Map<String, Object> row : resultList) {
@@ -246,37 +237,72 @@
for (Map<String, Object> row1 : labelInfo) {
int orderNumber = (int) row1.get("orderNumber");
int technologyNumber = (int) row1.get("technologyNumber");
- if (orderNumber == glass_type && technologyNumber == layer) {
+ if (downGlassInfo.getLayer() != 0) {
+ if (orderNumber == glass_type && technologyNumber == layer) {
- String order_id = (String) row1.get("order_id");
- String project = (String) row1.get("project");
- Long customer_id = (Long) row1.get("customer_id");
- BigDecimal width = (BigDecimal) row1.get("width");
- BigDecimal height = (BigDecimal) row1.get("height");
- Long quantity = (Long) row1.get("quantity");
- String glass_child = (String) row1.get("glass_child");
- String process = (String) row1.get("process");
- String customer_name = (String) row1.get("customer_name");
- String processing_note = (String) row1.get("processing_note");
- String other_colunmns = (String) row1.get("other_colunmns");
- String building_number = (String) row1.get("building_number");
- String bend_radius = (String) row1.get("bend_radius");
+ String order_id = (String) row1.get("order_id");
+ String project = (String) row1.get("project");
+ Long customer_id = (Long) row1.get("customer_id");
+ BigDecimal width = (BigDecimal) row1.get("width");
+ BigDecimal height = (BigDecimal) row1.get("height");
+ Long quantity = (Long) row1.get("quantity");
+ String glass_child = (String) row1.get("glass_child");
+ String process = (String) row1.get("process");
+ String customer_name = (String) row1.get("customer_name");
+ String processing_note = (String) row1.get("processing_note");
+ String other_colunmns = (String) row1.get("other_colunmns");
+ String building_number = (String) row1.get("building_number");
+ String bend_radius = (String) row1.get("bend_radius");
- row.put("orderNumber", orderNumber);
- row.put("technology_number", technologyNumber);
- row.put("order_id", order_id);
- row.put("project", project);
- row.put("customer_id", customer_id);
- row.put("width", width);
- row.put("height", height);
- row.put("quantity", quantity);
- row.put("glass_child", glass_child);
- row.put("process", process);
- row.put("customer_name", customer_name);
- row.put("processing_note", processing_note);
- row.put("other_colunmns", other_colunmns);
- row.put("building_number", building_number);
- row.put("bend_radius", bend_radius);
+ row.put("orderNumber", orderNumber);
+ row.put("technology_number", technologyNumber);
+ row.put("order_id", order_id);
+ row.put("project", project);
+ row.put("customer_id", customer_id);
+ row.put("width", width);
+ row.put("height", height);
+ row.put("quantity", quantity);
+ row.put("glass_child", glass_child);
+ row.put("process", process);
+ row.put("customer_name", customer_name);
+ row.put("processing_note", processing_note);
+ row.put("other_colunmns", other_colunmns);
+ row.put("building_number", building_number);
+ row.put("bend_radius", bend_radius);
+ }
+ } else {
+ if (orderNumber == glass_type) {
+
+ String order_id = (String) row1.get("order_id");
+ String project = (String) row1.get("project");
+ Long customer_id = (Long) row1.get("customer_id");
+ BigDecimal width = (BigDecimal) row1.get("width");
+ BigDecimal height = (BigDecimal) row1.get("height");
+ Long quantity = (Long) row1.get("quantity");
+ String glass_child = (String) row1.get("glass_child");
+ String process = (String) row1.get("process");
+ String customer_name = (String) row1.get("customer_name");
+ String processing_note = (String) row1.get("processing_note");
+ String other_colunmns = (String) row1.get("other_colunmns");
+ String building_number = (String) row1.get("building_number");
+ String bend_radius = (String) row1.get("bend_radius");
+
+ row.put("orderNumber", orderNumber);
+ row.put("technology_number", technologyNumber);
+ row.put("order_id", order_id);
+ row.put("project", project);
+ row.put("customer_id", customer_id);
+ row.put("width", width);
+ row.put("height", height);
+ row.put("quantity", quantity);
+ row.put("glass_child", glass_child);
+ row.put("process", process);
+ row.put("customer_name", customer_name);
+ row.put("processing_note", processing_note);
+ row.put("other_colunmns", other_colunmns);
+ row.put("building_number", building_number);
+ row.put("bend_radius", bend_radius);
+ }
}
}
}
--
Gitblit v1.8.0