diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java
index 0f0c449..de54f9b 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java
@@ -411,7 +411,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
                                 MesMove move = createMove(model, srcLocate, mesPartModel.getLocateNo(), org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode(),mesPartModel.getPartNo());
                                 moveRepository.save(move);
                             }
-                        } else if (headModel) {
+                        } else {
                             //移库
                             MesMove move = createMove(model, srcLocate, configService.getCfgValue(org, "LGORT"), org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode());
                             moveRepository.save(move);
@@ -441,7 +441,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
                         MesMove move = createMove(model,locateNo , mesPartModel.getLocateNo(), org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode(), mesPartModel.getPartNo());
                         moveRepository.save(move);
                     }
-                } else if (headModel) {
+                } else {
                     MesMove move = createMove(model, getDestLocateNo(model, org), target, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode());
                     moveRepository.save(move);
                 }
@@ -580,7 +580,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
                             MesMove move = createMove(model, mesPartModel.getLocateNo(), dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode(),mesPartModel.getPartNo());
                             moveRepository.save(move);
                         }
-                    } else if (headModel) {
+                    } else{
                         MesMove move = createMove(model, srcLocateNo, dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode());
                         moveRepository.save(move);
                     }
@@ -693,7 +693,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
                             MesMove move = createMove(model, mesPartModel.getLocateNo(), dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode(),mesPartModel.getPartNo());
                             moveRepository.save(move);
                         }
-                    } else if (headModel) {
+                    } else{
                         MesMove move = createMove(model, srcLocateNo, dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode());
                         moveRepository.save(move);
                     }
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java
index f8529ec..570efc6 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java
@@ -475,7 +475,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
                 }
                 moveRepository.saveAll(moveList);
 
-            } else if (headModel) {
+            } else {
                 //移库 转正常、放行：8000移至2000
                 MesMove move = createMove(model, sourceValue, target, org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.NORMAL_MOVE);
                 ConvertBean.serviceModelInitialize(move, model.getUserName());
@@ -594,8 +594,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
                     sourceValue = refundSource;
                 }
 
-                if (!headModel) {
-                    if (!CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) {
+                if (!headModel && !CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) {
                         List<MesMove> moveList = new ArrayList<>();
 
                         for (MesPartModel mesPartModel : mesPartModels) {
@@ -603,9 +602,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
                             ConvertBean.serviceModelInitialize(move,model.getUserName());
                             moveList.add(move);
                         }
-                        moveRepository.saveAll(moveList);
-
-                    }
+                    moveRepository.saveAll(moveList);
                 } else {
                     MesMove move = createMove(model, sourceValue, configService.getCfgValue(org, "SCRAP"), org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.SCRAP_MOVE);
                     ConvertBean.serviceModelInitialize(move,model.getUserName());
@@ -693,7 +690,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
                 }
                 moveRepository.saveAll(moveList);
 
-            } else if (headModel) {
+            } else  {
                 //移库 转正常、放行：8000移至2000
                 MesMove move = createMove(model, sourceValue, target, org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.NORMAL_MOVE);
                 ConvertBean.serviceModelInitialize(move, model.getUserName());