H3C

src/main/java/cn/com/uitech/authorization/service/impl/IntegrateServiceImpl.java

@@ -776,7 +776,6 @@ public class IntegrateServiceImpl implements IntegrateService {
         3.匹配不成功的，先查看配置是否满足VT约束，满足以后调用生成配置接口，获取配置JSON后GetSKUByConfigInfo 找PLM申请SKU
         不支持特配，是否特配，默认不是
         * */
-        GetProductOutDto result = new GetProductOutDto();
         if (!CollectionUtils.isEmpty(configSkuInfo.getH3CPNList())) {
 
             List<GetSKUByH3CConfigInfo.H3CPNList> h3CPNList = configSkuInfo.getH3CPNList();
@@ -794,15 +793,15 @@ public class IntegrateServiceImpl implements IntegrateService {
                                 CharacteristicValue characteristicValue = characteristicValueMapper.getCharacteristicValueInfoByCode(keyValues.getH3cVCode(), configurableBom.getSuperBomCode());
                                 //验证H3CVCODE 是否存在
                                 if (ObjectUtils.isEmpty(characteristicValue)) {
-                                    result.setMsg("CPQ数据验证失败，失败原因：" + keyValues.getH3cVCode() + "关系未维护!");
-                                    result.setCode(ApiResult.INTERNAL_SERVER_ERROR.getCode());
-                                    return result;
+                                    cpnList.setMsg("CPQ数据验证失败，失败原因：" + keyValues.getH3cVCode() + "关系未维护!");
+                                    cpnList.setCode(ApiResult.INTERNAL_SERVER_ERROR.getCode());
+                                    continue;
                                 } else {
                                     //验证H3CVCODE是否下架
                                     if (characteristicValue.getIsState() == 0) {
-                                        result.setMsg("CPQ数据验证失败，失败原因：" + characteristicValue.getCharacteristicValueCode() + "已下架!");
-                                        result.setCode(ApiResult.INTERNAL_SERVER_ERROR.getCode());
-                                        return result;
+                                        cpnList.setMsg("CPQ数据验证失败，失败原因：" + characteristicValue.getCharacteristicValueCode() + "已下架!");
+                                        cpnList.setCode(ApiResult.INTERNAL_SERVER_ERROR.getCode());
+                                        continue;
                                     }else{
                                         //有superbom 有configid h3cvcode存在 没有下架 设置true进行撞配
                                         flag = true;
@@ -811,15 +810,15 @@ public class IntegrateServiceImpl implements IntegrateService {
                             }
                         }else{
                             //没有configid
-                            result.setMsg(configurableBom.getSuperBomCode()+"没有维护默认值");
-                            result.setCode(ApiResult.INTERNAL_SERVER_ERROR.getCode());
-                            return result;
+                            cpnList.setMsg(configurableBom.getSuperBomCode()+"没有维护默认值");
+                            cpnList.setCode(ApiResult.INTERNAL_SERVER_ERROR.getCode());
+                            continue;
                         }
                     } else {
                         //没有superbom
-                        result.setMsg("H3CPN没有维护对照关系");
-                        result.setCode(ApiResult.INTERNAL_SERVER_ERROR.getCode());
-                        return result;
+                        cpnList.setMsg("H3CPN没有维护对照关系");
+                        cpnList.setCode(ApiResult.INTERNAL_SERVER_ERROR.getCode());
+                        continue;
                     }
 
                     //根据configId生成配置
@@ -873,15 +872,6 @@ public class IntegrateServiceImpl implements IntegrateService {
                         });
 
                         //带着配置调用生成配置接口  获取configid赋值到撞配里面
-                        /**
-                         * productClassCode : ###
-                         * materialCode : ###
-                         * operator : ###
-                         * selectedComplete : true
-                         * sessionId : 会话Id，服务记录total信息的值
-                         * selectedCharacteristicList : [{"characteristicName":"特征名称","characteristicValueName":"特征值名称","quantity":1}]
-                         * keyValues : [{"key":"mode","value":"edit"}]
-                         */
                         BuildConfigurationInputDTO buildConfigurationInputDTO = new BuildConfigurationInputDTO();
                         buildConfigurationInputDTO.setProductGroupCode(superBomSkuInfo.getProductClassCode());
                         buildConfigurationInputDTO.setProductClassCode(superBomSkuInfo.getProductClassCode());
@@ -889,12 +879,6 @@ public class IntegrateServiceImpl implements IntegrateService {
                         buildConfigurationInputDTO.setOperator("system");
                         buildConfigurationInputDTO.setSelectedComplete(true);
                         //构建初始化接口 获取sessionId
-                        /*private String system;
-                            private String productClassCode;
-                            private String operator;
-                            private String configId;
-                            private String superBomCode;
-                            private Integer isShow;*/
                         SelectorEntity selectorEntity = new SelectorEntity();
                         selectorEntity.setIsShow(1);
                         selectorEntity.setOperator("system");
@@ -906,16 +890,6 @@ public class IntegrateServiceImpl implements IntegrateService {
                         Map<String,Object> dataMap = (Map<String, Object>) initMap.get("data");
                         String sessionId = (String) dataMap.get("sessionId");
                         buildConfigurationInputDTO.setSessionId(sessionId);
-                        /*selectedCharacteristicList :
-                            [
-                                {
-                                    "characteristicName":"特征名称",
-                                    "characteristicValueName":"特征值名称",
-                                    "quantity":1
-                                }
-                            ]
-                         * keyValues : [{"key":"mode","value":"edit"}]
-                         * */
                         List<BuildConfigurationInputDTO.SelectedCharacteristicListBean> selectedCharacteristicListBeans = new ArrayList<>();
                         //传入的pnlist
                         superBomSkuInfo.getCharacteristicList().forEach(selectedCharacteristic->{
@@ -943,9 +917,7 @@ public class IntegrateServiceImpl implements IntegrateService {
                                 JSONObject data = (JSONObject) map1.get("data");
                                 cpnList.setSkuCode((String) data.get("skuCode"));
                                 cpnList.setSkuName((String) data.get("skuName"));
-                                result.setCode(code);
-                                result.setMsg((String) map1.get("msg"));
-                                result.setData(configSkuInfo);
+                                cpnList.setCode(code);
                             } else {
                                 Object data = map1.get("data");
                                 Object data2 = JSONObject.toJSON(data);
@@ -954,17 +926,15 @@ public class IntegrateServiceImpl implements IntegrateService {
                                     cpnList.setSkuCode((String) map2.get("skuCode"));
                                     cpnList.setSkuName((String) map2.get("skuName"));
                                     cpnList.setPatern("CTO");
+                                    cpnList.setCode(200);
                                 }
-                                result.setCode(code);
-                                result.setMsg((String) map1.get("msg"));
-                                result.setData(configSkuInfo);
                             }
                         }
                     }
                 }
             }
         }
-        return result;
+        return configSkuInfo;
     }
 
     @Override