调用PLM

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

@@ -354,7 +354,7 @@ public class IntegrateServiceImpl implements IntegrateService {
         if (!ObjectUtils.isEmpty(superBomSkuInfo)) {
             //根据 政采 模式 品牌 superbom 查询sku主信息
             List<SuperBomSkuInfo> skuInfos = superBomSkuInfoMapper.getSkuInfo(superBomSkuInfo);
-            Boolean flag = false;
+            Boolean flag = true;
             if (!CollectionUtils.isEmpty(skuInfos)) {
                 for (SuperBomSkuInfo skuInfo : skuInfos) {
                     //对比查出来的skuConfig信息是否完全一样
@@ -371,23 +371,21 @@ public class IntegrateServiceImpl implements IntegrateService {
                         result.setData(superBomSkuInfo);
                         return result;
                     } else {
-                        flag = true;
+                        flag = false;
                     }
                 }
-            }
-
-            //撞配不通过 保存SKU信息&config信息 调用申请SKU接口 applySkuCode
-            if (flag.equals(true)) {
-                superBomSkuInfo.setId(sequence.nextId());
-                superBomSkuInfoMapper.saveSkuInfo(superBomSkuInfo);
-                List<SuperBomSkuConfigInfo> characteristicList = superBomSkuInfo.getCharacteristicList();
-                characteristicList.forEach(item -> {
-                    SuperBomSkuConfigInfo config = new SuperBomSkuConfigInfo();
-                    BeanUtils.copyProperties(item, config);
-                    config.setId(sequence.nextId());
-                    config.setConfigId(superBomSkuInfo.getConfigId());
-                    superBomSkuInfoMapper.saveSkuConfig(config);
-                });
+            }else{
+                //撞配不通过 保存SKU信息&config信息 调用申请SKU接口 applySkuCode
+                    superBomSkuInfo.setId(sequence.nextId());
+                    superBomSkuInfoMapper.saveSkuInfo(superBomSkuInfo);
+                    List<SuperBomSkuConfigInfo> characteristicList = superBomSkuInfo.getCharacteristicList();
+                    characteristicList.forEach(item -> {
+                        SuperBomSkuConfigInfo config = new SuperBomSkuConfigInfo();
+                        BeanUtils.copyProperties(item, config);
+                        config.setId(sequence.nextId());
+                        config.setConfigId(superBomSkuInfo.getConfigId());
+                        superBomSkuInfoMapper.saveSkuConfig(config);
+                    });
                     //调用PLM申请sku号 返回后修改sku数据返回
                     ApplySkuCodeResultDto applySkuCodeResultDto = applySkuCode(superBomSkuInfo);
                     if (applySkuCodeResultDto.getCode().equals(200)) {
@@ -414,6 +412,46 @@ public class IntegrateServiceImpl implements IntegrateService {
                         result.setCode(applySkuCodeResultDto.getCode());
                         return result;
                     }
+
+            }
+            //撞配不通过 保存SKU信息&config信息 调用申请SKU接口 applySkuCode
+            if (flag.equals(true)) {
+                superBomSkuInfo.setId(sequence.nextId());
+                superBomSkuInfoMapper.saveSkuInfo(superBomSkuInfo);
+                List<SuperBomSkuConfigInfo> characteristicList = superBomSkuInfo.getCharacteristicList();
+                characteristicList.forEach(item -> {
+                    SuperBomSkuConfigInfo config = new SuperBomSkuConfigInfo();
+                    BeanUtils.copyProperties(item, config);
+                    config.setId(sequence.nextId());
+                    config.setConfigId(superBomSkuInfo.getConfigId());
+                    superBomSkuInfoMapper.saveSkuConfig(config);
+                });
+                //调用PLM申请sku号 返回后修改sku数据返回
+                ApplySkuCodeResultDto applySkuCodeResultDto = applySkuCode(superBomSkuInfo);
+                if (applySkuCodeResultDto.getCode().equals(200)) {
+                    if (applySkuCodeResultDto.getCode().equals(200)) {
+                        ApplySkuCodeResultDto.data data = applySkuCodeResultDto.getData();
+                        data.setConfigId(superBomSkuInfo.getConfigId());
+                        data.setMsg("已回号");
+                        data.setUser(SecurityService.getPrincipal().getCode());
+                        characteristicMapper.updateSuperBomSkuInfo(data);
+                        superBomSkuInfo.setSkuCode(data.getSkuCode());
+                        superBomSkuInfo.setSkuName(data.getSkuName());
+                        result.setMsg(applySkuCodeResultDto.getMsg());
+                        result.setCode(applySkuCodeResultDto.getCode());
+                        result.setData(superBomSkuInfo);
+                        return result;
+                    } else {
+                        result.setCode(applySkuCodeResultDto.getCode());
+                        result.setMsg("调用PLM申请回号失败");
+                        result.setData(applySkuCodeResultDto);
+                        return result;
+                    }
+                } else {
+                    result.setMsg(applySkuCodeResultDto.getMsg());
+                    result.setCode(applySkuCodeResultDto.getCode());
+                    return result;
+                }
             } else {
                 result.setMsg("配置已存在,请勿重复申请");
                 result.setCode(500);
@@ -421,6 +459,8 @@ public class IntegrateServiceImpl implements IntegrateService {
                 return result;
 
             }
+
+
         }
         return result;
     }
@@ -434,16 +474,13 @@ public class IntegrateServiceImpl implements IntegrateService {
         Object ob =  GetSKUByConfigInfo(superBomSkuInfo);
         boolean flag = ob instanceof GetProductOutDto;
         if(flag){
-            Map<String, Object> map = (Map<String, Object>) ob;
+            Object o = JSONObject.toJSON(ob);
+            Map<String, Object> map = (Map<String, Object>) o;
             Integer code = (Integer) map.get("code");
             if (code.equals(200)) {
-                SuperBomSkuInfo data = (SuperBomSkuInfo) map.get("data");
-                List<SuperBomSkuInfo> getSkuInfo = superBomSkuInfoMapper.getSkuInfo(data);
-                if(ObjectUtils.isEmpty(getSkuInfo)){
-                    result.setCode(ApiResult.INTERNAL_SERVER_ERROR.getCode());
-                    result.setMsg("该配置不存在");
-                    return result;
-                }
+                JSONObject data = (JSONObject) map.get("data");
+                result.setCode(200);
+                result.setData(data);
             }
             //superBomSkuInfo.setSkuCode(getSkuInfo.getSkuCode());
             //superBomSkuInfo.setSkuName(getSkuInfo.getSkuName());
@@ -780,7 +817,7 @@ public class IntegrateServiceImpl implements IntegrateService {
             Map<String, Object> map = (Map<String, Object>) o;
             Integer code = (Integer) map.get("code");
             if (code.equals(200)) {
-                SuperBomSkuInfo data = (SuperBomSkuInfo) map.get("data");
+                JSONObject data = (JSONObject) map.get("data");
                 result.setCode(200);
                 result.setData(data);
             }else{

src/main/resources/mapper/SuperBomSkuInfoMapper.xml

@@ -108,6 +108,9 @@
             <if test="patern!=null and patern!=''.toString()">
                 and a.patern = #{patern}
             </if>
+            <if test="applyStatus!=null and applyStatus!=''.toString()">
+                and a.apply_status = #{applyStatus}
+            </if>
 
         </where>
     </select>