41153 MES:PCN-NC处理扫描条码后，选择转正常，报错：系统异常

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java

@@ -15,6 +15,7 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.bean.nc.MesPartInspection;
 import cn.estsh.i3plus.pojo.mes.bean.nc.MesPartInspectionDetail;
@@ -162,14 +163,14 @@ public class MesNcProcessingService implements IMesNcProcessingService {
 
         if (model.getPartInspection().getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()) {
             Integer type = model.getType();
-            MesDefectType person = model.getPerson();
+            MesDefectType person = StringUtil.isEmpty(model.getPerson())?new MesDefectType():model.getPerson();
 
             //保存数据
             saveDate(model, model.getPart(), type, person, org,model.getAreaCode());
         } else {
 
             Integer type = model.getType();
-            MesDefectType person = model.getPerson();
+            MesDefectType person = StringUtil.isEmpty(model.getPerson())?new MesDefectType():model.getPerson();
 
             //保存数据
             saveDate(model, model.getPart(), type, person, org,model.getAreaCode());
@@ -331,7 +332,9 @@ public class MesNcProcessingService implements IMesNcProcessingService {
             produceSnRepository.save(sn);
 
             //更新检验单
-            model.getPartInspection().setDefectTypeId(person.getId());
+            if (model.getType() != 10 && model.getType() != 40) {
+                model.getPartInspection().setDefectTypeId(person.getId());
+            }
             model.getPartInspection().setInspectionStatus(MesExtEnumUtil.PART_INSPECTION_STATUS.QUALIFIED.getValue());
             model.getPartInspection().setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.NORMAL.getValue());
             ConvertBean.serviceModelUpdate(sn, AuthUtil.getSessionUser().getUserName());
@@ -419,7 +422,9 @@ public class MesNcProcessingService implements IMesNcProcessingService {
             produceSnRepository.save(sn);
 
             //更新检验单
-            model.getPartInspection().setDefectTypeId(person.getId());
+            if (model.getType() != 10 && model.getType() != 40) {
+                model.getPartInspection().setDefectTypeId(person.getId());
+            }
             model.getPartInspection().setInspectionStatus(MesExtEnumUtil.PART_INSPECTION_STATUS.QUALIFIED.getValue());
             model.getPartInspection().setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.RELEASE.getValue());
             ConvertBean.serviceModelUpdate(sn, AuthUtil.getSessionUser().getUserName());