diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java
index 3d09b362..d30fc33f 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java
@@ -61,8 +61,8 @@ public class MaterialService {
 
         materialMainDTO.setApplyDeptName(SessionUtil.getDepartName());
 
-        String token="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySW5mbyI6IntcImRlcGFydE5hbWVcIjpcIuemj-W7uuWNl-aWuei3r-mdouacuuaisOaciemZkOWFrOWPuFwiLFwiZGVwYXJ0Um93SWRcIjoxNTg1MTk1Njk0ODcyNzg0ODk3LFwiZnVsbERlcHROYW1lXCI6XCJPVT3npo_lu7rljZfmlrnot6_pnaLmnLrmorDmnInpmZDlhazlj7gsREM9bmZsZ1wiLFwicXVlcnlEYXRhXCI6MixcInJlYWxOYW1lXCI6XCJhZG1pblwiLFwicm93SWRcIjoxNTQ3NTEyOTc4MDE2OTE5NTUzLFwidXNlckNvZGVcIjpcImFkbWluXCIsXCJ1c2VyTmFtZVwiOlwiYWRtaW5cIn0iLCJleHAiOjE3MDIwNTI1MzEsImp0aSI6Ijc5NmU2MjZhLWJjYzUtNDY3ZS1iNjFjLWRmOGViNGY0MDYyOSJ9.iq2dyYKpGd7Z60Mmm9ef59CF1YrkG9KLaTGr9CrGsHI";
-//        String token=SessionUtil.getsessionKey();
+      //  String token="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySW5mbyI6IntcImRlcGFydE5hbWVcIjpcIuemj-W7uuWNl-aWuei3r-mdouacuuaisOaciemZkOWFrOWPuFwiLFwiZGVwYXJ0Um93SWRcIjoxNTg1MTk1Njk0ODcyNzg0ODk3LFwiZnVsbERlcHROYW1lXCI6XCJPVT3npo_lu7rljZfmlrnot6_pnaLmnLrmorDmnInpmZDlhazlj7gsREM9bmZsZ1wiLFwicXVlcnlEYXRhXCI6MixcInJlYWxOYW1lXCI6XCJhZG1pblwiLFwicm93SWRcIjoxNTQ3NTEyOTc4MDE2OTE5NTUzLFwidXNlckNvZGVcIjpcImFkbWluXCIsXCJ1c2VyTmFtZVwiOlwiYWRtaW5cIn0iLCJleHAiOjE3MDIwNTI1MzEsImp0aSI6Ijc5NmU2MjZhLWJjYzUtNDY3ZS1iNjFjLWRmOGViNGY0MDYyOSJ9.iq2dyYKpGd7Z60Mmm9ef59CF1YrkG9KLaTGr9CrGsHI";
+      String token=SessionUtil.getsessionKey();
         HttpUtils  httpUtils=new HttpUtils();
 
         String s = httpUtils.doPost(NacosConfig.getNacosConfig().getAddMaterialUrl(),JSON.toJSONString(materialMainDTO),token);
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/PublishMaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/PublishMaterialService.java
index d3278a38..b9c5c718 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/PublishMaterialService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/PublishMaterialService.java
@@ -140,17 +140,18 @@ public class PublishMaterialService {
         sendPack.setMaterialNo("");//申请物料号
 
         try {
-             String data=   materialService.addMaterialPublish("", sendPack.getMaterialName(), OptionalBomConstant.PublishMaterialEnum.OTHER.getCategory());
-            ResultVO<String> resultVO  =  JSON.parseObject(data, new TypeReference<ResultVO<String>>(){});
-            if(resultVO==null){
-                throw new NflgBusinessException(STATE.Error, "机型发货物料编码申请失败,联系管理员,"+data);
+            String data = materialService.addMaterialPublish("", sendPack.getMaterialName(), OptionalBomConstant.PublishMaterialEnum.OTHER.getCategory());
+            ResultVO<String> resultVO = JSON.parseObject(data, new TypeReference<ResultVO<String>>() {
+            });
+            if (resultVO == null) {
+                throw new NflgBusinessException(STATE.Error, "机型发货物料编码申请失败,联系管理员," + data);
             }
-            if(! Objects.equal(resultVO.getState() , STATE.Success.getState() )){
-                throw new NflgBusinessException(STATE.Error,resultVO.getMsg());
+            if (!Objects.equal(resultVO.getState(), STATE.Success.getState())) {
+                throw new NflgBusinessException(STATE.Error, resultVO.getMsg());
             }
             sendPack.setMaterialNo(resultVO.getData());
-        }catch (Exception e){
-            throw new NflgBusinessException(STATE.Error, "机型发货物料编码申请失败,"+e.getMessage());
+        } catch (Exception e) {
+            throw new NflgBusinessException(STATE.Error, "机型发货物料编码申请失败," + e.getMessage());
         }
 
         if (StrUtil.isEmpty(sendPack.getMaterialNo())) {
@@ -171,21 +172,21 @@ public class PublishMaterialService {
 
 
         try {
-            String data=   materialService.addMaterialPublish("", makePack.getMaterialName(), OptionalBomConstant.PublishMaterialEnum.OTHER.getCategory());
-            ResultVO<String> resultVO  =  JSON.parseObject(data, new TypeReference<ResultVO<String>>(){});
-            if(resultVO==null){
-                throw new NflgBusinessException(STATE.Error, "机型制作物料编码申请失败,联系管理员,"+data);
+            String data = materialService.addMaterialPublish("", makePack.getMaterialName(), OptionalBomConstant.PublishMaterialEnum.OTHER.getCategory());
+            ResultVO<String> resultVO = JSON.parseObject(data, new TypeReference<ResultVO<String>>() {
+            });
+            if (resultVO == null) {
+                throw new NflgBusinessException(STATE.Error, "机型制作物料编码申请失败,联系管理员," + data);
             }
-            if(! Objects.equal(resultVO.getState() , STATE.Success.getState() )){
-                throw new NflgBusinessException(STATE.Error,resultVO.getMsg());
+            if (!Objects.equal(resultVO.getState(), STATE.Success.getState())) {
+                throw new NflgBusinessException(STATE.Error, resultVO.getMsg());
             }
             makePack.setMaterialNo(resultVO.getData());
-        }catch (Exception e){
-            throw new NflgBusinessException(STATE.Error, "机型制作物料编码申请失败,"+e.getMessage());
+        } catch (Exception e) {
+            throw new NflgBusinessException(STATE.Error, "机型制作物料编码申请失败," + e.getMessage());
         }
 
 
-
         if (StrUtil.isEmpty(makePack.getMaterialNo())) {
             throw new NflgBusinessException(STATE.Error, "机型制作物料编码申请失败");
         }
@@ -228,8 +229,8 @@ public class PublishMaterialService {
         OptionalMbomMaterialEntity material;
         if (optionalMbomCompareEntity == null) {
             material = new OptionalMbomMaterialEntity();
-             //第一个空格位置图号
-            String drawingNo = StrUtil.sub(desc,0,desc.indexOf(" ")  );
+            //第一个空格位置图号
+            String drawingNo = StrUtil.sub(desc, 0, desc.indexOf(" "));
             material.setRowId(IdWorker.getId());
             material.setDrawingNo(drawingNo);
             material.setParentRowId(parentId);
@@ -241,21 +242,21 @@ public class PublishMaterialService {
             material.setMaterialNo("");//申请物料号
 
             try {
-                String data=   materialService.addMaterialPublish(material.getDrawingNo(), material.getMaterialName(), OptionalBomConstant.PublishMaterialEnum.MACHINE.getCategory());
-                ResultVO<String> resultVO  =  JSON.parseObject(data, new TypeReference<ResultVO<String>>(){});
-                if(resultVO==null){
-                    throw new NflgBusinessException(STATE.Error, "机械部分物料编码申请失败,联系管理员,"+data);
+                String data = materialService.addMaterialPublish(material.getDrawingNo(), material.getMaterialName(), OptionalBomConstant.PublishMaterialEnum.MACHINE.getCategory());
+                ResultVO<String> resultVO = JSON.parseObject(data, new TypeReference<ResultVO<String>>() {
+                });
+                if (resultVO == null) {
+                    throw new NflgBusinessException(STATE.Error, "机械部分物料编码申请失败,联系管理员," + data);
                 }
-                if(! Objects.equal(resultVO.getState() , STATE.Success.getState() )){
-                    throw new NflgBusinessException(STATE.Error,resultVO.getMsg());
+                if (!Objects.equal(resultVO.getState(), STATE.Success.getState())) {
+                    throw new NflgBusinessException(STATE.Error, resultVO.getMsg());
                 }
                 material.setMaterialNo(resultVO.getData());
-            }catch (Exception e){
-                throw new NflgBusinessException(STATE.Error, "机械部分物料编码申请失败,"+e.getMessage());
+            } catch (Exception e) {
+                throw new NflgBusinessException(STATE.Error, "机械部分物料编码申请失败," + e.getMessage());
             }
 
 
-
             try {
                 //数据不存在保存
                 if (StrUtil.isNotEmpty(material.getMaterialNo())) {
@@ -331,17 +332,18 @@ public class PublishMaterialService {
 
 
         try {
-            String data=   materialService.addMaterialPublish("", makePack.getMaterialName(), OptionalBomConstant.PublishMaterialEnum.OTHER.getCategory());
-            ResultVO<String> resultVO  =  JSON.parseObject(data, new TypeReference<ResultVO<String>>(){});
-            if(resultVO==null){
-                throw new NflgBusinessException(STATE.Error, "电控制作物料编码申请失败,联系管理员,"+data);
+            String data = materialService.addMaterialPublish("", makePack.getMaterialName(), OptionalBomConstant.PublishMaterialEnum.OTHER.getCategory());
+            ResultVO<String> resultVO = JSON.parseObject(data, new TypeReference<ResultVO<String>>() {
+            });
+            if (resultVO == null) {
+                throw new NflgBusinessException(STATE.Error, "电控制作物料编码申请失败,联系管理员," + data);
             }
-            if(! Objects.equal(resultVO.getState() , STATE.Success.getState() )){
-                throw new NflgBusinessException(STATE.Error,resultVO.getMsg());
+            if (!Objects.equal(resultVO.getState(), STATE.Success.getState())) {
+                throw new NflgBusinessException(STATE.Error, resultVO.getMsg());
             }
             makePack.setMaterialNo(resultVO.getData());
-        }catch (Exception e){
-            throw new NflgBusinessException(STATE.Error, "电控制作物料编码申请失败,"+e.getMessage());
+        } catch (Exception e) {
+            throw new NflgBusinessException(STATE.Error, "电控制作物料编码申请失败," + e.getMessage());
         }
 
 
@@ -350,7 +352,6 @@ public class PublishMaterialService {
         }
 
 
-
         OptionalMbomMaterialEntity sendPack = new OptionalMbomMaterialEntity();
         String sendMaterialName = StrUtil.format("({})", desc).concat("(电控系统)").concat("(发货)");
         sendPack.setRowId(IdWorker.getId());
@@ -362,21 +363,22 @@ public class PublishMaterialService {
         sendPack.setRootRowId(rootRowId);
         sendPack.setMaterialNo("");//申请物料号
         try {
-            String data=   materialService.addMaterialPublish("", sendPack.getMaterialName(), OptionalBomConstant.PublishMaterialEnum.OTHER.getCategory());
-            ResultVO<String> resultVO  =  JSON.parseObject(data, new TypeReference<ResultVO<String>>(){});
-            if(resultVO==null){
-                throw new NflgBusinessException(STATE.Error, "电控发货物料编码申请失败,联系管理员,"+data);
+            String data = materialService.addMaterialPublish("", sendPack.getMaterialName(), OptionalBomConstant.PublishMaterialEnum.OTHER.getCategory());
+            ResultVO<String> resultVO = JSON.parseObject(data, new TypeReference<ResultVO<String>>() {
+            });
+            if (resultVO == null) {
+                throw new NflgBusinessException(STATE.Error, "电控发货物料编码申请失败,联系管理员," + data);
             }
-            if(! Objects.equal(resultVO.getState() , STATE.Success.getState() )){
-                throw new NflgBusinessException(STATE.Error,resultVO.getMsg());
+            if (!Objects.equal(resultVO.getState(), STATE.Success.getState())) {
+                throw new NflgBusinessException(STATE.Error, resultVO.getMsg());
             }
             sendPack.setMaterialNo(resultVO.getData());
-        }catch (Exception e){
-            throw new NflgBusinessException(STATE.Error, "电控发货物料编码申请失败,"+e.getMessage());
+        } catch (Exception e) {
+            throw new NflgBusinessException(STATE.Error, "电控发货物料编码申请失败," + e.getMessage());
         }
 
         if (StrUtil.isEmpty(sendPack.getMaterialNo())) {
-                throw new NflgBusinessException(STATE.Error, "电控发货物料编码申请失败");
+            throw new NflgBusinessException(STATE.Error, "电控发货物料编码申请失败");
         }
         materialList.add(makePack);
         materialList.add(sendPack);