Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-prod-temp-logic-20250517-46981' into yfai-20250418-dev

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

@@ -396,8 +396,9 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
             if (mesPartInspection != null) {
                 workCenterCode = mesPartInspection.getWorkCenterCode();
             }
-            doCreateReworkMove(requestModel,getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()),target,workCenterCode,mesReworkTask.getPartNo(), mesPartInspection.getId());
-
+            if (MesExtEnumUtil.NC_TYPE.REWORK.getValue() == requestModel.getType()) {
+                doCreateReworkMove(requestModel, getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()), target, workCenterCode, mesReworkTask.getPartNo(), mesPartInspection.getId());
+            }
         } else {
             //拆解
             if(!CollectionUtils.isEmpty(requestModel.getAssemblyModelList())){

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

@@ -1073,6 +1073,14 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
             throw new ImppBusiException(String.format("【%s】此条码对应【%s】物料号未维护零件类型，请检查数据", produceSn.getProductSn(), produceSn.getPartNo()));
         }
 
+        //20250517-46981 电子化检验 NC判定 虚结构不可录入
+        DdlPackBean productVersionPackBean = DdlPackBean.getDdlPackBean(org);
+        DdlPreparedPack.getStringEqualPack("虚零件", "description", productVersionPackBean);
+        DdlPreparedPack.getStringEqualPack(part.getPartNo(), "partNo", productVersionPackBean);
+        int count = productVersionRepository.findByHqlWhereCount(productVersionPackBean);
+        if (count > 0) {
+            throw new ImppBusiException(String.format("【%s】此条码对应【%s】物料号为虚零件，请检查数据", produceSn.getProductSn(), produceSn.getPartNo()));
+        }
 
         return part;
     }