ERP_override.git

			@@ -262,6 +262,8 @@
			List<Map<String, Object>> originalFilm = (List<Map<String, Object>>) object.get("originalFilm");
			glassOptimizeMapper.addOptimizeUse(originalFilm,projectId,"admin");

			Map<String, Object> glassInfo = glassOptimizeMapper.getGlassInfo(projectId);

			ObjectMapper mapper = new ObjectMapper();
			String json = mapper.writeValueAsString(optimalResults);
			glassOptimizeMapper.addOptimizeProjectFile(json,projectId,"admin");
			@@ -270,12 +272,55 @@
			glassOptimizeMapper.addOptimizeLayout(objectMapList,projectId);
			for(Map<String, Object> objectMap:objectMapList){
			List<Map<String, Object>> objectMap2 = (List<Map<String, Object>>) objectMap.get("glassDetails");
			//迭代玻璃明细集合删除余料
			//迭代玻璃明细集合处理余料和其他
			Iterator<Map<String, Object>> iterator = objectMap2.iterator();
			while (iterator.hasNext()) {
			Map<String, Object> map = iterator.next();
			if (map.get("isRemain").toString()=="true") {
			iterator.remove();
			// 修改isRemain判断逻辑，支持数字0/1和字符串"0"/"1"
			boolean isRemain = false;
			if (map.containsKey("isRemain")) {
			Object isRemainObj = map.get("isRemain");
			if (isRemainObj != null) {
			if (isRemainObj instanceof Number) {
			// 数字类型: 1表示true，0表示false
			isRemain = ((Number) isRemainObj).intValue() == 1;
			} else {
			// 字符串类型: "1"表示true，"0"表示false
			isRemain = "1".equals(isRemainObj.toString());
			}
			}
			}

			if (isRemain) {
			System.out.println( map);
			if (glassInfo != null) {
			String glassType = (String) glassInfo.get("glass_type");
			String glassThickness = (String) glassInfo.get("glass_thickness");
			// 余料存入optimizeoffcut
			glassOptimizeMapper.addOptimizeOffcut(map, projectId, glassType, glassThickness);
			}
			iterator.remove(); // 从原列表中移除
			}else {
			// 处理isRotate字段转换 (现在是0/1)
			if (map.containsKey("isRotate")) {
			Object isRotateObj = map.get("isRotate");
			if (isRotateObj != null) {
			if (isRotateObj instanceof Number) {
			// 直接使用数字值
			map.put("isRotate", ((Number) isRotateObj).intValue());
			} else {
			// 字符串形式的"0"/"1"
			String isRotateStr = isRotateObj.toString();
			if ("1".equals(isRotateStr)) {
			map.put("isRotate", 1);
			} else {
			map.put("isRotate", 0);
			}
			}
			} else {
			map.put("isRotate", 0); // 默认值
			}
			}
			}
			}

			@@ -309,6 +354,85 @@
			map.put("optimizeUse", glassOptimizeMapper.materialStoreOptimizeUse(processId));
			return map;
			}



			public Object getOptimizeInfoSv(String processId) {
			// 获取布局信息
			List<Map<String, Object>> layouts = glassOptimizeMapper.getOptimizeLayoutsInfo(processId);
			// 获取玻璃明细信息
			List<Map<String, Object>> glassDetails = glassOptimizeMapper.getOptimizeDetailsInfo(processId);
			// 获取余料信息
			List<Map<String, Object>> offsets = glassOptimizeMapper.getOptimizeOffsetsInfo(processId);
			// 将玻璃明细和余料合并到一个列表中
			List<Map<String, Object>> allDetails = new ArrayList<>();
			if (glassDetails != null) {
			allDetails.addAll(glassDetails);
			}
			if (offsets != null) {
			allDetails.addAll(offsets);
			}
			// 按照stockId将明细分组并添加到对应的布局中
			if (layouts != null && !layouts.isEmpty()) {
			for (Map<String, Object> layout : layouts) {
			Object stockIdObj = layout.get("stockId");
			if (stockIdObj != null) {
			Integer stockId = null;
			if (stockIdObj instanceof Number) {
			stockId = ((Number) stockIdObj).intValue();
			} else {
			try {
			stockId = Integer.valueOf(stockIdObj.toString());
			} catch (NumberFormatException e) {
			// 如果无法转换为数字，则跳过该布局
			continue;
			}
			}
			List<Map<String, Object>> matchedDetails = new ArrayList<>();
			for (Map<String, Object> detail : allDetails) {
			Object layoutIdObj = detail.get("layoutId");
			Object stockSortObj = detail.get("stockSort");
			Integer detailStockId = null;
			if (layoutIdObj != null) {
			if (layoutIdObj instanceof Number) {
			detailStockId = ((Number) layoutIdObj).intValue();
			} else {
			try {
			detailStockId = Integer.valueOf(layoutIdObj.toString());
			} catch (NumberFormatException e) {
			// 跳过无效的layoutId
			continue;
			}
			}
			} else if (stockSortObj != null) {
			if (stockSortObj instanceof Number) {
			detailStockId = ((Number) stockSortObj).intValue();
			} else {
			try {
			detailStockId = Integer.valueOf(stockSortObj.toString());
			} catch (NumberFormatException e) {
			// 跳过无效的stockSort
			continue;
			}
			}
			}
			// 如果detail的stockId与layout的stockId匹配，则添加到匹配列表中
			if (detailStockId != null && detailStockId.equals(stockId)) {
			matchedDetails.add(detail);
			}
			}
			// 将匹配的明细添加到布局的glassDetails字段中
			layout.put("glassDetails", matchedDetails);
			}
			}
			}
			// Map<String, Object> result = new HashMap<>();
			Map<String, Object> result = new LinkedHashMap<>();
			result.put("layouts", layouts);
			result.put("optimizeUse", glassOptimizeMapper.materialStoreOptimizeUse(processId));
			return result;
			}


			//工程信息
			public Map<String, Object> projectInfoSv(String projectNo,String username) {
			@@ -451,6 +575,7 @@
			else if(code==2){
			glassOptimizeMapper.deleteOptimizeDetail(projectNumber);
			glassOptimizeMapper.deleteOptimizeLayout(projectNumber);
			glassOptimizeMapper.deleteOptimizeOffcut(projectNumber);
			glassOptimizeMapper.deleteOptimizeProjectFile(projectNumber);
			glassOptimizeMapper.updateOptimizeUse(projectNumber);
			glassOptimizeMapper.updateProjectOptimizeStateMp(projectNumber, states);
			@@ -948,4 +1073,5 @@
			return saveState;
			}


			}