HangZhouMes.git

			@@ -241,11 +241,25 @@
			List<String> glassIds = downGlassTasks.stream().map(DownGlassTask::getGlassId).collect(Collectors.toList());
			resultList = baseMapper.downGlassLabelPrint(null, null, glassIds);
			} else {
			resultList = baseMapper.downGlassLabelPrint(downGlassInfo.getFlowCardId(), downGlassInfo.getLayer(), null);
			if (downGlassInfo.getGlassId() != null) {
			List<String> glassIds = new ArrayList<>();
			glassIds.add(downGlassInfo.getGlassId());
			// resultList = baseMapper.downGlassLabelPrint(null, null, glassIds);
			resultList = baseMapper.downGlassLabelPrintScan(null, null, glassIds);
			} else {
			if (downGlassInfo.getLayer() == 0) {
			downGlassInfo.setLayer(null);
			}
			resultList = baseMapper.downGlassLabelPrint(downGlassInfo.getFlowCardId(), downGlassInfo.getLayer(), null);
			}
			}
			if (CollectionUtils.isNotEmpty(resultList)) {
			List<String> flowCardIds = resultList.stream()
			.map(map -> (String) map.get("flow_card_id"))
			.distinct()
			.collect(Collectors.toList());
			List<Integer> layers = resultList.stream()
			.map(map -> (Integer) map.get("layer"))
			.distinct()
			.collect(Collectors.toList());
			log.info("MES落架数据:{}", resultList);
			@@ -253,9 +267,9 @@
			List<Map<String, Object>> labelInfo;
			if (downGlassInfo.getFlowCardId() != null) {
			flowCardIds.add(downGlassInfo.getFlowCardId());
			labelInfo = flowCardService.selectLabel(flowCardIds, 1);
			labelInfo = flowCardService.selectLabel(flowCardIds, layers);
			} else {
			labelInfo = flowCardService.selectLabel(flowCardIds, 1);
			labelInfo = flowCardService.selectLabel(flowCardIds, layers);
			}
			log.info("标签数据:{}", labelInfo);

			@@ -267,73 +281,37 @@
			int orderNumber = (int) row1.get("orderNumber");
			int technologyNumber = (int) row1.get("technologyNumber");
			String processId = (String) row1.get("process_id");
			// if (downGlassInfo.getLayer() != 0) {
			if (orderNumber == glass_type && processId.equals(flowCardId)) {
			if (orderNumber == glass_type && processId.equals(flowCardId) && 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);
			}
			// } 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);
			// }
			// }
			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);
			}
			}
			}
			}