Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java

@@ -283,7 +283,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
             DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesReworkTask.getOrganizeCode());
             DdlPreparedPack.getNumEqualPack(mesReworkTask.getId(), "reworkTaskId", packBean);
             mesPartInspection = mesPartInspectionRepository.getByProperty(packBean);
-            if (!StringUtils.isEmpty(mesReworkTask.getId())){
+            if (!Objects.isNull(mesPartInspection)){
                 if(!CollectionUtils.isEmpty(requestModel.getAssemblyModelList())){
                     mesPartInspection.setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.DISASSEMBLY.getValue());
                 }