| | |
|---|
| | | } |
|---|
| | | glassOptimizeMapper.addOptimizeDetail(objectMap2,projectId); |
|---|
| | | } |
|---|
| | | glassOptimizeMapper.updateProjectOptimizeStateMp(projectId,1); |
|---|
| | | |
|---|
| | | glassOptimizeMapper.updateProjectOptimize(projectId, 1, optimalResults); |
|---|
| | | return true; |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | |
|---|
| | | List<Map<String, Object>> objectMapList = (List<Map<String, Object>>) object.get("layouts"); |
|---|
| | | |
|---|
| | | Map<String, Object> glassInfo = glassOptimizeMapper.getGlassInfo(processId); |
|---|
| | | glassOptimizeMapper.deleteOffcutDetails(processId); |
|---|
| | | |
|---|
| | | int stockId = 1; |
|---|
| | | for (Map<String, Object> objectMap : objectMapList) { |
|---|
| | | List<Map<String, Object>> objectMap2 = (List<Map<String, Object>>) objectMap.get("glassDetails"); |
|---|
| | | |
|---|
| | |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | // 处理 glassPoint 序列化 |
|---|
| | | if (detail.containsKey("glassPoint")) { |
|---|
| | | Object glassPointObj = detail.get("glassPoint"); |
|---|
| | | if (glassPointObj != null) { |
|---|
| | | try { |
|---|
| | | // 如果 glassPointObj 已经是字符串，则不需要转换 |
|---|
| | | if (!(glassPointObj instanceof String)) { |
|---|
| | | // 将对象转换为 JSON 字符串 |
|---|
| | | String glassPointStr = mapper.writeValueAsString(glassPointObj); |
|---|
| | | detail.put("glassPoint", glassPointStr); |
|---|
| | | } |
|---|
| | | } catch (Exception e) { |
|---|
| | | // 如果转换失败，记录错误并移除该字段 |
|---|
| | | System.err.println("转换 glassPoint 失败: " + e.getMessage()); |
|---|
| | | detail.remove("glassPoint"); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (isRemain) { |
|---|
| | | offCutDetails.add(detail); |
|---|
| | |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | // 例如对 remainDetails 部分先删除 offcut 再处理 |
|---|
| | | // 对 remainDetails 部分先删除 offcut 再处理 |
|---|
| | | if (!offCutDetails.isEmpty()) { |
|---|
| | | glassOptimizeMapper.deleteOffcutDetails(processId); |
|---|
| | | if (glassInfo != null) { |
|---|
| | | String glassType = (String) glassInfo.get("glass_type"); |
|---|
| | | String glassThickness = (String) glassInfo.get("glass_thickness"); |
|---|
| | | // 余料存入optimizeoffcut |
|---|
| | | for (Map<String, Object> detail : offCutDetails) { |
|---|
| | | glassOptimizeMapper.addUpdateOffcut(detail, processId, glassType, glassThickness); |
|---|
| | | glassOptimizeMapper.addUpdateOffcut(detail, processId, glassType, glassThickness, stockId); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | stockId++; |
|---|
| | | } |
|---|
| | | // 更新优化结果文件 |
|---|
| | | String jsonString = mapper.writeValueAsString(object); |
|---|
| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | //修改排版状态 |
|---|
| | | public Boolean updateProjectState(String projectNumber, Integer state,Integer states, Integer code) { |
|---|
| | | public Boolean updateProjectState(String projectNumber, Integer state,Integer states, Integer code) throws JsonProcessingException { |
|---|
| | | if (!projectNumber.isEmpty()) { |
|---|
| | | //撤销模拟计算 |
|---|
| | | if(code==1){ |
|---|
| | |
|---|
| | | } |
|---|
| | | //允许生产 |
|---|
| | | else if(code==3){ |
|---|
| | | glassOptimizeMapper.updateProjectStateMp(projectNumber, state); |
|---|
| | | Boolean isSeccess = issuingProjects(projectNumber); |
|---|
| | | if(isSeccess){ |
|---|
| | | glassOptimizeMapper.updateProjectStateMp(projectNumber, state); |
|---|
| | | }else{ |
|---|
| | | return false; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | //生产不可见 |
|---|
| | | else if(code==4){ |
|---|
