diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
index 69206f4c..6eb139fe 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
@@ -104,8 +104,11 @@ public class PBomApi extends BaseApi {
     @PostMapping("editSubmit")
     @ApiOperation("编辑-提交")
     public ResultVO<Boolean> editSubmit(@Valid @RequestBody EditPBomParamDTO param){
+        //检查物料编码是否存在
+        bomNewPbomParentService.checkMaterialNo(param.getChildList());
         //检查物料是否被冻结
         materialMainService.checkMaterialFreeze(param.getChildList());
+
         bomNewPbomParentService.editSave(param, PBomEditStatusEnum.HANDLER_FINISHED);
         return ResultVO.success(true);
     }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
index d45a16a1..30228706 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
@@ -127,7 +127,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
                     data.addAll(childs);
 
                     for (BomNewPbomParentVO vi : childs) {
-                        if (StrUtil.isBlank(vi.getCurrentVersion()) &&  MaterialshouldBomExistUtil.checkShouldBomExist(vi)) {
+                        if (StrUtil.isBlank(vi.getCurrentVersion()) && MaterialshouldBomExistUtil.checkShouldBomExist(vi)) {
                             vi.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
                         }
                     }
@@ -271,7 +271,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
                         child.setVirtualPackageIs(parentEntity.getVirtualPackageIs());
                         child.setTechnologyUserCode(parentEntity.getTechnologyUserCode());
                         child.setTechnologyUserName(parentEntity.getTechnologyUserName());
-                        if ( parent.getStatus()< PBomStatusEnum.PUBLISH.getValue() &&  parentEntity.getStatus().equals(PBomStatusEnum.PUBLISH.getValue())) {
+                        if (parent.getStatus() < PBomStatusEnum.PUBLISH.getValue() && parentEntity.getStatus().equals(PBomStatusEnum.PUBLISH.getValue())) {
                             child.setStatus(PBomStatusEnum.BORROWED_PARTS.getValue());
                         }
 
@@ -311,6 +311,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
     public void editSave(EditPBomParamDTO paramDTO, PBomEditStatusEnum editStatus) {
         BomNewPbomParentEntity parent = this.getById(paramDTO.getBomRowId());
         VUtils.isTure(Objects.isNull(parent)).throwMessage("参数错误，该BOM不存在");
+
         List<BomNewPbomChildEntity> childList = Convert.toList(BomNewPbomChildEntity.class, paramDTO.getChildList());
         childList.forEach(u -> {
             u.setParentRowId(paramDTO.getBomRowId());
@@ -322,8 +323,22 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
 
     }
 
+    /**
+     * 1、物料编码不能为空
+     * 2、物料编码需在主数据中存在
+     */
+    public void checkMaterialNo(List<BomNewPbomParentVO> data) {
+        List<BomNewPbomParentVO> noMaterialNoList = data.stream().filter(u -> StrUtil.isBlank(u.getMaterialNo())).collect(Collectors.toList());
+        VUtils.isTure(CollUtil.isNotEmpty(noMaterialNoList)).throwMessage("存在物料编码为空的数据");
+        List<String> materialNos = data.stream().filter(u -> StrUtil.isNotBlank(u.getMaterialNo())).map(u -> u.getMaterialNo()).collect(Collectors.toList());
+        List<BaseMaterialVO> mainMaterialList = materialMainService.getMaterialBaseInfo(materialNos);
+
+        Set<String> mainMaterialNoSet = mainMaterialList.stream().map(u -> u.getMaterialNo()).collect(Collectors.toSet());
+        Set<String> difference = Sets.difference(Sets.newHashSet(materialNos), mainMaterialNoSet);
+        VUtils.isTure(CollUtil.isNotEmpty(difference)).throwMessage(StrUtil.join(",", difference)+"物料编码在主数据中不存在");
 
 
+    }
 
 
     /**
@@ -387,8 +402,8 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
     public void editExportV2(PBomEditExportParamDTO param, HttpServletResponse response) throws IOException {
         EecExcelUtil.setResponseExcelHeader(response, "bom明细列表");
         List<BomNewPbomParentVO> child = this.getChild(param.getBomRowId());
-        if(CollUtil.isNotEmpty(param.getRowIds())){
-            child=child.stream().filter(u->param.getRowIds().contains(u.getRowId())).collect(Collectors.toList());
+        if (CollUtil.isNotEmpty(param.getRowIds())) {
+            child = child.stream().filter(u -> param.getRowIds().contains(u.getRowId())).collect(Collectors.toList());
         }
         List<BomNewPbomEditExcelVO> result = Convert.toList(BomNewPbomEditExcelVO.class, child);
 
@@ -408,7 +423,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
         VUtils.isTure(Objects.isNull(packageParam.getTechnologyPackageTypeRowId())).throwMessage("请选择工艺包类型");
         BomNewTechnologyPackageTypeEntity technologyPackageTypeEntity = technologyPackageTypeService.getById(packageParam.getTechnologyPackageTypeRowId());
         //单条物料
-        String drawingNo =  packageParam.getDrawingNo();
+        String drawingNo = packageParam.getDrawingNo();
         String materialName = packageParam.getMaterialName();
         String materialDesc = packageParam.getMaterialDesc();
         BomNewPbomParentVO result = null;
@@ -433,8 +448,8 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
 
 //        materialName = StrUtil.join("", result.getMaterialName(), technologyPackageTypeEntity.getRemark());
 //        materialDesc = StrUtil.join(" ", materialName, drawingNo);
-        AddVirtrualMaterialDTO toM =new AddVirtrualMaterialDTO();
-        String key=String.valueOf(IdWorker.getId()) ;
+        AddVirtrualMaterialDTO toM = new AddVirtrualMaterialDTO();
+        String key = String.valueOf(IdWorker.getId());
         toM.setKey(key);
         toM.setMaterialName(materialName);
         toM.setDrawingNo(drawingNo);
@@ -443,7 +458,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
         toM.setProjectType(packageParam.getProjectType());
         Map<String, AddVirtrualMaterialDTO> mMap = materialService.batchAddMaterial(ImmutableList.of(toM));
 //        String materialNo = materialService.addMaterial(drawingNo, materialName, materialDesc, "201201");
-        String materialNo=mMap.get(key).getMaterialNo();
+        String materialNo = mMap.get(key).getMaterialNo();
         BaseMaterialVO resultD = materialMainService.getMaterialBaseInfo(ImmutableList.of(materialNo)).get(0);
         //插入工艺包
         packageParam.setTechnologyPackageMaterialNo(materialNo);
@@ -727,7 +742,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
         BigDecimal bNodeLevel = NumberUtil.add(parentVO.getLevelNumber(), (NumberUtil.div(new BigDecimal(1), new BigDecimal(zero))));
         List<BomNewPbomParentVO> subNodes = child.stream().filter(u -> u.getLevelNumber().compareTo(parentVO.getLevelNumber()) > 0 && u.getLevelNumber().compareTo(bNodeLevel) < 0).collect(Collectors.toList());
         for (BomNewPbomParentVO node : subNodes) {
-            if(StrUtil.isBlank(node.getProductionFactoryCode())) {
+            if (StrUtil.isBlank(node.getProductionFactoryCode())) {
                 node.setProductionFactoryCode(facCode);
                 node.setProductionFactoryCodeInputType(ProductionFactoryCodeInputTypeEnum.RULE_MATCH.getValue());
             }
@@ -738,7 +753,6 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
     /**
      * 修改生产工厂
      * 重新发布
-     *
      */
     public void reConvertToMBom(Long bomRowId, List<Long> sourceRowId) throws ExecutionException, InterruptedException {
 
@@ -853,14 +867,14 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
             // saySyncDEMO();
 //            importSap(parent,allBom);
             //记录-BOM版本RowId
-            List<BomNewPbomChildEntity> pBomChildren=new ArrayList<>();
-            allBom.forEach(k->{
-                BomNewPbomChildEntity entChild=new BomNewPbomChildEntity();
+            List<BomNewPbomChildEntity> pBomChildren = new ArrayList<>();
+            allBom.forEach(k -> {
+                BomNewPbomChildEntity entChild = new BomNewPbomChildEntity();
                 entChild.setRowId(k.getRowId());
                 entChild.setBomVersionRowId(k.getBomRowId());
                 pBomChildren.add(entChild);
             });
-            if(CollUtil.isNotEmpty(pBomChildren)){
+            if (CollUtil.isNotEmpty(pBomChildren)) {
                 pbomChildService.updateBatchById(pBomChildren);
             }
 
@@ -873,10 +887,9 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
     }
 
 
-
     private void importSap(BomNewPbomParentEntity parent, List<BomNewPbomParentVO> children) {
 
-        Sap sap=new Sap(parent,children);
+        Sap sap = new Sap(parent, children);
         ImportSapParamDTO importParm = sap.buildSyncSapParam();
         if (CollUtil.isNotEmpty(importParm.getT1())) {
             ResultVO<Boolean> booleanResultVO = sapOpUtilService.importToSap(importParm);
@@ -886,8 +899,6 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
     }
 
 
-
-
     /**
      * 获取CRM 订单号
      *
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/MaterialshouldBomExistUtil.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/MaterialshouldBomExistUtil.java
index 689ae578..643e59e2 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/MaterialshouldBomExistUtil.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/MaterialshouldBomExistUtil.java
@@ -31,7 +31,7 @@ public class MaterialshouldBomExistUtil {
 
             if(StrUtil.isNotBlank(material.getMaterialCategoryCode()) &&
                     (material.getMaterialCategoryCode().startsWith("30") || material.getMaterialCategoryCode().equals(OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE)  ||
-                            (  material.getMaterialCategoryCode().startsWith("20") && material.getMaterialGetType().equals(MaterialGetEnum.developing.getValue())))){
+                            (  material.getMaterialCategoryCode().startsWith("20") && MaterialGetEnum.developing.equalsValue(material.getMaterialGetType())  ))){
 
                     return true;
             }
diff --git a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java
index 23439237..755fd8c5 100644
--- a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java
+++ b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java
@@ -20,7 +20,7 @@ public class SessionUtil {
      * @return
      */
     public static Long getRowId() {
-        return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getRowId).orElse(null);
+        return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getRowId).orElse(1585164668335439881L);
     }
 
     /**